Added command line option --astrobwt-avx2

src/backend/cpu/CpuConfig.cpp

@@ -52,7 +52,7 @@ static const char *kArgon2Impl = "argon2-impl";
 
 #ifdef XMRIG_ALGO_ASTROBWT
 static const char* kAstroBWTMaxSize = "astrobwt-max-size";
-static const char* kAstroBWTAVX2 = "astrobwt-avx2";
+static const char* kAstroBWTAVX2    = "astrobwt-avx2";
 #endif
 
 
@@ -94,8 +94,8 @@ rapidjson::Value xmrig::CpuConfig::toJSON(rapidjson::Document &doc) const
 #   endif
 
 #   ifdef XMRIG_ALGO_ASTROBWT
-    obj.AddMember(StringRef(kAstroBWTMaxSize), m_astrobwtMaxSize, allocator);
-    obj.AddMember(StringRef(kAstroBWTAVX2), m_astrobwtAVX2, allocator);
+    obj.AddMember(StringRef(kAstroBWTMaxSize),  m_astrobwtMaxSize, allocator);
+    obj.AddMember(StringRef(kAstroBWTAVX2),     m_astrobwtAVX2, allocator);
 #   endif
 
     m_threads.toJSON(obj, doc);

src/backend/cpu/CpuConfig.h

@@ -73,12 +73,12 @@ private:
 
     AesMode m_aes           = AES_AUTO;
     Assembly m_assembly;
+    bool m_astrobwtAVX2     = false;
     bool m_enabled          = true;
     bool m_hugePages        = true;
     bool m_shouldSave       = false;
     bool m_yield            = true;
     int m_astrobwtMaxSize   = 550;
-    bool m_astrobwtAVX2     = false;
     int m_memoryPool        = 0;
     int m_priority          = -1;
     String m_argon2Impl;

src/backend/cpu/CpuLaunchData.cpp

@@ -35,11 +35,11 @@
 xmrig::CpuLaunchData::CpuLaunchData(const Miner *miner, const Algorithm &algorithm, const CpuConfig &config, const CpuThread &thread) :
     algorithm(algorithm),
     assembly(config.assembly()),
+    astrobwtAVX2(config.astrobwtAVX2()),
     hugePages(config.isHugePages()),
     hwAES(config.isHwAES()),
     yield(config.isYield()),
-    astrobwtMaxSize(config.astrobwtMaxSize()),
-    astrobwtAVX2(config.astrobwtAVX2()),
+    astrobwtMaxSize(config.astrobwtMaxSize()),    
     priority(config.priority()),
     affinity(thread.affinity()),
     miner(miner),

src/backend/cpu/CpuLaunchData.h

@@ -58,11 +58,11 @@ public:
 
     const Algorithm algorithm;
     const Assembly assembly;
+    const bool astrobwtAVX2;
     const bool hugePages;
     const bool hwAES;
     const bool yield;
     const int astrobwtMaxSize;
-    const bool astrobwtAVX2;
     const int priority;
     const int64_t affinity;
     const Miner *miner;

src/backend/cpu/CpuWorker.cpp

@@ -77,11 +77,11 @@ xmrig::CpuWorker<N>::CpuWorker(size_t id, const CpuLaunchData &data) :
     Worker(id, data.affinity, data.priority),
     m_algorithm(data.algorithm),
     m_assembly(data.assembly),
+    m_astrobwtAVX2(data.astrobwtAVX2),
     m_hwAES(data.hwAES),
     m_yield(data.yield),
     m_av(data.av()),
     m_astrobwtMaxSize(data.astrobwtMaxSize * 1000),
-    m_astrobwtAVX2(data.astrobwtAVX2),
     m_miner(data.miner),
     m_ctx()
 {

src/backend/cpu/CpuWorker.h

@@ -70,11 +70,11 @@ private:
 
     const Algorithm m_algorithm;
     const Assembly m_assembly;
+    const bool m_astrobwtAVX2;
     const bool m_hwAES;
     const bool m_yield;
     const CnHash::AlgoVariant m_av;
     const int m_astrobwtMaxSize;
-    const bool m_astrobwtAVX2;
     const Miner *m_miner;
     cryptonight_ctx *m_ctx[N];
     uint8_t m_hash[N * 32]{ 0 };