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

Algo num fix

Browse source
This commit is contained in:
MoneroOcean 2020-10-19 00:02:40 +00:00
parent 7c2ebd847e
commit 5e351798e0
6 changed files with 5760 additions and 5772 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/backend/cpu/CpuConfig_gen.h
View file

@ -138,10 +138,6 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
count += threads.move("rx/wow", std::move(wow)); count += threads.move("rx/wow", std::move(wow));
} }
if (!threads.isExist(Algorithm::RX_DEFYX)) {
count += generate("defyx", threads, Algorithm::RX_DEFYX, limit);
}
if (!threads.isExist(Algorithm::RX_XLA)) { if (!threads.isExist(Algorithm::RX_XLA)) {
count += generate("panthera", threads, Algorithm::RX_XLA, limit); count += generate("panthera", threads, Algorithm::RX_XLA, limit);
} }

3726
src/backend/opencl/cl/cn/cryptonight_cl.h
View file

File diff suppressed because it is too large Load diff

7794
src/backend/opencl/cl/rx/randomx_cl.h
View file

File diff suppressed because it is too large Load diff

2
src/base/crypto/Algorithm.cpp
View file

@ -111,8 +111,6 @@ static AlgoName const algorithm_names[] = {
{ "RandomSFX", nullptr, Algorithm::RX_SFX }, { "RandomSFX", nullptr, Algorithm::RX_SFX },
{ "randomx/keva", "rx/keva", Algorithm::RX_KEVA }, { "randomx/keva", "rx/keva", Algorithm::RX_KEVA },
{ "RandomKEVA", nullptr, Algorithm::RX_KEVA }, { "RandomKEVA", nullptr, Algorithm::RX_KEVA },
{ "defyx", "defyx", Algorithm::RX_DEFYX },
{ "DefyX", nullptr, Algorithm::RX_DEFYX },
{ "panthera", "panthera", Algorithm::RX_XLA }, { "panthera", "panthera", Algorithm::RX_XLA },
{ "Panthera", "panthera", Algorithm::RX_XLA }, { "Panthera", "panthera", Algorithm::RX_XLA },
# endif # endif

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

@ -630,7 +630,6 @@ extern "C" {
assert(output != nullptr); assert(output != nullptr);
alignas(16) uint64_t tempHash[8]; alignas(16) uint64_t tempHash[8];
switch (algo) { switch (algo) {
case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), input, inputSize); break;
case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break; case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize); default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize);
} }
@ -646,7 +645,6 @@ extern "C" {
void randomx_calculate_hash_first(randomx_vm* machine, uint64_t (&tempHash)[8], const void* input, size_t inputSize, const xmrig::Algorithm algo) { void randomx_calculate_hash_first(randomx_vm* machine, uint64_t (&tempHash)[8], const void* input, size_t inputSize, const xmrig::Algorithm algo) {
switch (algo) { switch (algo) {
case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), input, inputSize); break;
case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break; case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize); default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize);
} }
@ -665,7 +663,6 @@ extern "C" {
// Finish current hash and fill the scratchpad for the next hash at the same time // Finish current hash and fill the scratchpad for the next hash at the same time
switch (algo) { switch (algo) {
case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break;
case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break; case xmrig::Algorithm::RX_XLA: rx_yespower_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break;
default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), nextInput, nextInputSize); default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), nextInput, nextInputSize);
} }

3
src/crypto/rx/RxAlgo.cpp
View file

@ -52,9 +52,6 @@ const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm)
case Algorithm::RX_KEVA: case Algorithm::RX_KEVA:
return &RandomX_KevaConfig; return &RandomX_KevaConfig;
case Algorithm::RX_DEFYX:
return &RandomX_ScalaConfig;
case Algorithm::RX_XLA: case Algorithm::RX_XLA:
return &RandomX_Scala2Config; return &RandomX_Scala2Config;