From c715fc618cad8780e162808de3f9b71b5c37e6bd Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Wed, 23 Sep 2020 00:50:15 +0000 Subject: [PATCH] Fixed merge errors --- src/crypto/randomx/randomx.cpp | 5 ++++- src/crypto/randomx/randomx.h | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/crypto/randomx/randomx.cpp b/src/crypto/randomx/randomx.cpp index b10e064f..5bb95137 100644 --- a/src/crypto/randomx/randomx.cpp +++ b/src/crypto/randomx/randomx.cpp @@ -139,7 +139,10 @@ RandomX_ConfigurationScala2::RandomX_ConfigurationScala2() } RandomX_ConfigurationBase::RandomX_ConfigurationBase() - : ArgonIterations(3) + : ArgonMemory = 262144 + , CacheAccesses = 8 + , DatasetBaseSize = 2147483648 + , ArgonIterations(3) , ArgonLanes(1) , ArgonSalt("RandomX\x03") , ScratchpadL1_Size(16384) diff --git a/src/crypto/randomx/randomx.h b/src/crypto/randomx/randomx.h index 1f3c7480..a413a9e1 100644 --- a/src/crypto/randomx/randomx.h +++ b/src/crypto/randomx/randomx.h @@ -68,10 +68,7 @@ struct RandomX_ConfigurationBase // Common parameters for all RandomX variants enum Params : uint64_t { - ArgonMemory = 262144, - CacheAccesses = 8, SuperscalarLatency = 170, - DatasetBaseSize = 2147483648, DatasetExtraSize = 33554368, JumpBits = 8, JumpOffset = 8, @@ -80,6 +77,10 @@ struct RandomX_ConfigurationBase ConditionMask_Calculated = ((1 << JumpBits) - 1) << JumpOffset, }; + uint32_t ArgonMemory; + uint32_t CacheAccesses; + uint32_t DatasetBaseSize; + uint32_t ArgonIterations; uint32_t ArgonLanes; const char* ArgonSalt;