# 3.4.2 (#414)

* Added Equilibria(XEQ) RandomX varirant (rx/xeq)
Bendr0id · May 28, 2024 · 4badf2c · 4badf2c
1 parent 72ac25f
commit 4badf2c
Show file tree

Hide file tree

Showing 22 changed files with 6,153 additions and 5,944 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+# 3.4.2
+* Added Equilibria(XEQ) RandomX varirant (rx/xeq)
 # 3.4.1
 * Added Tuske RandomX variant (`rx/tuske`)
 * Rebase on latest xmrig-6.21.3

diff --git a/README.md b/README.md
@@ -29,19 +29,15 @@ Full Windows/Linux/OSx/Android compatible, and you can mix all on a single XMRig
 
 List of all supported algos can be found [here](doc/ALGORITHMS.md)
 
+* **Equilibria (XEQ)** RX variant (Algo: "rx/xeq")
+* **Tuske** RX variant (Algo: "rx/tuske")
 * **VKAX** Ghostrider variant Mike (Algo: "mike")
 * **XDagger** RX variant (Algo: "rx/xdag")
-* **Conceal (CCX), Equilibria (XEQ), ...** CN variant (Algo: "cn/gpu")
+* **Conceal (CCX), RYO, ...** CN variant (Algo: "cn/gpu")
 * **Ghostrider (Raptoreum)** (Algo: "gr")
 * **KawPow (Ravencoin)** (Algo: "kawpow")
 * **Graft** RX variant (Algo: "rx/graft")
 * **Yadacoin** RX variant (Algo: "rx/yada")
-* **Turtlecoin** argon2 chukwa variant 2 (algo: "argon2/chukwav2")
-* **ninjacoin** variant (algo: "ninja")
-* **RandomKEVA** RX variant (algo: "rx/keva")
-* **CN-Talleo** CN variant (algo: "cn-pico/tlo")
-* **UPX2** CN variant (algo: "cn-extremelite/upx2")
-* **CN-Conceal** CN variant (algo: "cn/conceal")
 
 ## XMRigCC features:
 

diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md
@@ -12,11 +12,12 @@ Option `coin` useful for pools without algorithm negotiation support or daemon t
 
 | Name                  | Memory | Version     | Notes                                                                     | Info      |
 |-----------------------|--------|-------------|---------------------------------------------------------------------------|-----------|
-| `rx/tuske`            | 2 MB   | 3.4.1       | RandomxTuske (vkax).                                                      | CPU only
+| `rx/xeq`              | 2 MB   | 3.4.2       | RandomxEquilibria (XEQ).                                                  |
+| `rx/tuske`            | 2 MB   | 3.4.1       | RandomxTuske (TSK).                                                       | CPU only
 | `ghostrider/mike`     | 2 MB   | 3.3.1       | Ghostrider variant Mike (vkax).                                           | CPU only
 | `rx/xdag`             | 2 MB   | 3.2.1       | RandomXDAG (xdagger).                                                     | CPU only
 | `astroBWT/v2`         | -      | 3.2.0       | AstroBWT v2 (Dero HE).                                                    | removed
-| `rx/lozz`             | 2 MB   | 3.1.0       | RandomL (Lozzax).                                                         | removed
+| `rx/lozz`             | 2 MB   | 3.1.0-3.4.1 | RandomL (Lozzax).                                                         | removed
 | `cn/gpu`              | -      | 3.1.0       | Equilibria (XEQ) & Conceal (CCX).                                         |
 | `ghostrider`          | 2 MB   | 3.0.0       | GhostRider (Raptoreum).                                                   | CPU only
 | `kawpow`              | -      | 3.0.0       | KawPow (Ravencoin).                                                       | GPU only
@@ -67,7 +68,7 @@ Since version 3 mining [algorithm](#algorithm-names) should specified for each p
     {
       "url": "...",
       "algo": "cn/r",
-      "coin": null
+      "coin": null,
       ...
     }
  ],

diff --git a/scripts/generate_cl.js b/scripts/generate_cl.js
@@ -52,6 +52,7 @@ function rx()
         'randomx_constants_arqma.h',
         'randomx_constants_keva.h',
         'randomx_constants_graft.h',
+        'randomx_constants_equilibria.h',
         'aes.cl',
         'blake2b.cl',
         'randomx_vm.cl',

diff --git a/src/backend/cpu/CpuConfig_gen.h b/src/backend/cpu/CpuConfig_gen.h
@@ -136,6 +136,17 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
         }
     }
 
+    if (!threads.isExist(Algorithm::RX_XEQ)) {
+        auto xeq = cpuInfo->threads(Algorithm::RX_XEQ, limit);
+        if (xeq == wow) {
+            threads.setAlias(Algorithm::RX_XEQ, Algorithm::kRX_WOW);
+            ++count;
+        }
+        else {
+            count += threads.move(Algorithm::kRX_XEQ, std::move(xeq));
+        }
+    }
+
     if (!threads.isExist(Algorithm::RX_WOW)) {
         count += threads.move(Algorithm::kRX_WOW, std::move(wow));
     }

diff --git a/src/backend/cuda/CudaConfig_gen.h b/src/backend/cuda/CudaConfig_gen.h
@@ -118,6 +118,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
     auto wow = CudaThreads(devices, Algorithm::RX_WOW);
     auto arq = CudaThreads(devices, Algorithm::RX_ARQ);
     auto kva = CudaThreads(devices, Algorithm::RX_KEVA);
+    auto xeq = CudaThreads(devices, Algorithm::RX_XEQ);
 
     if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
         count += threads.move(Algorithm::kRX_WOW, std::move(wow));
@@ -131,6 +132,10 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
         count += threads.move(Algorithm::kRX_KEVA, std::move(kva));
     }
 
+    if (!threads.isExist(Algorithm::RX_XEQ) && xeq != rx) {
+        count += threads.move(Algorithm::kRX_XEQ, std::move(xeq));
+    }
+
     count += threads.move(Algorithm::kRX, std::move(rx));
 
     if (!threads.isExist(Algorithm::RX_YADA)) {

diff --git a/src/backend/opencl/OclConfig_gen.h b/src/backend/opencl/OclConfig_gen.h
@@ -116,6 +116,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<OclThreads> &threads, const
     auto rx  = OclThreads(devices, Algorithm::RX_0);
     auto wow = OclThreads(devices, Algorithm::RX_WOW);
     auto arq = OclThreads(devices, Algorithm::RX_ARQ);
+    auto xeq = OclThreads(devices, Algorithm::RX_XEQ);
 
     if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
         count += threads.move(Algorithm::kRX_WOW, std::move(wow));
@@ -125,6 +126,10 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<OclThreads> &threads, const
         count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
     }
 
+    if (!threads.isExist(Algorithm::RX_XEQ) && xeq != rx) {
+        count += threads.move(Algorithm::kRX_XEQ, std::move(xeq));
+    }
+
     count += threads.move(Algorithm::kRX, std::move(rx));
 
     if (!threads.isExist(Algorithm::RX_YADA)) {

diff --git a/src/backend/opencl/cl/cn/algorithm.cl b/src/backend/opencl/cl/cn/algorithm.cl
@@ -25,6 +25,7 @@
 #define ALGO_RX_SFX         0x72151273
 #define ALGO_RX_KEVA        0x7214116b
 #define ALGO_RX_GRAFT       0x72151267
+#define ALGO_RX_XEQ         0x72121078
 #define ALGO_AR2_CHUKWA     0x61130000
 #define ALGO_AR2_CHUKWA_V2  0x61140000
 #define ALGO_AR2_WRKZ       0x61120000