From cf61f4974602cc9af8205975cf7ed7e67dbfe89e Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 23 Jun 2019 14:23:29 +0700
Subject: [PATCH] Use better source for AES settings in RandomX threads.

---
 src/core/config/Config.cpp  | 11 ++++++++---
 src/core/config/Config.h    |  2 +-
 src/workers/MultiWorker.cpp |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp
index 52a1e550..450f587e 100644
--- a/src/core/config/Config.cpp
+++ b/src/core/config/Config.cpp
@@ -56,6 +56,12 @@ xmrig::Config::Config() :
 }
 
 
+bool xmrig::Config::isHwAES() const
+{
+    return (m_aesMode == AES_AUTO ? (Cpu::info()->hasAES() ? AES_HW : AES_SOFT) : m_aesMode) == AES_HW;
+}
+
+
 bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
 {
     if (!BaseConfig::read(reader, fileName)) {
@@ -147,11 +153,10 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
 bool xmrig::Config::finalize()
 {
     if (!m_threads.cpu.empty()) {
-        m_threads.mode     = Advanced;
-        const bool softAES = (m_aesMode == AES_AUTO ? (Cpu::info()->hasAES() ? AES_HW : AES_SOFT) : m_aesMode) == AES_SOFT;
+        m_threads.mode = Advanced;
 
         for (size_t i = 0; i < m_threads.cpu.size(); ++i) {
-            m_threads.list.push_back(CpuThread::createFromData(i, m_algorithm.algo(), m_threads.cpu[i], m_priority, softAES));
+            m_threads.list.push_back(CpuThread::createFromData(i, m_algorithm.algo(), m_threads.cpu[i], m_priority, !isHwAES()));
         }
 
         return true;
diff --git a/src/core/config/Config.h b/src/core/config/Config.h
index 4bcb8bba..1d8a42d9 100644
--- a/src/core/config/Config.h
+++ b/src/core/config/Config.h
@@ -67,10 +67,10 @@ public:
 
     Config();
 
+    bool isHwAES() const;
     bool read(const IJsonReader &reader, const char *fileName) override;
     void getJSON(rapidjson::Document &doc) const override;
 
-    inline AesMode aesMode() const                       { return m_aesMode; }
     inline AlgoVariant algoVariant() const               { return m_algoVariant; }
     inline Assembly assembly() const                     { return m_assembly; }
     inline bool isHugePages() const                      { return m_hugePages; }
diff --git a/src/workers/MultiWorker.cpp b/src/workers/MultiWorker.cpp
index e15b51b7..b5f465e4 100644
--- a/src/workers/MultiWorker.cpp
+++ b/src/workers/MultiWorker.cpp
@@ -31,7 +31,6 @@
 #include "workers/CpuThread.h"
 #include "workers/MultiWorker.h"
 #include "workers/Workers.h"
-#include "common/cpu/Cpu.h"
 
 
 template<size_t N>
@@ -61,8 +60,9 @@ void MultiWorker<N>::allocateRandomX_VM()
 {
     if (!m_rx_vm) {
         int flags = RANDOMX_FLAG_LARGE_PAGES | RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT;
-        if (xmrig::Cpu::info()->hasAES())
+        if (!m_thread->isSoftAES()) {
             flags |= RANDOMX_FLAG_HARD_AES;
+        }
 
         m_rx_vm = randomx_create_vm(static_cast<randomx_flags>(flags), nullptr, Workers::getDataset());
         if (!m_rx_vm) {