Fixed merge errors
This commit is contained in:
parent
21b156cbda
commit
c715fc618c
2 changed files with 8 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue