Merge

src/crypto/common/Algorithm.cpp

@@ -117,30 +117,17 @@ static AlgoName const algorithm_names[] = {
     { "RandomXL",                  nullptr,            Algorithm::RX_LOKI         },
     { "DefyX",                     "defyx",            Algorithm::DEFYX           },
 #   endif
+#   ifdef XMRIG_ALGO_ARGON2
+    { "argon2/chukwa",             nullptr,            Algorithm::AR2_CHUKWA      },
+    { "chukwa",                    nullptr,            Algorithm::AR2_CHUKWA      },
+    { "argon2/wrkz",               nullptr,            Algorithm::AR2_WRKZ        },
+#   endif
 };
 
 
 } /* namespace xmrig */
 
 
-int xmrig::Algorithm::maxIntensity() const
-{
-#   ifdef XMRIG_ALGO_RANDOMX
-    if (family() == RANDOM_X) {
-        return 1;
-    }
-#   endif
-
-#   ifdef XMRIG_ALGO_CN_GPU
-    if (m_id == CN_GPU) {
-        return 1;
-    }
-#   endif
-
-    return 5;
-}
-
-
 rapidjson::Value xmrig::Algorithm::toJSON() const
 {
     using namespace rapidjson;
@@ -174,6 +161,8 @@ size_t xmrig::Algorithm::l2() const
 
 size_t xmrig::Algorithm::l3() const
 {
+    constexpr size_t oneMiB = 0x100000;
+
     const Family f = family();
     assert(f != UNKNOWN);
 
@@ -183,8 +172,6 @@ size_t xmrig::Algorithm::l3() const
 
 #   ifdef XMRIG_ALGO_RANDOMX
     if (f == RANDOM_X) {
-        constexpr size_t oneMiB = 0x100000;
-
         switch (m_id) {
         case RX_0:
         case RX_LOKI:
@@ -202,10 +189,49 @@ size_t xmrig::Algorithm::l3() const
     }
 #   endif
 
+#   ifdef XMRIG_ALGO_ARGON2
+    if (f == ARGON2) {
+        switch (m_id) {
+        case AR2_CHUKWA:
+            return oneMiB / 2;
+
+        case AR2_WRKZ:
+            return oneMiB / 4;
+
+        default:
+            break;
+        }
+    }
+#   endif
+
     return 0;
 }
 
 
+uint32_t xmrig::Algorithm::maxIntensity() const
+{
+#   ifdef XMRIG_ALGO_RANDOMX
+    if (family() == RANDOM_X) {
+        return 1;
+    }
+#   endif
+
+#   ifdef XMRIG_ALGO_ARGON2
+    if (family() == ARGON2) {
+        return 1;
+    }
+#   endif
+
+#   ifdef XMRIG_ALGO_CN_GPU
+    if (m_id == CN_GPU) {
+        return 1;
+    }
+#   endif
+
+    return 5;
+}
+
+
 xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
 {
     switch (id) {
@@ -252,6 +278,12 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
         return RANDOM_X;
 #   endif
 
+#   ifdef XMRIG_ALGO_ARGON2
+    case AR2_CHUKWA:
+    case AR2_WRKZ:
+        return ARGON2;
+#   endif
+
     case INVALID:
     case MAX:
         return UNKNOWN;
@@ -281,7 +313,7 @@ const char *xmrig::Algorithm::name(bool shortName) const
 {
     for (size_t i = 0; i < ARRAY_SIZE(algorithm_names); i++) {
         if (algorithm_names[i].id == m_id) {
-            return shortName ? algorithm_names[i].shortName : algorithm_names[i].name;
+            return (shortName && algorithm_names[i].shortName) ? algorithm_names[i].shortName : algorithm_names[i].name;
         }
     }
 

src/crypto/common/Algorithm.h

@@ -73,6 +73,10 @@ public:
         RX_WOW,        // "rx/wow"           RandomWOW (Wownero).
         RX_LOKI,       // "rx/loki"          RandomXL (Loki).
         DEFYX,         // "defyx"            DefyX (Scala).
+#       endif
+#       ifdef XMRIG_ALGO_ARGON2
+        AR2_CHUKWA,    // "argon2/chukwa"
+        AR2_WRKZ,      // "argon2/wrkz"
 #       endif
         MAX
     };
@@ -83,7 +87,8 @@ public:
         CN_LITE,
         CN_HEAVY,
         CN_PICO,
-        RANDOM_X
+        RANDOM_X,
+        ARGON2
     };
 
     inline Algorithm()                                     {}
@@ -103,10 +108,10 @@ public:
     inline bool operator==(const Algorithm &other) const  { return isEqual(other); }
     inline operator Algorithm::Id() const                 { return m_id; }
 
-    int maxIntensity() const;
     rapidjson::Value toJSON() const;
     size_t l2() const;
     size_t l3() const;
+    uint32_t maxIntensity() const;
 
     static Family family(Id id);
     static Id parse(const char *name);