From db70071534692198336e6a09d61323eb18f09bc8 Mon Sep 17 00:00:00 2001
From: psychocrypt <psychocryptHPC@gmail.com>
Date: Mon, 17 Sep 2018 08:22:51 +0200
Subject: [PATCH] CPU: change default for `asm`
Remove the asm option `auto` by `off`
---
xmrstak/backend/cpu/autoAdjust.hpp | 2 +-
xmrstak/backend/cpu/autoAdjustHwloc.hpp | 2 +-
xmrstak/backend/cpu/config.tpl | 8 ++++----
xmrstak/backend/cpu/minethd.cpp | 2 +-
xmrstak/backend/cpu/minethd.hpp | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/xmrstak/backend/cpu/autoAdjust.hpp b/xmrstak/backend/cpu/autoAdjust.hpp
index 8588fea..28ff515 100644
--- a/xmrstak/backend/cpu/autoAdjust.hpp
+++ b/xmrstak/backend/cpu/autoAdjust.hpp
@@ -82,7 +82,7 @@ public:
conf += std::string(" { \"low_power_mode\" : ");
conf += std::string(double_mode ? "true" : "false");
- conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"auto\", \"affine_to_cpu\" : ");
+ conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"off\", \"affine_to_cpu\" : ");
conf += std::to_string(aff_id);
conf += std::string(" },\n");
diff --git a/xmrstak/backend/cpu/autoAdjustHwloc.hpp b/xmrstak/backend/cpu/autoAdjustHwloc.hpp
index a73de86..2bebf82 100644
--- a/xmrstak/backend/cpu/autoAdjustHwloc.hpp
+++ b/xmrstak/backend/cpu/autoAdjustHwloc.hpp
@@ -70,7 +70,7 @@ public:
{
conf += std::string(" { \"low_power_mode\" : ");
conf += std::string((id & 0x8000000) != 0 ? "true" : "false");
- conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"auto\", \"affine_to_cpu\" : ");
+ conf += std::string(", \"no_prefetch\" : true, \"asm\" : \"off\", \"affine_to_cpu\" : ");
conf += std::to_string(id & 0x7FFFFFF);
conf += std::string(" },\n");
}
diff --git a/xmrstak/backend/cpu/config.tpl b/xmrstak/backend/cpu/config.tpl
index bfffc85..e4da15f 100644
--- a/xmrstak/backend/cpu/config.tpl
+++ b/xmrstak/backend/cpu/config.tpl
@@ -10,8 +10,8 @@ R"===(
* no_prefetch - Some systems can gain up to extra 5% here, but sometimes it will have no difference or make
* things slower.
*
- * asm - Allow to switch to a assembler version of cryptonight_v8; allowed value [auto, intel, ryzen]
- * - auto: used the default implementation (no assembler version)
+ * asm - Allow to switch to a assembler version of cryptonight_v8; allowed value [off, intel, ryzen]
+ * - off: used the default implementation (no assembler version)
* - intel: supports Intel Ivy Bridge (Xeon v2, Core i7/i5/i3 3xxx, Pentium G2xxx, Celeron G1xxx)
* - ryzen: AMD Ryzen (1xxx and 2xxx series)
*
@@ -26,8 +26,8 @@ R"===(
* A filled out configuration should look like this:
* "cpu_threads_conf" :
* [
- * { "low_power_mode" : false, "no_prefetch" : true, "asm" : "auto", "affine_to_cpu" : 0 },
- * { "low_power_mode" : false, "no_prefetch" : true, "asm" : "auto", "affine_to_cpu" : 1 },
+ * { "low_power_mode" : false, "no_prefetch" : true, "asm" : "off", "affine_to_cpu" : 0 },
+ * { "low_power_mode" : false, "no_prefetch" : true, "asm" : "off", "affine_to_cpu" : 1 },
* ],
* If you do not wish to mine with your CPU(s) then use:
* "cpu_threads_conf" :
diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp
index f07c714..2f01d5e 100644
--- a/xmrstak/backend/cpu/minethd.cpp
+++ b/xmrstak/backend/cpu/minethd.cpp
@@ -457,7 +457,7 @@ minethd::cn_hash_fun minethd::func_multi_selector(bool bHaveAes, bool bNoPrefetc
// check for asm optimized version for cryptonight_v8
if(N == 1 && algo == cryptonight_monero_v8 && bHaveAes)
{
- if(asm_version_str != "auto")
+ if(asm_version_str != "off")
{
if(asm_version_str == "intel")
{
diff --git a/xmrstak/backend/cpu/minethd.hpp b/xmrstak/backend/cpu/minethd.hpp
index 53ff93c..eb77749 100644
--- a/xmrstak/backend/cpu/minethd.hpp
+++ b/xmrstak/backend/cpu/minethd.hpp
@@ -32,7 +32,7 @@ public:
private:
template<size_t N>
- static cn_hash_fun func_multi_selector(bool bHaveAes, bool bNoPrefetch, xmrstak_algo algo, const std::string& asm_version_str = "auto");
+ static cn_hash_fun func_multi_selector(bool bHaveAes, bool bNoPrefetch, xmrstak_algo algo, const std::string& asm_version_str = "off");
minethd(miner_work& pWork, size_t iNo, int iMultiway, bool no_prefetch, int64_t affinity, const std::string& asm_version);
@@ -60,7 +60,7 @@ private:
bool bQuit;
bool bNoPrefetch;
- std::string asm_version_str = "auto";
+ std::string asm_version_str = "off";
};
} // namespace cpu
--
GitLab