Cypher_Stack/RandomWOW
2
0
Fork 0
mirror of https://git.wownero.com/wownero/RandomWOW.git synced 2024-12-22 15:58:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an infinite loop bug

Browse Source
This commit is contained in:
tevador 2019-04-01 19:04:08 +02:00
parent 23a357db37
commit 428b845a3d
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AssemblyGeneratorX86.cpp
View File

@ -475,7 +475,7 @@ namespace RandomX {
//4 uOPs //4 uOPs
void AssemblyGeneratorX86::h_COND_R(Instruction& instr, int i) { void AssemblyGeneratorX86::h_COND_R(Instruction& instr, int i) {
handleCondition(instr, i); handleCondition(instr, i);
asmCode << "\txor ecx, ecx" << std::endl; asmCode << "\txor rcx, rcx" << std::endl;
asmCode << "\tcmp " << regR32[instr.src] << ", " << (int32_t)instr.getImm32() << std::endl; asmCode << "\tcmp " << regR32[instr.src] << ", " << (int32_t)instr.getImm32() << std::endl;
asmCode << "\tset" << condition(instr) << " cl" << std::endl; asmCode << "\tset" << condition(instr) << " cl" << std::endl;
asmCode << "\tadd " << regR[instr.dst] << ", rcx" << std::endl; asmCode << "\tadd " << regR[instr.dst] << ", rcx" << std::endl;
@ -485,7 +485,7 @@ namespace RandomX {
//6 uOPs //6 uOPs
void AssemblyGeneratorX86::h_COND_M(Instruction& instr, int i) { void AssemblyGeneratorX86::h_COND_M(Instruction& instr, int i) {
handleCondition(instr, i); handleCondition(instr, i);
asmCode << "\txor ecx, ecx" << std::endl; asmCode << "\txor rcx, rcx" << std::endl;
genAddressReg(instr); genAddressReg(instr);
asmCode << "\tcmp dword ptr [rsi+rax], " << (int32_t)instr.getImm32() << std::endl; asmCode << "\tcmp dword ptr [rsi+rax], " << (int32_t)instr.getImm32() << std::endl;
asmCode << "\tset" << condition(instr) << " cl" << std::endl; asmCode << "\tset" << condition(instr) << " cl" << std::endl;

30
src/LightProgramGenerator.cpp
View File

@ -111,10 +111,10 @@ namespace RandomX {
class Blake2Generator { class Blake2Generator {
public: public:
Blake2Generator(const void* seed) : dataIndex(sizeof(data)) { Blake2Generator(const void* seed, int nonce) : dataIndex(sizeof(data)) {
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
memcpy(data, seed, SeedSize); memcpy(data, seed, SeedSize);
data[60] = 39; store32(&data[60], nonce);
} }
uint8_t getByte() { uint8_t getByte() {
@ -434,7 +434,7 @@ namespace RandomX {
const LightInstructionInfo* slot_3L[] = { &LightInstructionInfo::IADD_R, &LightInstructionInfo::ISUB_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IMULH_R, &LightInstructionInfo::ISMULH_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IMULH_R, &LightInstructionInfo::ISMULH_R }; const LightInstructionInfo* slot_3L[] = { &LightInstructionInfo::IADD_R, &LightInstructionInfo::ISUB_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IMULH_R, &LightInstructionInfo::ISMULH_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IMULH_R, &LightInstructionInfo::ISMULH_R };
const LightInstructionInfo* slot_3F[] = { &LightInstructionInfo::IADD_R, &LightInstructionInfo::ISUB_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IROR_R }; const LightInstructionInfo* slot_3F[] = { &LightInstructionInfo::IADD_R, &LightInstructionInfo::ISUB_R, &LightInstructionInfo::IXOR_R, &LightInstructionInfo::IROR_R };
const LightInstructionInfo* slot_4[] = { &LightInstructionInfo::IMUL_R, &LightInstructionInfo::IROR_C }; const LightInstructionInfo* slot_4[] = { &LightInstructionInfo::IMUL_R, &LightInstructionInfo::IROR_C };
const LightInstructionInfo* slot_7[] = { &LightInstructionInfo::IADD_C, &LightInstructionInfo::IMUL_C, &LightInstructionInfo::IXOR_C, &LightInstructionInfo::IXOR_C }; const LightInstructionInfo* slot_7[] = { &LightInstructionInfo::IADD_C, &LightInstructionInfo::IMUL_C, &LightInstructionInfo::IXOR_C, &LightInstructionInfo::IMUL_C };
const LightInstructionInfo* slot_7L = &LightInstructionInfo::COND_R; const LightInstructionInfo* slot_7L = &LightInstructionInfo::COND_R;
const LightInstructionInfo* slot_8[] = { &LightInstructionInfo::IADD_RC, &LightInstructionInfo::IMUL_9C }; const LightInstructionInfo* slot_8[] = { &LightInstructionInfo::IADD_RC, &LightInstructionInfo::IMUL_9C };
const LightInstructionInfo* slot_10 = &LightInstructionInfo::IMUL_RCP; const LightInstructionInfo* slot_10 = &LightInstructionInfo::IMUL_RCP;
@ -771,12 +771,12 @@ namespace RandomX {
} }
} }
void generateLightProg2(LightProgram& prog, const void* seed, int indexRegister) { void generateLightProg2(LightProgram& prog, const void* seed, int indexRegister, int nonce) {
ExecutionPort::type portBusy[RANDOMX_LPROG_LATENCY + 1][3]; ExecutionPort::type portBusy[RANDOMX_LPROG_LATENCY + 1][3];
memset(portBusy, 0, sizeof(portBusy)); memset(portBusy, 0, sizeof(portBusy));
RegisterInfo registers[8]; RegisterInfo registers[8];
Blake2Generator gen(seed); Blake2Generator gen(seed, nonce);
std::vector<LightInstruction> instructions; std::vector<LightInstruction> instructions;
DecoderBuffer& fetchLine = DecoderBuffer::Default; DecoderBuffer& fetchLine = DecoderBuffer::Default;
@ -790,6 +790,8 @@ namespace RandomX {
int mopIndex = 0; int mopIndex = 0;
bool portsSaturated = false; bool portsSaturated = false;
int outIndex = 0; int outIndex = 0;
int attempts = 0;
constexpr int MAX_ATTEMPTS = 4;
while(!portsSaturated) { while(!portsSaturated) {
fetchLine = fetchLine.fetchNext(currentInstruction.getType(), gen); fetchLine = fetchLine.fetchNext(currentInstruction.getType(), gen);
@ -798,6 +800,7 @@ namespace RandomX {
mopIndex = 0; mopIndex = 0;
while (!portsSaturated && mopIndex < fetchLine.getSize()) { while (!portsSaturated && mopIndex < fetchLine.getSize()) {
int topCycle = cycle;
if (instrIndex >= currentInstruction.getInfo().getSize()) { if (instrIndex >= currentInstruction.getInfo().getSize()) {
if (currentInstruction.getType() >= 0) { if (currentInstruction.getType() >= 0) {
currentInstruction.toInstr(prog(outIndex++)); currentInstruction.toInstr(prog(outIndex++));
@ -818,19 +821,31 @@ namespace RandomX {
mop.setCycle(scheduleCycle); mop.setCycle(scheduleCycle);
if (instrIndex == currentInstruction.getInfo().getSrcOp()) { if (instrIndex == currentInstruction.getInfo().getSrcOp()) {
while (!currentInstruction.selectSource(scheduleCycle, registers, gen)) { for (attempts = 0; attempts < MAX_ATTEMPTS && !currentInstruction.selectSource(scheduleCycle, registers, gen); ++attempts) {
std::cout << "; src STALL at cycle " << cycle << std::endl; std::cout << "; src STALL at cycle " << cycle << std::endl;
++scheduleCycle; ++scheduleCycle;
++cycle; ++cycle;
} }
if (attempts == MAX_ATTEMPTS) { //throw instruction away
cycle = topCycle;
instrIndex = currentInstruction.getInfo().getSize();
std::cout << "; THROW away " << currentInstruction.getInfo().getName() << std::endl;
continue;
}
std::cout << "; src = r" << currentInstruction.getSource() << std::endl; std::cout << "; src = r" << currentInstruction.getSource() << std::endl;
} }
if (instrIndex == currentInstruction.getInfo().getDstOp()) { if (instrIndex == currentInstruction.getInfo().getDstOp()) {
while (!currentInstruction.selectDestination(scheduleCycle, registers, gen)) { for (attempts = 0; attempts < MAX_ATTEMPTS && !currentInstruction.selectDestination(scheduleCycle, registers, gen); ++attempts) {
std::cout << "; dst STALL at cycle " << cycle << std::endl; std::cout << "; dst STALL at cycle " << cycle << std::endl;
++scheduleCycle; ++scheduleCycle;
++cycle; ++cycle;
} }
if (attempts == MAX_ATTEMPTS) { //throw instruction away
cycle = topCycle;
instrIndex = currentInstruction.getInfo().getSize();
std::cout << "; THROW away " << currentInstruction.getInfo().getName() << std::endl;
continue;
}
std::cout << "; dst = r" << currentInstruction.getDestination() << std::endl; std::cout << "; dst = r" << currentInstruction.getDestination() << std::endl;
} }
depCycle = scheduleCycle + mop.getLatency(); depCycle = scheduleCycle + mop.getLatency();
@ -850,6 +865,7 @@ namespace RandomX {
if (scheduleCycle >= RANDOMX_LPROG_LATENCY) { if (scheduleCycle >= RANDOMX_LPROG_LATENCY) {
portsSaturated = true; portsSaturated = true;
} }
cycle = topCycle;
} }
++cycle; ++cycle;
} }

2
src/LightProgramGenerator.hpp
View File

@ -21,5 +21,5 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
namespace RandomX { namespace RandomX {
void generateLightProgram(LightProgram& prog, const void* seed, int indexRegister); void generateLightProgram(LightProgram& prog, const void* seed, int indexRegister);
void generateLightProg2(LightProgram& prog, const void* seed, int indexRegister); void generateLightProg2(LightProgram& prog, const void* seed, int indexRegister, int nonce);
} }

2
src/main.cpp
View File

@ -223,7 +223,7 @@ int main(int argc, char** argv) {
if (genLight) { if (genLight) {
RandomX::LightProgram p; RandomX::LightProgram p;
RandomX::generateLightProg2(p, seed, 0); RandomX::generateLightProg2(p, seed, 0, programCount);
RandomX::AssemblyGeneratorX86 asmX86; RandomX::AssemblyGeneratorX86 asmX86;
asmX86.generateProgram(p); asmX86.generateProgram(p);
std::cout << "-------------------------------------------------------" << std::endl; std::cout << "-------------------------------------------------------" << std::endl;