Merge pull request #70 from SChernykh/dev

xmrig · web-flow · commit 5d71cbbed635 · 2020-10-05T12:20:10.000+07:00
RandomX: removed rx/loki
diff --git a/cmake/CUDA.cmake b/cmake/CUDA.cmake
@@ -165,8 +165,6 @@ list(APPEND CUDA_SOURCES
     src/RandomX/hash.hpp
     src/RandomX/keva/configuration.h
     src/RandomX/keva/randomx_keva.cu
-    src/RandomX/loki/configuration.h
-    src/RandomX/loki/randomx_loki.cu
     src/RandomX/monero/configuration.h
     src/RandomX/monero/randomx_monero.cu
     src/RandomX/randomx_cuda.hpp
diff --git a/src/RandomX/loki/configuration.h b/src/RandomX/loki/configuration.h
diff --git a/src/RandomX/loki/randomx_loki.cu b/src/RandomX/loki/randomx_loki.cu
diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp
@@ -52,7 +52,6 @@ struct AlgoName
 static AlgoName const algorithm_names[] = {
     { "rx/0",             Algorithm::RX_0            },
     { "rx/wow",           Algorithm::RX_WOW          },
-    { "rx/loki",          Algorithm::RX_LOKI         },
     { "rx/arq",           Algorithm::RX_ARQ          },
     { "rx/sfx",           Algorithm::RX_SFX          },
     { "rx/keva",          Algorithm::RX_KEVA         },
diff --git a/src/crypto/common/Algorithm.h b/src/crypto/common/Algorithm.h
@@ -60,7 +60,6 @@ class Algorithm
         CN_CCX,        // "cn/ccx"           Conceal (CCX)
         RX_0,          // "rx/0"             RandomX (reference configuration).
         RX_WOW,        // "rx/wow"           RandomWOW (Wownero).
-        RX_LOKI,       // "rx/loki"          RandomXL (Loki).
         RX_ARQ,        // "rx/arq"           RandomARQ (Arqma).
         RX_SFX,        // "rx/sfx"           RandomSFX (Safex Cash).
         RX_KEVA,       // "rx/keva"          RandomKV (Keva).
@@ -106,7 +105,6 @@ class Algorithm
     {
         switch (m_id) {
         case RX_0:
-        case RX_LOKI:
         case RX_SFX:
             return 0x40000;
 
@@ -154,7 +152,6 @@ class Algorithm
         if (f == RANDOM_X) {
             switch (m_id) {
             case RX_0:
-            case RX_LOKI:
             case RX_SFX:
                 return oneMiB * 2;
 
@@ -232,7 +229,6 @@ class Algorithm
 
         case RX_0:
         case RX_WOW:
-        case RX_LOKI:
         case RX_ARQ:
         case RX_SFX:
         case RX_KEVA:
diff --git a/src/cryptonight.h b/src/cryptonight.h
@@ -135,7 +135,6 @@ void cuda_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len);
 void randomx_prepare(nvid_ctx *ctx, const void *dataset, size_t dataset_size, uint32_t batch_size);
 
 namespace RandomX_Arqma   { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }
-namespace RandomX_Loki    { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }
 namespace RandomX_Monero  { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }
 namespace RandomX_Wownero { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }
 namespace RandomX_Keva    { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }
diff --git a/src/xmrig-cuda.cpp b/src/xmrig-cuda.cpp
@@ -181,10 +181,6 @@ bool rxHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *resco
             RandomX_Wownero::hash(ctx, startNonce, target, rescount, resnonce, ctx->rx_batch_size);
             break;
 
-        case xmrig::Algorithm::RX_LOKI:
-            RandomX_Loki::hash(ctx, startNonce, target, rescount, resnonce, ctx->rx_batch_size);
-            break;
-
         case xmrig::Algorithm::RX_ARQ:
             RandomX_Arqma::hash(ctx, startNonce, target, rescount, resnonce, ctx->rx_batch_size);
             break;
