From 0b1761a846a9624f7860d3a23c9da5da73d9ceac Mon Sep 17 00:00:00 2001 From: tevador Date: Mon, 11 Feb 2019 18:57:42 +0100 Subject: [PATCH] Refactoring: mining/verification mode --- src/common.hpp | 1 + src/main.cpp | 92 +++++++++++++++++++++----------------------------- 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/src/common.hpp b/src/common.hpp index 1d7f597..133f01b 100644 --- a/src/common.hpp +++ b/src/common.hpp @@ -71,6 +71,7 @@ namespace RandomX { constexpr int ProgramLength = 256; constexpr uint32_t InstructionCount = 2048; + constexpr int ChainLength = 8; constexpr uint32_t ScratchpadSize = 2 * 1024 * 1024; constexpr uint32_t ScratchpadLength = ScratchpadSize / sizeof(int_reg_t); constexpr uint32_t ScratchpadL1 = ScratchpadSize / 128 / sizeof(int_reg_t); diff --git a/src/main.cpp b/src/main.cpp index 1229feb..5ae9f8b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,6 +37,13 @@ along with RandomX. If not, see. const uint8_t seed[32] = { 191, 182, 222, 175, 249, 89, 134, 104, 241, 68, 191, 62, 162, 166, 61, 64, 123, 191, 227, 193, 118, 60, 188, 53, 223, 133, 175, 24, 123, 230, 55, 74 }; +const uint8_t blockTemplate__[] = { + 0x07, 0x07, 0xf7, 0xa4, 0xf0, 0xd6, 0x05, 0xb3, 0x03, 0x26, 0x08, 0x16, 0xba, 0x3f, 0x10, 0x90, 0x2e, 0x1a, 0x14, + 0x5a, 0xc5, 0xfa, 0xd3, 0xaa, 0x3a, 0xf6, 0xea, 0x44, 0xc1, 0x18, 0x69, 0xdc, 0x4f, 0x85, 0x3f, 0x00, 0x2b, 0x2e, + 0xea, 0x00, 0x00, 0x00, 0x00, 0x77, 0xb2, 0x06, 0xa0, 0x2c, 0xa5, 0xb1, 0xd4, 0xce, 0x6b, 0xbf, 0xdf, 0x0a, 0xca, + 0xc3, 0x8b, 0xde, 0xd3, 0x4d, 0x2d, 0xcd, 0xee, 0xf9, 0x5c, 0xd2, 0x0c, 0xef, 0xc1, 0x2f, 0x61, 0xd5, 0x61, 0x09 +}; + void dump(const char* buffer, uint64_t count, const char* name) { std::ofstream fout(name, std::ios::out | std::ios::binary); fout.write(buffer, count); @@ -105,23 +112,21 @@ private: void printUsage(const char* executable) { std::cout << "Usage: " << executable << " [OPTIONS]" << std::endl; std::cout << "Supported options:" << std::endl; - std::cout << "\t--help\t\t\tshows this message" << std::endl; - std::cout << "\t--compiled\t\tuse x86-64 JIT-compiled VM (default: interpreted VM)" << std::endl; - std::cout << "\t--lightClient\t\tuse 'light-client' mode (default: full dataset mode)" << std::endl; - std::cout << "\t--softAes\t\tuse software AES (default: x86 AES-NI)" << std::endl; - std::cout << "\t--threads T\t\tuse T threads (default: 1)" << std::endl; - std::cout << "\t--nonces N\t\trun N nonces (default: 1000)" << std::endl; - std::cout << "\t--genAsm\t\tgenerate x86 asm code for nonce N" << std::endl; + std::cout << " --help shows this message" << std::endl; + std::cout << " --mine mining mode: 4 GiB dataset, x86-64 compiled VM" << std::endl; + std::cout << " (default: portable verification mode)" << std::endl; + std::cout << " --largePages use large pages" << std::endl; + std::cout << " --softAes use software AES (default: x86 AES-NI)" << std::endl; + std::cout << " --threads T use T threads (default: 1)" << std::endl; + std::cout << " --nonces N run N nonces (default: 1000)" << std::endl; + std::cout << " --genAsm generate x86-64 asm code for nonce N" << std::endl; + std::cout << " --genNative generate RandomX code for nonce N" << std::endl; } void generateAsm(int nonce) { uint64_t hash[8]; - unsigned char blockTemplate[] = { - 0x07, 0x07, 0xf7, 0xa4, 0xf0, 0xd6, 0x05, 0xb3, 0x03, 0x26, 0x08, 0x16, 0xba, 0x3f, 0x10, 0x90, 0x2e, 0x1a, 0x14, - 0x5a, 0xc5, 0xfa, 0xd3, 0xaa, 0x3a, 0xf6, 0xea, 0x44, 0xc1, 0x18, 0x69, 0xdc, 0x4f, 0x85, 0x3f, 0x00, 0x2b, 0x2e, - 0xea, 0x00, 0x00, 0x00, 0x00, 0x77, 0xb2, 0x06, 0xa0, 0x2c, 0xa5, 0xb1, 0xd4, 0xce, 0x6b, 0xbf, 0xdf, 0x0a, 0xca, - 0xc3, 0x8b, 0xde, 0xd3, 0x4d, 0x2d, 0xcd, 0xee, 0xf9, 0x5c, 0xd2, 0x0c, 0xef, 0xc1, 0x2f, 0x61, 0xd5, 0x61, 0x09 - }; + uint8_t blockTemplate[sizeof(blockTemplate__)]; + memcpy(blockTemplate, blockTemplate__, sizeof(blockTemplate)); int* noncePtr = (int*)(blockTemplate + 39); *noncePtr = nonce; blake2b(hash, sizeof(hash), blockTemplate, sizeof(blockTemplate), nullptr, 0); @@ -134,12 +139,8 @@ void generateAsm(int nonce) { void generateNative(int nonce) { uint64_t hash[4]; - unsigned char blockTemplate[] = { - 0x07, 0x07, 0xf7, 0xa4, 0xf0, 0xd6, 0x05, 0xb3, 0x03, 0x26, 0x08, 0x16, 0xba, 0x3f, 0x10, 0x90, 0x2e, 0x1a, 0x14, - 0x5a, 0xc5, 0xfa, 0xd3, 0xaa, 0x3a, 0xf6, 0xea, 0x44, 0xc1, 0x18, 0x69, 0xdc, 0x4f, 0x85, 0x3f, 0x00, 0x2b, 0x2e, - 0xea, 0x00, 0x00, 0x00, 0x00, 0x77, 0xb2, 0x06, 0xa0, 0x2c, 0xa5, 0xb1, 0xd4, 0xce, 0x6b, 0xbf, 0xdf, 0x0a, 0xca, - 0xc3, 0x8b, 0xde, 0xd3, 0x4d, 0x2d, 0xcd, 0xee, 0xf9, 0x5c, 0xd2, 0x0c, 0xef, 0xc1, 0x2f, 0x61, 0xd5, 0x61, 0x09 - }; + uint8_t blockTemplate[sizeof(blockTemplate__)]; + memcpy(blockTemplate, blockTemplate__, sizeof(blockTemplate)); int* noncePtr = (int*)(blockTemplate + 39); *noncePtr = nonce; blake2b(hash, sizeof(hash), blockTemplate, sizeof(blockTemplate), nullptr, 0); @@ -154,12 +155,8 @@ void generateNative(int nonce) { void mine(RandomX::VirtualMachine* vm, std::atomic& atomicNonce, AtomicHash& result, int noncesCount, int thread, uint8_t* scratchpad) { alignas(16) uint64_t hash[8]; - unsigned char blockTemplate[] = { - 0x07, 0x07, 0xf7, 0xa4, 0xf0, 0xd6, 0x05, 0xb3, 0x03, 0x26, 0x08, 0x16, 0xba, 0x3f, 0x10, 0x90, 0x2e, 0x1a, 0x14, - 0x5a, 0xc5, 0xfa, 0xd3, 0xaa, 0x3a, 0xf6, 0xea, 0x44, 0xc1, 0x18, 0x69, 0xdc, 0x4f, 0x85, 0x3f, 0x00, 0x2b, 0x2e, - 0xea, 0x00, 0x00, 0x00, 0x00, 0x77, 0xb2, 0x06, 0xa0, 0x2c, 0xa5, 0xb1, 0xd4, 0xce, 0x6b, 0xbf, 0xdf, 0x0a, 0xca, - 0xc3, 0x8b, 0xde, 0xd3, 0x4d, 0x2d, 0xcd, 0xee, 0xf9, 0x5c, 0xd2, 0x0c, 0xef, 0xc1, 0x2f, 0x61, 0xd5, 0x61, 0x09 - }; + uint8_t blockTemplate[sizeof(blockTemplate__)]; + memcpy(blockTemplate, blockTemplate__, sizeof(blockTemplate)); int* noncePtr = (int*)(blockTemplate + 39); int nonce = atomicNonce.fetch_add(1); @@ -168,16 +165,17 @@ void mine(RandomX::VirtualMachine* vm, std::atomic& atomicNonce, AtomicHash *noncePtr = nonce; blake2b(hash, sizeof(hash), blockTemplate, sizeof(blockTemplate), nullptr, 0); fillAes1Rx4((void*)hash, RandomX::ScratchpadSize, scratchpad); - //vm->initializeScratchpad(scratchpad, spIndex); vm->setScratchpad(scratchpad); //dump((char*)((RandomX::CompiledVirtualMachine*)vm)->getProgram(), RandomX::CodeSize, "code-1337-jmp.txt"); - for (int chain = 0; chain < 8; ++chain) { + for (int chain = 0; chain < RandomX::ChainLength - 1; ++chain) { fillAes1Rx4((void*)hash, sizeof(RandomX::Program), vm->getProgramBuffer()); vm->initialize(); vm->execute(); vm->getResult(nullptr, 0, hash); } - //vm->initializeProgram(hash); + fillAes1Rx4((void*)hash, sizeof(RandomX::Program), vm->getProgramBuffer()); + vm->initialize(); + vm->execute(); vm->getResult(scratchpad, RandomX::ScratchpadSize, hash); result.xorWith(hash); if (RandomX::trace) { @@ -190,7 +188,7 @@ void mine(RandomX::VirtualMachine* vm, std::atomic& atomicNonce, AtomicHash } int main(int argc, char** argv) { - bool softAes, lightClient, genAsm, compiled, help, largePages, async, aesBench, genNative; + bool softAes, genAsm, miningMode, help, largePages, async, genNative; int programCount, threadCount; readOption("--help", argc, argv, help); @@ -200,14 +198,12 @@ int main(int argc, char** argv) { } readOption("--softAes", argc, argv, softAes); - readOption("--lightClient", argc, argv, lightClient); readOption("--genAsm", argc, argv, genAsm); - readOption("--compiled", argc, argv, compiled); + readOption("--mine", argc, argv, miningMode); readIntOption("--threads", argc, argv, threadCount, 1); readIntOption("--nonces", argc, argv, programCount, 1000); readOption("--largePages", argc, argv, largePages); readOption("--async", argc, argv, async); - readOption("--aesBench", argc, argv, aesBench); readOption("--genNative", argc, argv, genNative); if (genAsm) { @@ -223,26 +219,14 @@ int main(int argc, char** argv) { if (softAes) std::cout << "Using software AES." << std::endl; - if(aesBench) { - programCount *= 10; - Stopwatch sw(true); - if (softAes) { - RandomX::aesBench(programCount); - } - else { - RandomX::aesBench(programCount); - } - sw.stop(); - std::cout << "AES performance: " << programCount / sw.getElapsed() << " blocks/s" << std::endl; - return 0; - } - std::atomic atomicNonce(0); AtomicHash result; std::vector vms; std::vector threads; RandomX::dataset_t dataset; + std::cout << "RandomX - " << (miningMode ? "mining" : "verification") << " mode" << std::endl; + std::cout << "Initializing..." << std::endl; try { Stopwatch sw(true); @@ -262,7 +246,7 @@ int main(int argc, char** argv) { outputHex(std::cout, (char*)dataset.cache->getCache(), sizeof(__m128i)); std::cout << std::endl; } - if (lightClient) { + if (!miningMode) { std::cout << "Cache (256 MiB) initialized in " << sw.getElapsed() << " s" << std::endl; } else { @@ -299,7 +283,7 @@ int main(int argc, char** argv) { std::cout << "Initializing " << threadCount << " virtual machine(s)..." << std::endl; for (int i = 0; i < threadCount; ++i) { RandomX::VirtualMachine* vm; - if (compiled) { + if (miningMode) { vm = new RandomX::CompiledVirtualMachine(); } else { @@ -315,7 +299,7 @@ int main(int argc, char** argv) { else { scratchpadMem = (uint8_t*)_mm_malloc(threadCount * RandomX::ScratchpadSize, RandomX::CacheLineSize); } - std::cout << "Running benchmark (" << programCount << " programs) ..." << std::endl; + std::cout << "Running benchmark (" << programCount << " nonces) ..." << std::endl; sw.restart(); if (threadCount > 1) { for (unsigned i = 0; i < vms.size(); ++i) { @@ -327,15 +311,15 @@ int main(int argc, char** argv) { } else { mine(vms[0], std::ref(atomicNonce), std::ref(result), programCount, 0, scratchpadMem); - if (compiled) - std::cout << "Average program size: " << ((RandomX::CompiledVirtualMachine*)vms[0])->getTotalSize() / programCount << std::endl; + if (miningMode) + std::cout << "Average program size: " << ((RandomX::CompiledVirtualMachine*)vms[0])->getTotalSize() / programCount / RandomX::ChainLength << std::endl; } double elapsed = sw.getElapsed(); std::cout << "Calculated result: "; result.print(std::cout); - if(programCount == 1000) - std::cout << "Reference result: 3e1c5f9b9d0bf8ffa250f860bf5f7ab76ac823b206ddee6a592660119a3640c6" << std::endl; - if (lightClient) { + /*if(programCount == 1000) + std::cout << "Reference result: 3e1c5f9b9d0bf8ffa250f860bf5f7ab76ac823b206ddee6a592660119a3640c6" << std::endl;*/ + if (!miningMode) { std::cout << "Performance: " << 1000 * elapsed / programCount << " ms per hash" << std::endl; } else {