From 360c8ed91327cca2fd3092b69fae1f21fef6eb56 Mon Sep 17 00:00:00 2001 From: tevador Date: Sun, 21 Apr 2019 00:50:57 +0200 Subject: [PATCH] Fixed superscalar test projects --- ...ke2_benerator.cpp => blake2_generator.cpp} | 0 src/tests/superscalar-avalanche.cpp | 18 +++---- src/tests/superscalar-init.cpp | 8 ++- src/tests/superscalar-stats.cpp | 10 ++-- vcxproj/randomx.vcxproj | 2 +- vcxproj/randomx.vcxproj.filters | 6 +-- vcxproj/superscalar-avalanche.vcxproj | 19 ++----- vcxproj/superscalar-avalanche.vcxproj.filters | 50 ------------------- vcxproj/superscalar-init.vcxproj | 19 ++----- vcxproj/superscalar-init.vcxproj.filters | 50 ------------------- vcxproj/superscalar-stats.vcxproj | 8 +-- vcxproj/superscalar-stats.vcxproj.filters | 9 ---- 12 files changed, 31 insertions(+), 168 deletions(-) rename src/{blake2_benerator.cpp => blake2_generator.cpp} (100%) diff --git a/src/blake2_benerator.cpp b/src/blake2_generator.cpp similarity index 100% rename from src/blake2_benerator.cpp rename to src/blake2_generator.cpp diff --git a/src/tests/superscalar-avalanche.cpp b/src/tests/superscalar-avalanche.cpp index 9fa1613..8c0d436 100644 --- a/src/tests/superscalar-avalanche.cpp +++ b/src/tests/superscalar-avalanche.cpp @@ -20,10 +20,8 @@ along with RandomX. If not, see. #include #include #include -#include "../superscalarGenerator.hpp" -#include "../InterpretedVirtualMachine.hpp" -#include "../intrinPortable.h" -#include "../Blake2Generator.hpp" +#include "../superscalar.hpp" +#include "../intrin_portable.h" 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 }; @@ -35,7 +33,7 @@ int main() { for (int i = 0; i < 10000; ++i) { uint64_t ra[8] = { 6364136223846793005ULL, - 9298410992540426048ULL, + 9298410992540426748ULL, 12065312585734608966ULL, 9306329213124610396ULL, 5281919268842080866ULL, @@ -46,11 +44,11 @@ int main() { uint64_t rb[8]; memcpy(rb, ra, sizeof rb); rb[0] ^= (1ULL << bit); - RandomX::SuperscalarProgram p; - RandomX::Blake2Generator gen(seed, i); - RandomX::generateSuperscalar(p, gen); - RandomX::InterpretedVirtualMachine::executeSuperscalar(ra, p, dummy); - RandomX::InterpretedVirtualMachine::executeSuperscalar(rb, p, dummy); + randomx::SuperscalarProgram p; + randomx::Blake2Generator gen(seed, sizeof seed, i); + randomx::generateSuperscalar(p, gen); + randomx::executeSuperscalar(ra, p, nullptr); + randomx::executeSuperscalar(rb, p, nullptr); uint64_t diff = 0; for (int j = 0; j < 8; ++j) { diff += __popcnt64(ra[j] ^ rb[j]); diff --git a/src/tests/superscalar-init.cpp b/src/tests/superscalar-init.cpp index a7c1208..d7eea75 100644 --- a/src/tests/superscalar-init.cpp +++ b/src/tests/superscalar-init.cpp @@ -21,10 +21,8 @@ along with RandomX. If not, see. #include #include #include -#include "../superscalarGenerator.hpp" -#include "../InterpretedVirtualMachine.hpp" -#include "../intrinPortable.h" -#include "../configuration.h" +#include "../superscalar.hpp" +#include "../common.hpp" 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 }; @@ -39,7 +37,7 @@ int main() { constexpr uint64_t superscalarAdd5 = 10536153434571861004ULL; constexpr uint64_t superscalarAdd6 = 3398623926847679864ULL; constexpr uint64_t superscalarAdd7 = 9549104520008361294ULL; - constexpr uint32_t totalBlocks = RANDOMX_DATASET_SIZE / RandomX::CacheLineSize; + constexpr uint32_t totalBlocks = RANDOMX_DATASET_SIZE / randomx::CacheLineSize; std::unordered_set registerValues; registerValues.reserve(totalBlocks); registerValues.rehash(totalBlocks); diff --git a/src/tests/superscalar-stats.cpp b/src/tests/superscalar-stats.cpp index ef6bd08..f9897fd 100644 --- a/src/tests/superscalar-stats.cpp +++ b/src/tests/superscalar-stats.cpp @@ -19,8 +19,8 @@ along with RandomX. If not, see. #include #include -#include "../superscalarGenerator.hpp" -#include "../Blake2Generator.hpp" +#include "../superscalar.hpp" +#include "../blake2_generator.hpp" 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 }; @@ -34,9 +34,9 @@ int main() { int64_t mulCount = 0; int64_t size = 0; for (int i = 0; i < count; ++i) { - RandomX::SuperscalarProgram prog; - RandomX::Blake2Generator gen(seed, i); - RandomX::generateSuperscalar(prog, gen); + randomx::SuperscalarProgram prog; + randomx::Blake2Generator gen(seed, i); + randomx::generateSuperscalar(prog, gen); asicLatency += prog.asicLatency; codesize += prog.codeSize; cpuLatency += prog.cpuLatency; diff --git a/vcxproj/randomx.vcxproj b/vcxproj/randomx.vcxproj index 44d6625..0ad01ab 100644 --- a/vcxproj/randomx.vcxproj +++ b/vcxproj/randomx.vcxproj @@ -128,7 +128,7 @@ - + diff --git a/vcxproj/randomx.vcxproj.filters b/vcxproj/randomx.vcxproj.filters index 9626898..311955b 100644 --- a/vcxproj/randomx.vcxproj.filters +++ b/vcxproj/randomx.vcxproj.filters @@ -39,9 +39,6 @@ Source Files - - Source Files - Source Files @@ -78,6 +75,9 @@ Source Files + + Source Files + diff --git a/vcxproj/superscalar-avalanche.vcxproj b/vcxproj/superscalar-avalanche.vcxproj index 1cac62b..80d4afc 100644 --- a/vcxproj/superscalar-avalanche.vcxproj +++ b/vcxproj/superscalar-avalanche.vcxproj @@ -116,25 +116,12 @@ - - - - - - - - - - - - - - - - + + {3346a4ad-c438-4324-8b77-47a16452954b} + diff --git a/vcxproj/superscalar-avalanche.vcxproj.filters b/vcxproj/superscalar-avalanche.vcxproj.filters index 93b3838..6f33fce 100644 --- a/vcxproj/superscalar-avalanche.vcxproj.filters +++ b/vcxproj/superscalar-avalanche.vcxproj.filters @@ -18,55 +18,5 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - \ No newline at end of file diff --git a/vcxproj/superscalar-init.vcxproj b/vcxproj/superscalar-init.vcxproj index d765f85..e17e2ec 100644 --- a/vcxproj/superscalar-init.vcxproj +++ b/vcxproj/superscalar-init.vcxproj @@ -116,25 +116,12 @@ - - - - - - - - - - - - - - - - + + {3346a4ad-c438-4324-8b77-47a16452954b} + diff --git a/vcxproj/superscalar-init.vcxproj.filters b/vcxproj/superscalar-init.vcxproj.filters index cad6e2b..d78d281 100644 --- a/vcxproj/superscalar-init.vcxproj.filters +++ b/vcxproj/superscalar-init.vcxproj.filters @@ -15,58 +15,8 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - \ No newline at end of file diff --git a/vcxproj/superscalar-stats.vcxproj b/vcxproj/superscalar-stats.vcxproj index 8f71529..33d26c5 100644 --- a/vcxproj/superscalar-stats.vcxproj +++ b/vcxproj/superscalar-stats.vcxproj @@ -115,11 +115,13 @@ - - - + + + {3346a4ad-c438-4324-8b77-47a16452954b} + + diff --git a/vcxproj/superscalar-stats.vcxproj.filters b/vcxproj/superscalar-stats.vcxproj.filters index bd32a77..6d5129c 100644 --- a/vcxproj/superscalar-stats.vcxproj.filters +++ b/vcxproj/superscalar-stats.vcxproj.filters @@ -18,14 +18,5 @@ Source Files - - Source Files - - - Source Files - - - Source Files - \ No newline at end of file