Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RandomX: removed rx/loki #70

Merged
merged 1 commit into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmake/CUDA.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
125 changes: 0 additions & 125 deletions src/RandomX/loki/configuration.h

This file was deleted.

33 changes: 0 additions & 33 deletions src/RandomX/loki/randomx_loki.cu

This file was deleted.

1 change: 0 additions & 1 deletion src/crypto/common/Algorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
4 changes: 0 additions & 4 deletions src/crypto/common/Algorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -106,7 +105,6 @@ class Algorithm
{
switch (m_id) {
case RX_0:
case RX_LOKI:
case RX_SFX:
return 0x40000;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -232,7 +229,6 @@ class Algorithm

case RX_0:
case RX_WOW:
case RX_LOKI:
case RX_ARQ:
case RX_SFX:
case RX_KEVA:
Expand Down
1 change: 0 additions & 1 deletion src/cryptonight.h
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand Down
4 changes: 0 additions & 4 deletions src/xmrig-cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down