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

Switched mo bench from DERO to DERO HE

Browse source
This commit is contained in:
MoneroOcean 2022-03-31 21:31:48 +00:00
parent e4eb9ea581
commit 8ddf8de6b7
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/core/MoBenchmark.cpp
View file

@ -113,33 +113,33 @@ void MoBenchmark::read(const rapidjson::Value &value)
double MoBenchmark::get_algo_perf(Algorithm::Id algo) const { double MoBenchmark::get_algo_perf(Algorithm::Id algo) const {
switch (algo) { switch (algo) {
case Algorithm::CN_CCX: return m_bench_algo_perf[BenchAlgo::CN_CCX]; case Algorithm::CN_CCX: return m_bench_algo_perf[BenchAlgo::CN_CCX];
case Algorithm::CN_0: return m_bench_algo_perf[BenchAlgo::CN_CCX] / 2; case Algorithm::CN_0: return m_bench_algo_perf[BenchAlgo::CN_CCX] / 2;
case Algorithm::CN_1: return m_bench_algo_perf[BenchAlgo::CN_R]; case Algorithm::CN_1: return m_bench_algo_perf[BenchAlgo::CN_R];
case Algorithm::CN_2: return m_bench_algo_perf[BenchAlgo::CN_R]; case Algorithm::CN_2: return m_bench_algo_perf[BenchAlgo::CN_R];
case Algorithm::CN_R: return m_bench_algo_perf[BenchAlgo::CN_R]; case Algorithm::CN_R: return m_bench_algo_perf[BenchAlgo::CN_R];
case Algorithm::CN_RTO: return m_bench_algo_perf[BenchAlgo::CN_R]; case Algorithm::CN_RTO: return m_bench_algo_perf[BenchAlgo::CN_R];
case Algorithm::CN_XAO: return m_bench_algo_perf[BenchAlgo::CN_R]; case Algorithm::CN_XAO: return m_bench_algo_perf[BenchAlgo::CN_R];
case Algorithm::CN_FAST: return m_bench_algo_perf[BenchAlgo::CN_R] * 2; case Algorithm::CN_FAST: return m_bench_algo_perf[BenchAlgo::CN_R] * 2;
case Algorithm::CN_HALF: return m_bench_algo_perf[BenchAlgo::CN_R] * 2; case Algorithm::CN_HALF: return m_bench_algo_perf[BenchAlgo::CN_R] * 2;
case Algorithm::CN_RWZ: return m_bench_algo_perf[BenchAlgo::CN_R] / 3 * 4; case Algorithm::CN_RWZ: return m_bench_algo_perf[BenchAlgo::CN_R] / 3 * 4;
case Algorithm::CN_ZLS: return m_bench_algo_perf[BenchAlgo::CN_R] / 3 * 4; case Algorithm::CN_ZLS: return m_bench_algo_perf[BenchAlgo::CN_R] / 3 * 4;
case Algorithm::CN_DOUBLE: return m_bench_algo_perf[BenchAlgo::CN_R] / 2; case Algorithm::CN_DOUBLE: return m_bench_algo_perf[BenchAlgo::CN_R] / 2;
case Algorithm::CN_LITE_0: return m_bench_algo_perf[BenchAlgo::CN_LITE_1]; case Algorithm::CN_LITE_0: return m_bench_algo_perf[BenchAlgo::CN_LITE_1];
case Algorithm::CN_LITE_1: return m_bench_algo_perf[BenchAlgo::CN_LITE_1]; case Algorithm::CN_LITE_1: return m_bench_algo_perf[BenchAlgo::CN_LITE_1];
case Algorithm::CN_HEAVY_XHV: return m_bench_algo_perf[BenchAlgo::CN_HEAVY_XHV]; case Algorithm::CN_HEAVY_XHV: return m_bench_algo_perf[BenchAlgo::CN_HEAVY_XHV];
case Algorithm::CN_PICO_0: return m_bench_algo_perf[BenchAlgo::CN_PICO_0]; case Algorithm::CN_PICO_0: return m_bench_algo_perf[BenchAlgo::CN_PICO_0];
case Algorithm::CN_PICO_TLO: return m_bench_algo_perf[BenchAlgo::CN_PICO_0]; case Algorithm::CN_PICO_TLO: return m_bench_algo_perf[BenchAlgo::CN_PICO_0];
case Algorithm::CN_GPU: return m_bench_algo_perf[BenchAlgo::CN_GPU]; case Algorithm::CN_GPU: return m_bench_algo_perf[BenchAlgo::CN_GPU];
case Algorithm::AR2_CHUKWA_V2: return m_bench_algo_perf[BenchAlgo::AR2_CHUKWA_V2]; case Algorithm::AR2_CHUKWA_V2: return m_bench_algo_perf[BenchAlgo::AR2_CHUKWA_V2];
case Algorithm::ASTROBWT_DERO: return m_bench_algo_perf[BenchAlgo::ASTROBWT_DERO]; case Algorithm::ASTROBWT_DERO_2: return m_bench_algo_perf[BenchAlgo::ASTROBWT_DERO_2];
case Algorithm::KAWPOW_RVN: return m_bench_algo_perf[BenchAlgo::KAWPOW_RVN]; case Algorithm::KAWPOW_RVN: return m_bench_algo_perf[BenchAlgo::KAWPOW_RVN];
case Algorithm::RX_0: return m_bench_algo_perf[BenchAlgo::RX_0]; case Algorithm::RX_0: return m_bench_algo_perf[BenchAlgo::RX_0];
case Algorithm::RX_SFX: return m_bench_algo_perf[BenchAlgo::RX_0]; case Algorithm::RX_SFX: return m_bench_algo_perf[BenchAlgo::RX_0];
case Algorithm::RX_GRAFT: return m_bench_algo_perf[BenchAlgo::RX_GRAFT]; case Algorithm::RX_GRAFT: return m_bench_algo_perf[BenchAlgo::RX_GRAFT];
case Algorithm::RX_ARQ: return m_bench_algo_perf[BenchAlgo::RX_ARQ]; case Algorithm::RX_ARQ: return m_bench_algo_perf[BenchAlgo::RX_ARQ];
case Algorithm::RX_XLA: return m_bench_algo_perf[BenchAlgo::RX_XLA]; case Algorithm::RX_XLA: return m_bench_algo_perf[BenchAlgo::RX_XLA];
case Algorithm::GHOSTRIDER_RTM: return m_bench_algo_perf[BenchAlgo::GHOSTRIDER_RTM]; case Algorithm::GHOSTRIDER_RTM: return m_bench_algo_perf[BenchAlgo::GHOSTRIDER_RTM];
default: return 0.0f; default: return 0.0f;
} }
} }

30
src/core/MoBenchmark.h
View file

@ -34,20 +34,20 @@ class Job;
class MoBenchmark : public IJobResultListener { class MoBenchmark : public IJobResultListener {
enum BenchAlgo : int { enum BenchAlgo : int {
GHOSTRIDER_RTM, // "ghostrider" GhostRider GHOSTRIDER_RTM, // "ghostrider" GhostRider
CN_R, // "cn/r" CryptoNightR (Monero's variant 4). CN_R, // "cn/r" CryptoNightR (Monero's variant 4).
CN_LITE_1, // "cn-lite/1" CryptoNight-Lite variant 1. CN_LITE_1, // "cn-lite/1" CryptoNight-Lite variant 1.
CN_HEAVY_XHV, // "cn-heavy/xhv" CryptoNight-Heavy (modified, Haven Protocol only). CN_HEAVY_XHV, // "cn-heavy/xhv" CryptoNight-Heavy (modified, Haven Protocol only).
CN_PICO_0, // "cn-pico" CryptoNight-Pico. CN_PICO_0, // "cn-pico" CryptoNight-Pico.
CN_CCX, // "cn/ccx" Conceal (CCX). CN_CCX, // "cn/ccx" Conceal (CCX).
CN_GPU, // "cn/gpu" CryptoNight-GPU (Ryo). CN_GPU, // "cn/gpu" CryptoNight-GPU (Ryo).
AR2_CHUKWA_V2, // "argon2/chukwav2" Argon2id (Chukwa v2). AR2_CHUKWA_V2, // "argon2/chukwav2" Argon2id (Chukwa v2).
KAWPOW_RVN, // "kawpow/rvn" KawPow (RVN) KAWPOW_RVN, // "kawpow/rvn" KawPow (RVN)
ASTROBWT_DERO, // "astrobwt" AstroBWT (Dero). ASTROBWT_DERO_2, // "astrobwt/v2" AstroBWT (Dero HE).
RX_0, // "rx/0" RandomX (Monero). RX_0, // "rx/0" RandomX (Monero).
RX_GRAFT, // "rx/graft" RandomGraft (Graft). RX_GRAFT, // "rx/graft" RandomGraft (Graft).
RX_ARQ, // "rx/arq" RandomARQ (Arqma). RX_ARQ, // "rx/arq" RandomARQ (Arqma).
RX_XLA, // "panthera" Panthera (Scala2). RX_XLA, // "panthera" Panthera (Scala2).
MAX, MAX,
MIN = 0, MIN = 0,
INVALID = -1, INVALID = -1,
@ -63,7 +63,7 @@ class MoBenchmark : public IJobResultListener {
Algorithm::CN_GPU, Algorithm::CN_GPU,
Algorithm::AR2_CHUKWA_V2, Algorithm::AR2_CHUKWA_V2,
Algorithm::KAWPOW_RVN, Algorithm::KAWPOW_RVN,
Algorithm::ASTROBWT_DERO, Algorithm::ASTROBWT_DERO_2,
Algorithm::RX_0, Algorithm::RX_0,
Algorithm::RX_GRAFT, Algorithm::RX_GRAFT,
Algorithm::RX_ARQ, Algorithm::RX_ARQ,