Merge pull request #22 from scala-network/xlarig520

Xlarig update to v5.2.0
scala-network · Oct 17, 2020 · ae9f673 · ae9f673
2 parents 3d9d4f7 + 49f87fb
commit ae9f673
Show file tree

Hide file tree

Showing 409 changed files with 20,221 additions and 23,465 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
+# v5.2.0
+- Updated Panthera algo
+- Removed DefyX algo
+- Rebased from XMRig v6.3.4 [(changelog)](doc/CHANGELOG.md)
+
+
 # v5.1.0
-- Added Panthera Algo
+- Added Panthera algo
 - Moved DefyX config data into RandomX.
-- Rebased from XMRig v5.11.1 [(changelog)](doc/CHANGELOG.md)
+- Rebased from XMRig v5.11.1
 
 # v5.0.2
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,10 +6,10 @@ 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_ASTROBWT        "Enable AstroBWT algorithms family" ON)
+option(WITH_ASTROBWT        "Enable AstroBWT algorithms family" OFF)
+option(WITH_KAWPOW          "Enable KawPow algorithms family" OFF)
 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)
@@ -20,9 +20,10 @@ option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" OFF)
 option(WITH_CUDA            "Enable CUDA backend" OFF)
 option(WITH_NVML            "Enable NVML (NVIDIA Management Library) support (only if CUDA backend enabled)" OFF)
-option(WITH_ADL             "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON)
+option(WITH_ADL             "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" OFF)
 option(WITH_STRICT_CACHE    "Enable strict checks for OpenCL cache" ON)
 option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF)
+option(WITH_PROFILING       "Enable profiling for developers" OFF)
 
 option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
@@ -143,6 +144,8 @@ elseif (XMRIG_OS_APPLE)
         src/App_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
+    find_library(IOKIT_LIBRARY IOKit)
+    set(EXTRA_LIBS ${IOKIT_LIBRARY})
 else()
     list(APPEND SOURCES_OS
         src/App_unix.cpp
@@ -163,18 +166,18 @@ else()
     endif()
 endif()
 
-add_definitions(/D__STDC_FORMAT_MACROS)
-add_definitions(/DUNICODE)
+add_definitions(-DXMRIG_MINER_PROJECT)
+add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE)
 
 find_package(UV REQUIRED)
 
 include(cmake/flags.cmake)
 include(cmake/randomx.cmake)
 include(cmake/argon2.cmake)
 include(cmake/astrobwt.cmake)
+include(cmake/kawpow.cmake)
 include(cmake/OpenSSL.cmake)
 include(cmake/asm.cmake)
-include(cmake/cn-gpu.cmake)
 
 if (WITH_CN_LITE)
     add_definitions(/DXMRIG_ALGO_CN_LITE)
@@ -196,18 +199,18 @@ include_directories(src)
 include_directories(src/3rdparty)
 include_directories(${UV_INCLUDE_DIR})
 
-if (BUILD_STATIC)
-    set(CMAKE_EXE_LINKER_FLAGS " -static")
-endif()
-
 if (WITH_DEBUG_LOG)
     add_definitions(/DAPP_DEBUG)
 endif()
 
-add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY})
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
 endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_BUILD_TYPE STREQUAL Release)
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} ${CMAKE_PROJECT_NAME})
+endif()
diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake
@@ -5,11 +5,16 @@ if (WITH_TLS)
         set(OPENSSL_USE_STATIC_LIBS TRUE)
         set(OPENSSL_MSVC_STATIC_RT TRUE)
 
-        set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32)
+        set(EXTRA_LIBS ${EXTRA_LIBS} crypt32)
     elseif (APPLE)
         set(OPENSSL_USE_STATIC_LIBS TRUE)
     endif()
 
+    if (BUILD_STATIC)
+        set(OPENSSL_USE_STATIC_LIBS TRUE)
+    endif()
+
+
     find_package(OpenSSL)
 
     if (OPENSSL_FOUND)

diff --git a/cmake/astrobwt.cmake b/cmake/astrobwt.cmake
@@ -3,12 +3,10 @@ if (WITH_ASTROBWT)
 
     list(APPEND HEADERS_CRYPTO
         src/crypto/astrobwt/AstroBWT.h
-        src/crypto/astrobwt/sha3.h
     )
 
     list(APPEND SOURCES_CRYPTO
         src/crypto/astrobwt/AstroBWT.cpp
-        src/crypto/astrobwt/sha3.cpp
     )
 
     if (XMRIG_ARM)

diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
@@ -29,8 +29,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions")
     else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -msse4.1")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -msse4.1")
 
         add_definitions(/DHAVE_ROTR)
     endif()
@@ -45,6 +45,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
     endif()
 
+    if (BUILD_STATIC)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+    endif()
+
     add_definitions(/D_GNU_SOURCE)
 
     if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
@@ -60,6 +64,9 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
     set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
     set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
 
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Ob1 /GL")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ob1 /GL")
+
     add_definitions(/D_CRT_SECURE_NO_WARNINGS)
     add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
     add_definitions(/DNOMINMAX)
@@ -80,15 +87,19 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
     else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -msse4.1")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -msse4.1")
 
         check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
         if (HAVE_ROTR)
             add_definitions(/DHAVE_ROTR)
         endif()
     endif()
 
+    if (BUILD_STATIC)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+    endif()
+
 endif()
 
 if (NOT WIN32)

diff --git a/cmake/kawpow.cmake b/cmake/kawpow.cmake
@@ -0,0 +1,19 @@
+if (WITH_KAWPOW)
+    add_definitions(/DXMRIG_ALGO_KAWPOW)
+
+    list(APPEND HEADERS_CRYPTO
+        src/crypto/kawpow/KPCache.h
+        src/crypto/kawpow/KPHash.h
+    )
+
+    list(APPEND SOURCES_CRYPTO
+        src/crypto/kawpow/KPCache.cpp
+        src/crypto/kawpow/KPHash.cpp
+    )
+
+    add_subdirectory(src/3rdparty/libethash)
+    set(ETHASH_LIBRARY ethash)
+else()
+    remove_definitions(/DXMRIG_ALGO_KAWPOW)
+    set(ETHASH_LIBRARY "")
+endif()
diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake
@@ -1,5 +1,6 @@
 if (WITH_RANDOMX)
     add_definitions(/DXMRIG_ALGO_RANDOMX)
+    set(WITH_ARGON2 ON)
 
     list(APPEND HEADERS_CRYPTO
         src/crypto/rx/Rx.h
@@ -16,8 +17,6 @@ if (WITH_RANDOMX)
     list(APPEND SOURCES_CRYPTO
         src/crypto/randomx/aes_hash.cpp
         src/crypto/randomx/allocator.cpp
-        src/crypto/randomx/argon2_core.c
-        src/crypto/randomx/argon2_ref.c
         src/crypto/randomx/blake2_generator.cpp
         src/crypto/randomx/blake2/blake2b.c
         src/crypto/randomx/bytecode_machine.cpp
@@ -47,7 +46,6 @@ if (WITH_RANDOMX)
 		src/crypto/randomx/panthera/KangarooTwelve.c
 		src/crypto/randomx/panthera/KeccakP-1600-reference.c
 		src/crypto/randomx/panthera/KeccakSpongeWidth1600.c
-		src/crypto/randomx/defyx/yescrypt-best.c
 		src/crypto/randomx/panthera/yespower-opt.c
     )
 

diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md
@@ -6,38 +6,40 @@ Algorithm can be defined in 3 ways:
 2. Per pool `coin` option, currently only usable values for this option is `monero` and `arqma`.
 3. Per pool `algo` option.
 
-Option `coin` useful for pools without algorithm negotiation support or daemon to allow automatically switch algorithm in next hard fork.
+Option `coin` useful for pools without algorithm negotiation support or daemon to allow automatically switch algorithm in next hard fork. If you use xmrig-proxy don't need specify algorithm on miner side.
 
 ## Algorithm names
 
-| Name | Memory | Version | Notes |
-|------|--------|---------|-------|
-| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). |
-| `rx/v` | 2 MB | 5.4.0+ | RandomV (RandomX variant for new MoneroV). |
-| `rx/arq` | 256 KB | 4.3.0+ | RandomARQ (RandomX variant for ArQmA). |
-| `rx/0` | 2 MB | 3.2.0+ | RandomX (Monero). |
-| `argon2/chukwa` | 512 KB | 3.1.0+ | Argon2id (Chukwa). |
-| `argon2/wrkz` | 256 KB | 3.1.0+ | Argon2id (WRKZ) |
-| `rx/wow` | 1 MB | 3.0.0+ | RandomWOW (RandomX variant for Wownero). |
-| `rx/loki` | 2 MB | 3.0.0+ | RandomXL (RandomX variant for Loki). |
-| `cn/fast` | 2 MB | 3.0.0+ | CryptoNight variant 1 with half iterations. |
-| `cn/rwz` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations and reversed shuffle operation. |
-| `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/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. |
-| `cn/2` | 2 MB | 2.8.0+ | CryptoNight variant 2. |
-| `cn/xao` | 2 MB | 2.6.4+ | CryptoNight variant 0 (modified). |
-| `cn/rto` | 2 MB | 2.6.4+ | CryptoNight variant 1 (modified). |
-| `cn-heavy/tube` | 4 MB | 2.6.4+ | CryptoNight-Heavy (modified). |
-| `cn-heavy/xhv` | 4 MB | 2.6.3+ | CryptoNight-Heavy (modified). |
-| `cn-heavy/0` | 4 MB | 2.6.0+ | CryptoNight-Heavy. |
-| `cn/1` | 2 MB | 2.5.0+ | CryptoNight variant 1. |
-| `cn-lite/1` | 1 MB | 2.5.0+ | CryptoNight-Lite variant 1. |
-| `cn-lite/0` | 1 MB | 0.8.0+ | CryptoNight-Lite variant 0. |
-| `cn/0` | 2 MB | 0.5.0+ | CryptoNight (original). |
+| Name | Memory | Version | Description | Notes |
+|------|--------|---------|-------------|-------|
+| `kawpow` | - | 6.0.0+ | KawPow (Ravencoin) | GPU only |
+| `rx/keva` | 1 MB | 5.9.0+ | RandomKEVA (RandomX variant for Keva). |  |
+| `astrobwt` | 20 MB | 5.8.0+ | AstroBWT (Dero). |  |
+| `cn-pico/tlo` | 256 KB | 5.5.0+ | CryptoNight-Pico (Talleo). |  |
+| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). |  |
+| `rx/arq` | 256 KB | 4.3.0+ | RandomARQ (RandomX variant for ArQmA). |  |
+| `rx/0` | 2 MB | 3.2.0+ | RandomX (Monero). |  |
+| `argon2/chukwa` | 512 KB | 3.1.0+ | Argon2id (Chukwa). | CPU only |
+| `argon2/wrkz` | 256 KB | 3.1.0+ | Argon2id (WRKZ) | CPU only |
+| `rx/wow` | 1 MB | 3.0.0+ | RandomWOW (RandomX variant for Wownero). |  |
+| `rx/loki` | 2 MB | 3.0.0+ | RandomXL (RandomX variant for Loki). |  |
+| `cn/fast` | 2 MB | 3.0.0+ | CryptoNight variant 1 with half iterations. |  |
+| `cn/rwz` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations and reversed shuffle operation. |  |
+| `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-pico` | 256 KB | 2.10.0+ | CryptoNight-Pico. |  |
+| `cn/half` | 2 MB | 2.9.0+ | CryptoNight variant 2 with half iterations. |  |
+| `cn/2` | 2 MB | 2.8.0+ | CryptoNight variant 2. |  |
+| `cn/xao` | 2 MB | 2.6.4+ | CryptoNight variant 0 (modified). |  |
+| `cn/rto` | 2 MB | 2.6.4+ | CryptoNight variant 1 (modified). |  |
+| `cn-heavy/tube` | 4 MB | 2.6.4+ | CryptoNight-Heavy (modified). |  |
+| `cn-heavy/xhv` | 4 MB | 2.6.3+ | CryptoNight-Heavy (modified). |  |
+| `cn-heavy/0` | 4 MB | 2.6.0+ | CryptoNight-Heavy. |  |
+| `cn/1` | 2 MB | 2.5.0+ | CryptoNight variant 1. |  |
+| `cn-lite/1` | 1 MB | 2.5.0+ | CryptoNight-Lite variant 1. |  |
+| `cn-lite/0` | 1 MB | 0.8.0+ | CryptoNight-Lite variant 0. |  |
+| `cn/0` | 2 MB | 0.5.0+ | CryptoNight (original). |  |
 
 ## Migration to v3
 Since version 3 mining [algorithm](#algorithm-names) should specified for each pool separately (`algo` option), earlier versions was use one global `algo` option and per pool `variant` option (this option was removed in v3). If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) you may not specify this option at all.