Merge 14128cbdb4 into dd7e0e520d

src/backend/cpu/CpuConfig_gen.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2024 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2024 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -126,6 +126,11 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
         count += threads.move(Algorithm::kRX_WOW, std::move(wow));
     }
 
+    if (!threads.isExist(Algorithm::RX_YADA)) {
+        auto yada = cpuInfo->threads(Algorithm::RX_YADA, limit);
+        count += threads.move(Algorithm::kRX_YADA, std::move(yada));
+    }
+
     count += generate(Algorithm::kRX, threads, Algorithm::RX_0, limit);
 
     return count;

src/backend/cpu/interfaces/ICpuInfo.h

@@ -56,8 +56,7 @@ public:
         ARCH_ZEN_PLUS,
         ARCH_ZEN2,
         ARCH_ZEN3,
-        ARCH_ZEN4,
-        ARCH_ZEN5
+        ARCH_ZEN4
     };
 
     enum MsrMod : uint32_t {
@@ -65,13 +64,12 @@ public:
         MSR_MOD_RYZEN_17H,
         MSR_MOD_RYZEN_19H,
         MSR_MOD_RYZEN_19H_ZEN4,
-        MSR_MOD_RYZEN_1AH_ZEN5,
         MSR_MOD_INTEL,
         MSR_MOD_CUSTOM,
         MSR_MOD_MAX
     };
 
-#   define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "ryzen_19h_zen4", "ryzen_1Ah_zen5", "intel", "custom"
+#   define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "ryzen_19h_zen4", "intel", "custom"
 
     enum Flag : uint32_t {
         FLAG_AES,

src/backend/cpu/platform/BasicCpuInfo.cpp

@@ -64,7 +64,7 @@ static_assert(kCpuFlagsSize == ICpuInfo::FLAG_MAX, "kCpuFlagsSize and FLAG_MAX m
 
 
 #ifdef XMRIG_FEATURE_MSR
-constexpr size_t kMsrArraySize                                  = 7;
+constexpr size_t kMsrArraySize                                  = 6;
 static const std::array<const char *, kMsrArraySize> msrNames   = { MSR_NAMES_LIST };
 static_assert(kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
 #endif
@@ -260,11 +260,6 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
                     }
                     break;
 
-                case 0x1a:
-                    m_arch = ARCH_ZEN5;
-                    m_msrMod = MSR_MOD_RYZEN_1AH_ZEN5;
-                    break;
-
                 default:
                     m_msrMod = MSR_MOD_NONE;
                     break;

src/base/net/stratum/Job.cpp

@@ -7,8 +7,8 @@
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
  * Copyright 2019      Howard Chu  <https://github.com/hyc>
- * Copyright 2018-2024 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2024 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,9 +24,11 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include <cassert>
 #include <cstring>
 
+
 #include "base/net/stratum/Job.h"
 #include "base/tools/Alignment.h"
 #include "base/tools/Buffer.h"
@@ -110,36 +112,26 @@ bool xmrig::Job::setSeedHash(const char *hash)
 
 bool xmrig::Job::setTarget(const char *target)
 {
-    static auto parse = [](const char *target, const Algorithm &algorithm) -> uint64_t {
-        if (!target) {
-            return 0;
-        }
-
-        if (algorithm == Algorithm::RX_YADA) {
-            return strtoull(target, nullptr, 16);
-        }
-
-        const auto raw = Cvt::fromHex(target, strlen(target));
-
-        switch (raw.size()) {
-        case 4:
-            return 0xFFFFFFFFFFFFFFFFULL / (0xFFFFFFFFULL / uint64_t(*reinterpret_cast<const uint32_t *>(raw.data())));
-
-        case 8:
-            return *reinterpret_cast<const uint64_t *>(raw.data());
-
-        default:
-            break;
-        }
-
-        return 0;
-    };
-
-    if ((m_target = parse(target, algorithm())) == 0) {
+    if (!target) {
         return false;
     }
 
-    m_diff = toDiff(m_target);
+    const auto raw    = Cvt::fromHex(target, strlen(target));
+    const size_t size = raw.size();
+    if (algorithm() == Algorithm::RX_YADA) {
+        m_target = strtoull(target, nullptr, 16);
+    }
+    else {
+        if (size == 4) {
+            m_target = 0xFFFFFFFFFFFFFFFFULL / (0xFFFFFFFFULL / uint64_t(*reinterpret_cast<const uint32_t *>(raw.data())));
+        }
+        else if (size == 8) {
+            m_target = *reinterpret_cast<const uint64_t *>(raw.data());
+        }
+        else {
+            return false;
+        }
+    }
 
 #   ifdef XMRIG_PROXY_PROJECT
     assert(sizeof(m_rawTarget) > (size * 2));
@@ -148,6 +140,7 @@ bool xmrig::Job::setTarget(const char *target)
     memcpy(m_rawTarget, target, std::min(size * 2, sizeof(m_rawTarget)));
 #   endif
 
+    m_diff = toDiff(m_target);
     return true;
 }
 
@@ -184,22 +177,14 @@ void xmrig::Job::setSigKey(const char *sig_key)
 
 int32_t xmrig::Job::nonceOffset() const
 {
-    switch (algorithm().family()) {
-    case Algorithm::KAWPOW:
-        return 32;
+   auto f = algorithm().family();
+   if (f == Algorithm::KAWPOW)     return 32;
+   if (f == Algorithm::GHOSTRIDER) return 76;
 
-    case Algorithm::GHOSTRIDER:
-        return 76;
+   auto id = algorithm().id();
+   if (id == Algorithm::RX_YADA)   return 147;
 
-    default:
-        break;
-    }
-
-    if (algorithm() == Algorithm::RX_YADA) {
-        return 147;
-    }
-
-    return 39;
+   return 39;
 }
 
 uint32_t xmrig::Job::getNumTransactions() const

src/base/net/stratum/Job.h

@@ -7,8 +7,8 @@
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
  * Copyright 2019      Howard Chu  <https://github.com/hyc>
- * Copyright 2018-2024 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2024 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -27,9 +27,11 @@
 #ifndef XMRIG_JOB_H
 #define XMRIG_JOB_H
 
+
 #include <cstddef>
 #include <cstdint>
 
+
 #include "base/crypto/Algorithm.h"
 #include "base/tools/Buffer.h"
 #include "base/tools/String.h"
@@ -109,7 +111,7 @@ public:
 
     inline bool operator!=(const Job &other) const      { return !isEqual(other); }
     inline bool operator==(const Job &other) const      { return isEqual(other); }
-    inline Job &operator=(const Job &other)             { if (this != &other) { copy(other); } return *this; }
+    inline Job &operator=(const Job &other)             { copy(other); return *this; }
     inline Job &operator=(Job &&other) noexcept         { move(std::move(other)); return *this; }
 
 #   ifdef XMRIG_FEATURE_BENCHMARK

src/crypto/randomx/jit_compiler_x86.cpp

@@ -266,10 +266,6 @@ namespace randomx {
 						// AVX2 init is slower on Zen4
 						initDatasetAVX2 = false;
 						break;
-					case xmrig::ICpuInfo::ARCH_ZEN5:
-						// TODO: test it
-						initDatasetAVX2 = false;
-						break;
 					}
 				}
 			}

src/crypto/rx/RxConfig.cpp

@@ -53,17 +53,13 @@ static const std::array<const char *, RxConfig::ModeMax> modeNames = { "auto", "
 
 
 #ifdef XMRIG_FEATURE_MSR
-constexpr size_t kMsrArraySize = 7;
+constexpr size_t kMsrArraySize = 6;
 
 static const std::array<MsrItems, kMsrArraySize> msrPresets = {
     MsrItems(),
     MsrItems{{ 0xC0011020, 0ULL }, { 0xC0011021, 0x40ULL, ~0x20ULL }, { 0xC0011022, 0x1510000ULL }, { 0xC001102b, 0x2000cc16ULL }},
     MsrItems{{ 0xC0011020, 0x0004480000000000ULL }, { 0xC0011021, 0x001c000200000040ULL, ~0x20ULL }, { 0xC0011022, 0xc000000401570000ULL }, { 0xC001102b, 0x2000cc10ULL }},
     MsrItems{{ 0xC0011020, 0x0004400000000000ULL }, { 0xC0011021, 0x0004000000000040ULL, ~0x20ULL }, { 0xC0011022, 0x8680000401570000ULL }, { 0xC001102b, 0x2040cc10ULL }},
-
-    // TODO: Tune it for Zen5 when it's available
-    MsrItems{{ 0xC0011020, 0x0004400000000000ULL }, { 0xC0011021, 0x0004000000000040ULL, ~0x20ULL }, { 0xC0011022, 0x8680000401570000ULL }, { 0xC001102b, 0x2040cc10ULL }},
-
     MsrItems{{ 0x1a4, 0xf }},
     MsrItems()
 };