Move CnAlgo

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.

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

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"
 
 

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 <algorithm>

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 <algorithm>

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)

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)

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

src/crypto/cn/CnHash.h

@@ -31,7 +31,7 @@
 #include <cstdint>
 
 
-#include "base/crypto/CnAlgo.h"
+#include "crypto/cn/CnAlgo.h"
 #include "crypto/common/Assembly.h"
 
 

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"

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"

src/crypto/cn/gpu/cn_gpu_avx.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include "base/crypto/CnAlgo.h"
+#include "crypto/cn/CnAlgo.h"
 
 
 #ifdef __GNUC__

src/crypto/cn/gpu/cn_gpu_ssse3.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include "base/crypto/CnAlgo.h"
+#include "crypto/cn/CnAlgo.h"
 
 
 #ifdef __GNUC__