Merge pull request scala-network#16 from scala-network/xlarig-502

Xlarig update to version 5.0.2
SolFly · Feb 3, 2020 · c32d94a · c32d94a
2 parents 911fcfb + 7fd7300
commit c32d94a
Show file tree

Hide file tree

Showing 108 changed files with 7,589 additions and 6,012 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
+# v5.0.2
+
+- Rebase from XMRig v5.5.1 [(changelog)](doc/CHANGELOG.md)
+
+
 # v5.0.1
 
-- Rebase from XMRig v5.4.0 [(changelog)](doc/CHANGELOG.md)
+- Rebase from XMRig v5.4.0
 
 
 # v5.0.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,18 +2,19 @@ cmake_minimum_required(VERSION 2.8)
 project(xlarig)
 
 option(WITH_LIBCPUID        "Enable libcpuid support" ON)
-option(WITH_HWLOC           "Enable hwloc support" ON)
-option(WITH_CN_LITE         "Enable CryptoNight-Lite algorithms family" ON)
-option(WITH_CN_HEAVY        "Enable CryptoNight-Heavy algorithms family" ON)
-option(WITH_CN_PICO         "Enable CryptoNight-Pico algorithm" ON)
-option(WITH_CN_GPU          "Enable CryptoNight-GPU algorithm" ON)
+option(WITH_HWLOC           "Enable hwloc support" OFF)
+option(WITH_CN_LITE         "Enable CryptoNight-Lite algorithms family" OFF)
+option(WITH_CN_HEAVY        "Enable CryptoNight-Heavy algorithms family" OFF)
+option(WITH_CN_PICO         "Enable CryptoNight-Pico algorithm" OFF)
+option(WITH_CN_GPU          "Enable CryptoNight-GPU algorithm" OFF)
 option(WITH_RANDOMX         "Enable RandomX algorithms family" ON)
 option(WITH_ARGON2          "Enable Argon2 algorithms family" ON)
 option(WITH_HTTP            "Enable HTTP protocol support (client/server)" ON)
 option(WITH_DEBUG_LOG       "Enable debug log output" OFF)
 option(WITH_TLS             "Enable OpenSSL support" ON)
 option(WITH_ASM             "Enable ASM PoW implementations" ON)
-option(WITH_MSR             "Enable MSR support" ON)
+option(WITH_MSR             "Enable MSR mod & 1st-gen Ryzen fix" ON)
+option(WITH_ENV_VARS        "Enable environment variables support in config file" ON)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" OFF)
 option(WITH_CUDA            "Enable CUDA backend" OFF)

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Network:
   -u, --user=USERNAME           username for mining server
   -p, --pass=PASSWORD           password for mining server
   -O, --userpass=U:P            username:password pair for mining server
-  -k, --keepalive               send keepalived packet for prevent timeout (needs pool support)
+  -k, --keepalive               send keepalive packet for prevent timeout (needs pool support)
       --nicehash                enable nicehash.com support
       --rig-id=ID               rig identifier for pool-side statistics (needs pool support)
       --tls                     enable SSL/TLS support (needs pool support)
@@ -47,11 +47,12 @@ CPU backend:
       --cpu-no-yield            prefer maximum hashrate rather than system response/stability
       --no-huge-pages           disable huge pages support
       --asm=ASM                 ASM optimizations, possible values: auto, none, intel, ryzen, bulldozer
-      --randomx-init=N          threads count to initialize RandomX dataset
+      --randomx-init=N          thread count to initialize RandomX dataset
       --randomx-no-numa         disable NUMA support for RandomX
       --randomx-mode=MODE       RandomX mode: auto, fast, light
       --randomx-1gb-pages       use 1GB hugepages for dataset (Linux only)
-      --randomx-wrmsr=N         write value (0-15) to Intel MSR register 0x1a4 or do nothing (-1) (Linux only)
+      --randomx-wrmsr=N         write custom value (0-15) to Intel MSR register 0x1a4 or disable MSR mod (-1)
+      --randomx-no-rdmsr        disable reverting initial MSR values on exit
 
 API:
       --api-worker-id=ID        custom worker-id for API
@@ -84,9 +85,13 @@ The building instructions has been moved [here](doc/building.md)
 ## Donations
 The donation mining in XLArig has been turned off, if you wish to help the original creators or the Scala Project team donate to the addresses below.
 
-* XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD`
-* BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT`
-* XLA: `SEiTBcLGpfm3uj5b5RaZDGSUoAGnLCyG5aJjAwko67jqRwWEH26NFPd26EUpdL1zh4RTmTdRWLz8WCmk5F4umYaFByMtJT6RLjD6vzApQJWfi`
+* Original Creators addresses: 
+  *	XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD`
+  *	BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT`
+
+* The Scala Project Team addresses:
+  *	BTC: `1XTLY5LqdBXRW6hcHtnuMU7c68mAyW6qm`
+  *	XLA: `SEiTBcLGpfm3uj5b5RaZDGSUoAGnLCyG5aJjAwko67jqRwWEH26NFPd26EUpdL1zh4RTmTdRWLz8WCmk5F4umYaFByMtJT6RLjD6vzApQJWfi`
 
 
 ## Contacts

diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
@@ -8,7 +8,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
 endif()
 
 if (NOT ARM_TARGET)
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a|armv8l)$")
         set(ARM_TARGET 8)
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
         set(ARM_TARGET 7)

diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake
@@ -100,6 +100,7 @@ if (WITH_RANDOMX)
 
     if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX))
         add_definitions(/DXMRIG_FEATURE_MSR)
+        add_definitions(/DXMRIG_FIX_RYZEN)
         message("-- WITH_MSR=ON")
 
         if (XMRIG_OS_WIN)
@@ -112,6 +113,7 @@ if (WITH_RANDOMX)
         list(APPEND SOURCES_CRYPTO src/crypto/rx/msr/MsrItem.cpp)
     else()
         remove_definitions(/DXMRIG_FEATURE_MSR)
+        remove_definitions(/DXMRIG_FIX_RYZEN)
         message("-- WITH_MSR=OFF")
     endif()
 else()

diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md
@@ -25,7 +25,6 @@ Option `coin` useful for pools without algorithm negotiation support or daemon t
 | `cn/zls` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations. |
 | `cn/double` | 2 MB | 2.14.0+ | CryptoNight variant 2 with double iterations. |
 | `cn/r` | 2 MB | 2.13.0+ | CryptoNightR (Monero's variant 4). |
-| `cn/wow` | 2 MB | 2.12.0+ | CryptoNightR (Wownero). |
 | `cn/gpu` | 2 MB | 2.11.0+ | CryptoNight-GPU. |
 | `cn-pico` | 256 KB | 2.10.0+ | CryptoNight-Pico. |
 | `cn/half` | 2 MB | 2.9.0+ | CryptoNight variant 2 with half iterations. |

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,22 @@
+# v5.5.1
+- [#1469](https://github.com/xmrig/xmrig/issues/1469) Fixed build with gcc 4.8.
+- [#1473](https://github.com/xmrig/xmrig/pull/1473) Added RandomX auto-config for mobile Ryzen APUs.
+- [#1477](https://github.com/xmrig/xmrig/pull/1477) Fixed build with Clang.
+- [#1489](https://github.com/xmrig/xmrig/pull/1489) RandomX JIT compiler tweaks.
+- [#1493](https://github.com/xmrig/xmrig/pull/1493) Default value for Intel MSR preset changed to `15`.
+- Fixed unwanted resume after RandomX dataset change.
+
+# v5.5.0
+- [#179](https://github.com/xmrig/xmrig/issues/179) Added support for [environment variables](https://xmrig.com/docs/miner/environment-variables) in config file.
+- [#1445](https://github.com/xmrig/xmrig/pull/1445) Removed `rx/v` algorithm.
+- [#1453](https://github.com/xmrig/xmrig/issues/1453) Fixed crash on 32bit systems.
+- [#1459](https://github.com/xmrig/xmrig/issues/1459) Fixed crash on very low memory systems.
+- [#1465](https://github.com/xmrig/xmrig/pull/1465) Added fix for 1st-gen Ryzen crashes.
+- [#1466](https://github.com/xmrig/xmrig/pull/1466) Added `cn-pico/tlo` algorithm.
+- Added `--randomx-no-rdmsr` command line option.
+- Added console title for Windows with miner name and version.
+- On Windows `priority` option now also change base priority.
+
 # v5.4.0
 - [#1434](https://github.com/xmrig/xmrig/pull/1434) Added RandomSFX (`rx/sfx`) algorithm for Safex Cash.
 - [#1445](https://github.com/xmrig/xmrig/pull/1445) Added RandomV (`rx/v`) algorithm for *new* MoneroV.

diff --git a/doc/screenshot.png b/doc/screenshot.png
diff --git a/scripts/build_static/build_static_linux_aarch64.sh b/scripts/build_static/build_static_linux_aarch64.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+## Script made for Debian 10 (AARCH64 VPS).  You'll need to adapt the packages to your OS.
+
+apt -y install build-essential cmake clang git openssl curl wget libuv1-dev libssl-dev libhwloc-dev automake libtool autoconf zip
+
+git clone https://github.com/scala-network/XLArig xlarig --depth 1
+
+rm -rf xlarig/build
+mkdir xlarig/build
+cd xlarig/scripts
+chmod u+x build_deps.sh
+./build_deps.sh
+
+cd ../build
+
+cmake .. -DWITH_HWLOC=OFF -DBUILD_STATIC=ON -DXMRIG_DEPS=scripts/deps -DARM_TARGET=8
+make -j$(nproc)
+strip xlarig
+mv xlarig ~
diff --git a/scripts/build_static/build_static_linux_armeabi-v7a.sh b/scripts/build_static/build_static_linux_armeabi-v7a.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+## Script made for Debian 10 (AARCH64 VPS).  You'll need to adapt the packages to your OS.
+
+apt -y install build-essential cmake clang git openssl curl wget libuv1-dev libssl-dev libhwloc-dev automake libtool autoconf zip
+
+git clone https://github.com/scala-network/XLArig xlarig --depth 1
+
+rm -rf xlarig/build
+mkdir xlarig/build
+cd xlarig/scripts
+chmod u+x build_deps.sh
+./build_deps.sh
+
+cd ../build
+
+cmake .. -DWITH_HWLOC=OFF -DBUILD_STATIC=ON -DXMRIG_DEPS=scripts/deps -DARM_TARGET=7
+make -j$(nproc)
+strip xlarig
+mv xlarig ~
diff --git a/scripts/build_static/build_static_linux_x86-64.sh b/scripts/build_static/build_static_linux_x86-64.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+## Script made for Debian 10.  You'll need to adapt the packages to your OS.
+
+apt -y install build-essential cmake clang git openssl curl wget libuv1-dev libssl-dev libhwloc-dev automake libtool autoconf zip
+
+git clone https://github.com/scala-network/XLArig xlarig --depth 1
+
+rm -rf xlarig/build
+mkdir xlarig/build
+cd xlarig/scripts
+chmod u+x build_deps.sh
+./build_deps.sh
+
+cd ../build
+
+cmake .. -DWITH_HWLOC=OFF -DBUILD_STATIC=ON -DXMRIG_DEPS=scripts/deps
+make -j$(nproc)
+strip xlarig
+mv xlarig ~
diff --git a/scripts/randomx_boost.sh b/scripts/randomx_boost.sh
@@ -13,7 +13,7 @@ if cat /proc/cpuinfo | grep "AMD Ryzen" > /dev/null;
 elif cat /proc/cpuinfo | grep "Intel" > /dev/null;
 	then
 		echo "Detected Intel"
-		wrmsr -a 0x1a4 6
+		wrmsr -a 0x1a4 0xf
 		echo "MSR register values for Intel applied"
 else
 	echo "No supported CPU detected"

diff --git a/src/backend/common/interfaces/IRxStorage.h b/src/backend/common/interfaces/IRxStorage.h
@@ -45,6 +45,7 @@ class IRxStorage
 public:
     virtual ~IRxStorage() = default;
 
+    virtual bool isAllocated() const                                                                                            = 0;
     virtual HugePagesInfo hugePages() const                                                                                     = 0;
     virtual RxDataset *dataset(const Job &job, uint32_t nodeId) const                                                           = 0;
     virtual void init(const RxSeed &seed, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode mode, int priority) = 0;

diff --git a/src/backend/cpu/CpuWorker.cpp b/src/backend/cpu/CpuWorker.cpp
@@ -155,7 +155,8 @@ bool xmrig::CpuWorker<N>::selfTest()
 
 #   ifdef XMRIG_ALGO_CN_PICO
     if (m_algorithm.family() == Algorithm::CN_PICO) {
-        return verify(Algorithm::CN_PICO_0, test_output_pico_trtl);
+        return verify(Algorithm::CN_PICO_0, test_output_pico_trtl) &&
+               verify(Algorithm::CN_PICO_TLO, test_output_pico_tlo);
     }
 #   endif
 

diff --git a/src/backend/cuda/CudaWorker.cpp b/src/backend/cuda/CudaWorker.cpp
@@ -78,9 +78,15 @@ xmrig::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) :
         break;
     }
 
-    if (!m_runner || !m_runner->init()) {
+    if (!m_runner) {
         return;
     }
+
+    if (!m_runner->init()) {
+        delete m_runner;
+
+        m_runner = nullptr;
+    }
 }
 
 

diff --git a/src/backend/cuda/runners/CudaBaseRunner.cpp b/src/backend/cuda/runners/CudaBaseRunner.cpp
@@ -47,7 +47,7 @@ xmrig::CudaBaseRunner::~CudaBaseRunner()
 bool xmrig::CudaBaseRunner::init()
 {
     m_ctx = CudaLib::alloc(m_data.thread.index(), m_data.thread.bfactor(), m_data.thread.bsleep());
-    if (CudaLib::deviceInfo(m_ctx, m_data.thread.blocks(), m_data.thread.threads(), m_data.algorithm, m_data.thread.datasetHost()) != 0) {
+    if (!callWrapper(CudaLib::deviceInfo(m_ctx, m_data.thread.blocks(), m_data.thread.threads(), m_data.algorithm, m_data.thread.datasetHost()))) {
         return false;
     }
 

diff --git a/src/backend/cuda/runners/CudaRxRunner.cpp b/src/backend/cuda/runners/CudaRxRunner.cpp
@@ -31,8 +31,9 @@
 #include "crypto/rx/RxDataset.h"
 
 
-xmrig::CudaRxRunner::CudaRxRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data),
-  m_datasetHost(data.thread.datasetHost() > 0)
+xmrig::CudaRxRunner::CudaRxRunner(size_t index, const CudaLaunchData &data) :
+    CudaBaseRunner(index, data),
+    m_datasetHost(data.thread.datasetHost() > 0)
 {
     m_intensity                   = m_data.thread.threads() * m_data.thread.blocks();
     const size_t scratchpads_size = m_intensity * m_data.algorithm.l3();

diff --git a/src/backend/cuda/wrappers/CudaDevice.cpp b/src/backend/cuda/wrappers/CudaDevice.cpp
@@ -41,7 +41,7 @@ xmrig::CudaDevice::CudaDevice(uint32_t index, int32_t bfactor, int32_t bsleep) :
     m_index(index)
 {
     auto ctx = CudaLib::alloc(index, bfactor, bsleep);
-    if (CudaLib::deviceInfo(ctx, 0, 0, Algorithm::INVALID) != 0) {
+    if (!CudaLib::deviceInfo(ctx, 0, 0, Algorithm::INVALID)) {
         CudaLib::release(ctx);
 
         return;
@@ -107,7 +107,7 @@ uint32_t xmrig::CudaDevice::smx() const
 
 void xmrig::CudaDevice::generate(const Algorithm &algorithm, CudaThreads &threads) const
 {
-    if (CudaLib::deviceInfo(m_ctx, -1, -1, algorithm) != 0) {
+    if (!CudaLib::deviceInfo(m_ctx, -1, -1, algorithm)) {
         return;
     }