Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-03-16 16:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:xmrig/xmrig into dev

Browse source
This commit is contained in:
XMRig 2020-08-16 15:47:57 +07:00
commit 8d5ea745bb
No known key found for this signature in database
GPG key ID: 446A53638BE94409
5 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/crypto/randomx/bytecode_machine.cpp
View file

@ -108,7 +108,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -142,7 +142,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -176,7 +176,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -204,7 +204,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -232,7 +232,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -290,7 +290,7 @@ namespace randomx {
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (src != dst) { if (src != dst) {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
} }
else { else {
ibc.isrc = &zero; ibc.isrc = &zero;
@ -373,7 +373,7 @@ namespace randomx {
ibc.type = InstructionType::FADD_M; ibc.type = InstructionType::FADD_M;
ibc.fdst = &nreg->f[dst]; ibc.fdst = &nreg->f[dst];
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
return; return;
} }
@ -393,7 +393,7 @@ namespace randomx {
ibc.type = InstructionType::FSUB_M; ibc.type = InstructionType::FSUB_M;
ibc.fdst = &nreg->f[dst]; ibc.fdst = &nreg->f[dst];
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
return; return;
} }
@ -420,7 +420,7 @@ namespace randomx {
ibc.type = InstructionType::FDIV_M; ibc.type = InstructionType::FDIV_M;
ibc.fdst = &nreg->e[dst]; ibc.fdst = &nreg->e[dst];
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
return; return;
} }
@ -466,7 +466,7 @@ namespace randomx {
ibc.isrc = &nreg->r[src]; ibc.isrc = &nreg->r[src];
ibc.imm = signExtend2sCompl(instr.getImm32()); ibc.imm = signExtend2sCompl(instr.getImm32());
if (instr.getModCond() < StoreL3Condition) if (instr.getModCond() < StoreL3Condition)
ibc.memMask = (instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask); ibc.memMask = AddressMask[instr.getModMem()];
else else
ibc.memMask = ScratchpadL3Mask; ibc.memMask = ScratchpadL3Mask;
return; return;

5
src/crypto/randomx/common.hpp
View file

@ -126,10 +126,7 @@ namespace randomx {
double hi; double hi;
}; };
#define ScratchpadL1Mask RandomX_CurrentConfig.ScratchpadL1Mask_Calculated #define AddressMask RandomX_CurrentConfig.AddressMask_Calculated
#define ScratchpadL1Mask16 RandomX_CurrentConfig.ScratchpadL1Mask16_Calculated
#define ScratchpadL2Mask RandomX_CurrentConfig.ScratchpadL2Mask_Calculated
#define ScratchpadL2Mask16 RandomX_CurrentConfig.ScratchpadL2Mask16_Calculated
#define ScratchpadL3Mask RandomX_CurrentConfig.ScratchpadL3Mask_Calculated #define ScratchpadL3Mask RandomX_CurrentConfig.ScratchpadL3Mask_Calculated
#define ScratchpadL3Mask64 RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated #define ScratchpadL3Mask64 RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated
constexpr int RegistersCount = 8; constexpr int RegistersCount = 8;

4
src/crypto/randomx/jit_compiler_x86.cpp
View file

@ -508,7 +508,7 @@ namespace randomx {
*(uint32_t*)(code + codePos) = 0xe181; *(uint32_t*)(code + codePos) = 0xe181;
codePos += 2; codePos += 2;
} }
emit32(instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask, code, codePos); emit32(AddressMask[instr.getModMem()], code, codePos);
} }
template void JitCompilerX86::genAddressReg<false>(const Instruction& instr, const uint32_t src, uint8_t* code, uint32_t& codePos); template void JitCompilerX86::genAddressReg<false>(const Instruction& instr, const uint32_t src, uint8_t* code, uint32_t& codePos);
@ -522,7 +522,7 @@ namespace randomx {
emit32(instr.getImm32(), code, codePos); emit32(instr.getImm32(), code, codePos);
emitByte(0x25, code, codePos); emitByte(0x25, code, codePos);
if (instr.getModCond() < StoreL3Condition) { if (instr.getModCond() < StoreL3Condition) {
emit32(instr.getModMem() ? ScratchpadL1Mask : ScratchpadL2Mask, code, codePos); emit32(AddressMask[instr.getModMem()], code, codePos);
} }
else { else {
emit32(ScratchpadL3Mask, code, codePos); emit32(ScratchpadL3Mask, code, codePos);

12
src/crypto/randomx/randomx.cpp
View file

@ -211,10 +211,14 @@ static uint32_t Log2(size_t value) { return (value > 1) ? (Log2(value / 2) + 1)
void RandomX_ConfigurationBase::Apply() void RandomX_ConfigurationBase::Apply()
{ {
ScratchpadL1Mask_Calculated = (ScratchpadL1_Size / sizeof(uint64_t) - 1) * 8; const uint32_t ScratchpadL1Mask_Calculated = (ScratchpadL1_Size / sizeof(uint64_t) - 1) * 8;
ScratchpadL1Mask16_Calculated = (ScratchpadL1_Size / sizeof(uint64_t) / 2 - 1) * 16; const uint32_t ScratchpadL2Mask_Calculated = (ScratchpadL2_Size / sizeof(uint64_t) - 1) * 8;
ScratchpadL2Mask_Calculated = (ScratchpadL2_Size / sizeof(uint64_t) - 1) * 8;
ScratchpadL2Mask16_Calculated = (ScratchpadL2_Size / sizeof(uint64_t) / 2 - 1) * 16; AddressMask_Calculated[0] = ScratchpadL2Mask_Calculated;
AddressMask_Calculated[1] = ScratchpadL1Mask_Calculated;
AddressMask_Calculated[2] = ScratchpadL1Mask_Calculated;
AddressMask_Calculated[3] = ScratchpadL1Mask_Calculated;
ScratchpadL3Mask_Calculated = (((ScratchpadL3_Size / sizeof(uint64_t)) - 1) * 8); ScratchpadL3Mask_Calculated = (((ScratchpadL3_Size / sizeof(uint64_t)) - 1) * 8);
ScratchpadL3Mask64_Calculated = ((ScratchpadL3_Size / sizeof(uint64_t)) / 8 - 1) * 64; ScratchpadL3Mask64_Calculated = ((ScratchpadL3_Size / sizeof(uint64_t)) / 8 - 1) * 64;

5
src/crypto/randomx/randomx.h
View file

@ -129,10 +129,7 @@ struct RandomX_ConfigurationBase
uint32_t CacheLineAlignMask_Calculated; uint32_t CacheLineAlignMask_Calculated;
uint32_t DatasetExtraItems_Calculated; uint32_t DatasetExtraItems_Calculated;
uint32_t ScratchpadL1Mask_Calculated; uint32_t AddressMask_Calculated[4];
uint32_t ScratchpadL1Mask16_Calculated;
uint32_t ScratchpadL2Mask_Calculated;
uint32_t ScratchpadL2Mask16_Calculated;
uint32_t ScratchpadL3Mask_Calculated; uint32_t ScratchpadL3Mask_Calculated;
uint32_t ScratchpadL3Mask64_Calculated; uint32_t ScratchpadL3Mask64_Calculated;