Merge xmrig v6.7.0 into master

src/core/Miner.cpp

@@ -38,12 +38,10 @@
 #include "base/kernel/Platform.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Object.h"
-#include "base/tools/Profiler.h"
 #include "base/tools/Timer.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
 #include "crypto/common/Nonce.h"
-#include "crypto/rx/Rx.h"
 #include "version.h"
 
 
@@ -64,6 +62,8 @@
 
 
 #ifdef XMRIG_ALGO_RANDOMX
+#   include "crypto/rx/Profiler.h"
+#   include "crypto/rx/Rx.h"
 #   include "crypto/rx/RxConfig.h"
 #endif
 
@@ -203,7 +203,7 @@ public:
                 continue;
             }
 
-            for (size_t i = 1; i < hr->threads(); i++) {
+            for (size_t i = 0; i < hr->threads(); i++) {
                 Value thread(kArrayType);
                 thread.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
                 thread.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);

src/core/MoBenchmark.h

@@ -22,6 +22,8 @@
 #include "base/crypto/Algorithm.h"
 #include "rapidjson/fwd.h"
 
+#include <memory>
+
 namespace xmrig {
 
 class Controller;
@@ -70,7 +72,7 @@ class MoBenchmark : public IJobResultListener {
         Job* m_bench_job[BenchAlgo::MAX];
         double m_bench_algo_perf[BenchAlgo::MAX];
 
-        Controller* m_controller;          // to get access to config and network
+        std::shared_ptr<Controller> m_controller;          // to get access to config and network
         bool m_isNewBenchRun;              // true if benchmark is need to be executed or was executed
         MoBenchmark::BenchAlgo m_bench_algo; // current perf algo we benchmark
         uint64_t m_hash_count;             // number of hashes calculated for current perf algo
@@ -90,7 +92,7 @@ class MoBenchmark : public IJobResultListener {
         MoBenchmark();
         virtual ~MoBenchmark();
 
-        void set_controller(Controller* controller) { m_controller = controller; }
+        void set_controller(std::shared_ptr<Controller> controller) { m_controller = controller; }
 
         void start(); // start benchmarks
 

src/core/config/Config_default.h

@@ -50,6 +50,7 @@ R"===(
     "colors": true,
     "randomx": {
         "init": -1,
+        "init-avx2": -1,
         "mode": "auto",
         "1gb-pages": false,
         "rdmsr": true,