fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge errors

Browse source
This commit is contained in:
MoneroOcean 2020-09-23 00:50:15 +00:00
parent 21b156cbda
commit c715fc618c
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,10 @@ RandomX_ConfigurationScala2::RandomX_ConfigurationScala2()
} }
RandomX_ConfigurationBase::RandomX_ConfigurationBase() RandomX_ConfigurationBase::RandomX_ConfigurationBase()
: ArgonIterations(3) : ArgonMemory = 262144
, CacheAccesses = 8
, DatasetBaseSize = 2147483648
, ArgonIterations(3)
, ArgonLanes(1) , ArgonLanes(1)
, ArgonSalt("RandomX\x03") , ArgonSalt("RandomX\x03")
, ScratchpadL1_Size(16384) , ScratchpadL1_Size(16384)

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

@ -68,10 +68,7 @@ struct RandomX_ConfigurationBase
// Common parameters for all RandomX variants // Common parameters for all RandomX variants
enum Params : uint64_t enum Params : uint64_t
{ {
ArgonMemory = 262144,
CacheAccesses = 8,
SuperscalarLatency = 170, SuperscalarLatency = 170,
DatasetBaseSize = 2147483648,
DatasetExtraSize = 33554368, DatasetExtraSize = 33554368,
JumpBits = 8, JumpBits = 8,
JumpOffset = 8, JumpOffset = 8,
@ -80,6 +77,10 @@ struct RandomX_ConfigurationBase
ConditionMask_Calculated = ((1 << JumpBits) - 1) << JumpOffset, ConditionMask_Calculated = ((1 << JumpBits) - 1) << JumpOffset,
}; };
uint32_t ArgonMemory;
uint32_t CacheAccesses;
uint32_t DatasetBaseSize;
uint32_t ArgonIterations; uint32_t ArgonIterations;
uint32_t ArgonLanes; uint32_t ArgonLanes;
const char* ArgonSalt; const char* ArgonSalt;