From 0cc90b152deba74f87487f5b7a1d756dde1d34eb Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 23 Apr 2020 12:34:26 +0700 Subject: [PATCH] Move CnAlgo --- CHANGELOG.md | 5 +++++ CMakeLists.txt | 1 + src/backend/common/Threads.cpp | 2 +- src/backend/opencl/generators/ocl_generic_cn_generator.cpp | 2 +- src/backend/opencl/generators/ocl_vega_cn_generator.cpp | 2 +- src/backend/opencl/runners/OclCnRunner.cpp | 2 +- src/backend/opencl/runners/OclRyoRunner.cpp | 2 +- src/base/base.cmake | 1 - src/{base/crypto => crypto/cn}/CnAlgo.h | 0 src/crypto/cn/CnHash.h | 2 +- src/crypto/cn/CryptoNight_arm.h | 2 +- src/crypto/cn/CryptoNight_x86.h | 2 +- src/crypto/cn/gpu/cn_gpu_avx.cpp | 2 +- src/crypto/cn/gpu/cn_gpu_ssse3.cpp | 2 +- 14 files changed, 16 insertions(+), 11 deletions(-) rename src/{base/crypto => crypto/cn}/CnAlgo.h (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cd2e0a1..dc4d96a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v5.11.1 +- [#1652](https://github.com/xmrig/xmrig/pull/1652) Up to 1% RandomX perfomance improvement on recent AMD CPUs. +- [#1306](https://github.com/xmrig/xmrig/issues/1306) Fixed possible double connection to a pool. +- [#1654](https://github.com/xmrig/xmrig/issues/1654) Fixed build with LibreSSL. + # v5.11.0 - **[#1632](https://github.com/xmrig/xmrig/pull/1632) Added AstroBWT CUDA support ([CUDA plugin](https://github.com/xmrig/xmrig-cuda) v3.0.0 or newer required).** - [#1605](https://github.com/xmrig/xmrig/pull/1605) Fixed AstroBWT OpenCL for NVIDIA GPUs. diff --git a/CMakeLists.txt b/CMakeLists.txt index ba98c11a..f9b7b2bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ set(HEADERS_CRYPTO src/crypto/cn/c_groestl.h src/crypto/cn/c_jh.h src/crypto/cn/c_skein.h + src/crypto/cn/CnAlgo.h src/crypto/cn/CnCtx.h src/crypto/cn/CnHash.h src/crypto/cn/CryptoNight_monero.h diff --git a/src/backend/common/Threads.cpp b/src/backend/common/Threads.cpp index a72f8026..4b23e85d 100644 --- a/src/backend/common/Threads.cpp +++ b/src/backend/common/Threads.cpp @@ -25,7 +25,7 @@ #include "backend/common/Threads.h" #include "backend/cpu/CpuThreads.h" -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #include "rapidjson/document.h" diff --git a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp b/src/backend/opencl/generators/ocl_generic_cn_generator.cpp index 90e80e6f..c2d8ea7e 100644 --- a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_cn_generator.cpp @@ -27,7 +27,7 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" #include "base/crypto/Algorithm.h" -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #include diff --git a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp index 0e14dad9..5293fb22 100644 --- a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp @@ -27,7 +27,7 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" #include "base/crypto/Algorithm.h" -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #include diff --git a/src/backend/opencl/runners/OclCnRunner.cpp b/src/backend/opencl/runners/OclCnRunner.cpp index 67cc4027..c940b5fb 100644 --- a/src/backend/opencl/runners/OclCnRunner.cpp +++ b/src/backend/opencl/runners/OclCnRunner.cpp @@ -31,9 +31,9 @@ #include "backend/opencl/OclLaunchData.h" #include "backend/opencl/runners/tools/OclCnR.h" #include "backend/opencl/wrappers/OclLib.h" -#include "base/crypto/CnAlgo.h" #include "base/io/log/Log.h" #include "base/net/stratum/Job.h" +#include "crypto/cn/CnAlgo.h" xmrig::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) diff --git a/src/backend/opencl/runners/OclRyoRunner.cpp b/src/backend/opencl/runners/OclRyoRunner.cpp index 8d494a26..1a9bb17d 100644 --- a/src/backend/opencl/runners/OclRyoRunner.cpp +++ b/src/backend/opencl/runners/OclRyoRunner.cpp @@ -31,9 +31,9 @@ #include "backend/opencl/kernels/CnBranchKernel.h" #include "backend/opencl/OclLaunchData.h" #include "backend/opencl/wrappers/OclLib.h" -#include "base/crypto/CnAlgo.h" #include "base/io/log/Log.h" #include "base/net/stratum/Job.h" +#include "crypto/cn/CnAlgo.h" xmrig::OclRyoRunner::OclRyoRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) diff --git a/src/base/base.cmake b/src/base/base.cmake index 5116da06..d32f723e 100644 --- a/src/base/base.cmake +++ b/src/base/base.cmake @@ -1,7 +1,6 @@ set(HEADERS_BASE src/base/api/interfaces/IApiListener.h src/base/crypto/Algorithm.h - src/base/crypto/CnAlgo.h src/base/crypto/Coin.h src/base/crypto/keccak.h src/base/io/Console.h diff --git a/src/base/crypto/CnAlgo.h b/src/crypto/cn/CnAlgo.h similarity index 100% rename from src/base/crypto/CnAlgo.h rename to src/crypto/cn/CnAlgo.h diff --git a/src/crypto/cn/CnHash.h b/src/crypto/cn/CnHash.h index f0b5a711..9c898619 100644 --- a/src/crypto/cn/CnHash.h +++ b/src/crypto/cn/CnHash.h @@ -31,7 +31,7 @@ #include -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #include "crypto/common/Assembly.h" diff --git a/src/crypto/cn/CryptoNight_arm.h b/src/crypto/cn/CryptoNight_arm.h index f8ddbd54..bb663ce9 100644 --- a/src/crypto/cn/CryptoNight_arm.h +++ b/src/crypto/cn/CryptoNight_arm.h @@ -28,8 +28,8 @@ #define XMRIG_CRYPTONIGHT_ARM_H -#include "base/crypto/CnAlgo.h" #include "base/crypto/keccak.h" +#include "crypto/cn/CnAlgo.h" #include "crypto/cn/CryptoNight_monero.h" #include "crypto/cn/CryptoNight.h" #include "crypto/cn/soft_aes.h" diff --git a/src/crypto/cn/CryptoNight_x86.h b/src/crypto/cn/CryptoNight_x86.h index d71af013..4255be09 100644 --- a/src/crypto/cn/CryptoNight_x86.h +++ b/src/crypto/cn/CryptoNight_x86.h @@ -36,8 +36,8 @@ #include "backend/cpu/Cpu.h" -#include "base/crypto/CnAlgo.h" #include "base/crypto/keccak.h" +#include "crypto/cn/CnAlgo.h" #include "crypto/cn/CryptoNight_monero.h" #include "crypto/cn/CryptoNight.h" #include "crypto/cn/soft_aes.h" diff --git a/src/crypto/cn/gpu/cn_gpu_avx.cpp b/src/crypto/cn/gpu/cn_gpu_avx.cpp index d3dc7b81..b600921d 100644 --- a/src/crypto/cn/gpu/cn_gpu_avx.cpp +++ b/src/crypto/cn/gpu/cn_gpu_avx.cpp @@ -23,7 +23,7 @@ */ -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #ifdef __GNUC__ diff --git a/src/crypto/cn/gpu/cn_gpu_ssse3.cpp b/src/crypto/cn/gpu/cn_gpu_ssse3.cpp index 7e0ef5b7..5b592e5f 100644 --- a/src/crypto/cn/gpu/cn_gpu_ssse3.cpp +++ b/src/crypto/cn/gpu/cn_gpu_ssse3.cpp @@ -23,7 +23,7 @@ */ -#include "base/crypto/CnAlgo.h" +#include "crypto/cn/CnAlgo.h" #ifdef __GNUC__