mirror of
https://github.com/xmrig/xmrig.git
synced 2025-12-10 17:12:46 -05:00
Fixed merge
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user