Fixed merge

This commit is contained in:
MoneroOcean 2024-08-12 00:28:45 +03:00
parent efef9fd111
commit 7dfc801b4e
2 changed files with 2 additions and 1 deletions

View file

@ -154,6 +154,7 @@ RandomX_ConfigurationBase::RandomX_ConfigurationBase()
, ArgonIterations(3)
, ArgonLanes(1)
, ArgonSalt("RandomX\x03")
, SuperscalarLatency(170)
, ScratchpadL1_Size(16384)
, ScratchpadL2_Size(262144)
, ScratchpadL3_Size(2097152)

View file

@ -68,7 +68,6 @@ struct RandomX_ConfigurationBase
// Common parameters for all RandomX variants
enum Params : uint64_t
{
SuperscalarLatency = 170,
DatasetExtraSize = 33554368,
JumpBits = 8,
JumpOffset = 8,
@ -83,6 +82,7 @@ struct RandomX_ConfigurationBase
uint32_t ArgonIterations;
uint32_t ArgonLanes;
const char* ArgonSalt;
uint32_t SuperscalarLatency;
uint32_t ScratchpadL1_Size;
uint32_t ScratchpadL2_Size;