Advertise KawPow performance with compatible units

Author: MoneroOcean

src/core/MoBenchmark.cpp

@@ -30,10 +30,11 @@
 #include "net/Network.h"
 
 #include <chrono>
+#include <cstring>
 
 namespace xmrig {
 
-MoBenchmark::MoBenchmark() : m_controller(nullptr), m_isNewBenchRun(true) {}
+MoBenchmark::MoBenchmark() : m_controller(nullptr), m_isNewBenchRun(true), m_isRawKawPow(false) {}
 
 MoBenchmark::~MoBenchmark() {}
 
@@ -69,35 +70,43 @@ rapidjson::Value MoBenchmark::toJSON(rapidjson::Document &doc) const
 
     for (const Algorithm a : Algorithm::all()) {
         if (algo_perf[a.id()] == 0.0f) continue;
-        obj.AddMember(StringRef(a.name()), algo_perf[a.id()], allocator);
+        obj.AddMember(StringRef(poolAlgoName(a)), algo_perf[a.id()], allocator);
     }
 
     return obj;
 }
 
 void MoBenchmark::flush_perf() {
    for (const Algorithm::Id algo : Algorithm::all()) algo_perf[algo] = 0.0f;
+   m_isRawKawPow = false;
 }
 
 void MoBenchmark::read(const rapidjson::Value &value)
 {
     flush_perf();
     if (value.IsObject()) {
         for (auto &member : value.GetObject()) {
-            const Algorithm algo(member.name.GetString());
+            const bool rawKawPow = strcmp(member.name.GetString(), "kawpow1") == 0;
+            const Algorithm algo(rawKawPow ? "kawpow" : member.name.GetString());
             if (!algo.isValid()) {
                 LOG_INFO("%s " BRIGHT_BLACK_BG(MAGENTA_BOLD_S " Ignoring wrong name for algo-perf[%s] "), Tags::benchmark(), member.name.GetString());
                 continue;
             }
-            if (member.value.IsDouble()) {
-                algo_perf[algo.id()] = member.value.GetDouble();
+            double perf = 0.0;
+            if (member.value.IsDouble()) perf = member.value.GetDouble();
+            else if (member.value.IsInt()) perf = member.value.GetInt();
+            else {
+                LOG_INFO("%s " BRIGHT_BLACK_BG(MAGENTA_BOLD_S " Ignoring wrong value for algo-perf[%s] "), Tags::benchmark(), member.name.GetString());
                 continue;
             }
-            if (member.value.IsInt()) {
-                algo_perf[algo.id()] = member.value.GetInt();
-                continue;
+#           ifdef XMRIG_ALGO_KAWPOW
+            if (algo.id() == Algorithm::KAWPOW_RVN) {
+                if (!rawKawPow && m_isRawKawPow) continue;
+                m_isRawKawPow = rawKawPow;
             }
-            LOG_INFO("%s " BRIGHT_BLACK_BG(MAGENTA_BOLD_S " Ignoring wrong value for algo-perf[%s] "), Tags::benchmark(), member.name.GetString());
+#           endif
+            algo_perf[algo.id()] = perf;
+            continue;
         }
     }
     m_isNewBenchRun = false;
@@ -108,6 +117,13 @@ void MoBenchmark::read(const rapidjson::Value &value)
         }
 }
 
+const char *MoBenchmark::poolAlgoName(const Algorithm &algo) const {
+#   ifdef XMRIG_ALGO_KAWPOW
+    if (algo.id() == Algorithm::KAWPOW_RVN && m_isRawKawPow) return "kawpow1";
+#   endif
+    return algo.name();
+}
+
 double MoBenchmark::get_algo_perf(Algorithm::Id algo) const {
     switch (algo) {
         case Algorithm::CN_0:            return algo_perf[Algorithm::CN_CCX] / 2;
@@ -140,6 +156,9 @@ void MoBenchmark::start() {
         run_next_bench_algo();
         return;
     }
+#   ifdef XMRIG_ALGO_KAWPOW
+    if (algo.id() == Algorithm::KAWPOW_RVN) m_isRawKawPow = true;
+#   endif
     // calculate number of active miner backends in m_enabled_backend_count
     m_enabled_backend_count = 0;
     for (auto backend : m_controller->miner()->backends()) if (backend->isEnabled() && backend->isEnabled(algo)) ++ m_enabled_backend_count;
@@ -229,9 +248,6 @@ void MoBenchmark::onJobResult(const JobResult& result) {
             if (!(hashrate = t[1]))
                 if (!(hashrate = t[0]))
                     hashrate = static_cast<double>(m_hash_count) * result.diff / (now - m_bench_start) * 1000.0f;
-#       ifdef XMRIG_ALGO_KAWPOW
-        if (algo.id() == Algorithm::KAWPOW_RVN) hashrate /= ((double)0xFFFFFFFFFFFFFFFF) / 0xFF000000;
-#       endif
         algo_perf[algo.id()] = hashrate; // store hashrate result
         LOG_INFO("%s " BRIGHT_BLACK_BG(WHITE_BOLD_S " Algo " MAGENTA_BOLD_S "%s" WHITE_BOLD_S " hashrate: " CYAN_BOLD_S "%f "), Tags::benchmark(), algo.name(), hashrate);
         run_next_bench_algo();

src/core/MoBenchmark.h

@@ -74,6 +74,7 @@ class MoBenchmark : public IJobResultListener {
 
         Controller *m_controller;          // to get access to config and network
         bool m_isNewBenchRun;              // true if benchmark is need to be executed or was executed
+        bool m_isRawKawPow;                // true when KawPow perf was measured in raw H/s
         uint64_t m_bench_algo;             // current perf algo number we benchmark (in bench_algos array)
         uint64_t m_hash_count;             // number of hashes calculated for current perf algo
         uint64_t m_time_start;             // time of the first resultt for current perf algo (in ms)
@@ -98,6 +99,7 @@ class MoBenchmark : public IJobResultListener {
         void flush_perf();
 
         bool isNewBenchRun() const { return m_isNewBenchRun; }
+        const char *poolAlgoName(const Algorithm &algo) const;
         mutable std::map<Algorithm::Id, double> algo_perf;
 
         rapidjson::Value toJSON(rapidjson::Document &doc) const;

src/net/Network.cpp

@@ -201,7 +201,12 @@ void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document &
     Value algo(kArrayType);
 
     for (const auto &a : algorithms) {
-        algo.PushBack(StringRef(a.name()), allocator);
+#       ifdef XMRIG_FEATURE_MO_BENCHMARK
+        const char *name = m_controller->config()->benchmark().poolAlgoName(a);
+#       else
+        const char *name = a.name();
+#       endif
+        algo.PushBack(StringRef(name), allocator);
     }
 
     params.AddMember("algo", algo, allocator);
@@ -211,7 +216,8 @@ void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document &
     Value algo_perf(kObjectType);
 
     for (const auto &a : algorithms) {
-        algo_perf.AddMember(StringRef(a.name()), m_controller->config()->benchmark().algo_perf[a.id()], allocator);
+        const char *name = m_controller->config()->benchmark().poolAlgoName(a);
+        algo_perf.AddMember(StringRef(name), m_controller->config()->benchmark().algo_perf[a.id()], allocator);
     }
 
     params.AddMember("algo-perf", algo_perf, allocator);

tests/common/miner_harness.js

@@ -62,7 +62,7 @@ const ALGO_PERF = {
     "cn/ccx": 1,
     "cn/gpu": 1,
     "argon2/chukwav2": 1,
-    "kawpow": 1,
+    "kawpow1": 1,
     "ghostrider": 1,
     "flex": 1,
     "cn-heavy/xhv": 1,