github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-20 06:08:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix usage of bytes instead of KB

Browse Source 
bug was introduced with #67

- increase the L3 sanity check to 2GiB
- fix usage of byte instead of KB
This commit is contained in:
psychocrypt
2018-01-09 21:01:30 +01:00
parent 6a508ce409
commit 054ee94f9e
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmrstak/backend/cpu/autoAdjust.hpp
+14 -17
View File
@@ -33,25 +33,21 @@ class autoAdjust
{
public:
size_t hashMemSize;
size_t halfHashMemSize;
autoAdjust()
bool printConfig()
{
size_t hashMemSizeKB;
size_t halfHashMemSizeKB;
if(::jconf::inst()->IsCurrencyMonero())
{
hashMemSize = MONERO_MEMORY;
halfHashMemSize = hashMemSize / 2u;
hashMemSizeKB = MONERO_MEMORY / 1024u;
halfHashMemSizeKB = hashMemSizeKB / 2u;
}
else
{
hashMemSize = AEON_MEMORY;
halfHashMemSize = hashMemSize / 2u;
hashMemSizeKB = AEON_MEMORY / 1024u;
halfHashMemSizeKB = hashMemSizeKB / 2u;
}
}
bool printConfig()
{
configEditor configTpl{};
@@ -63,9 +59,10 @@ public:
std::string conf;
if(!detectL3Size() || L3KB_size < halfHashMemSize || L3KB_size > (halfHashMemSize * 100u))
if(!detectL3Size() || L3KB_size < halfHashMemSizeKB || L3KB_size > (halfHashMemSizeKB * 2048u))
{
if(L3KB_size < halfHashMemSize || L3KB_size > (halfHashMemSize * 100))
if(L3KB_size < halfHashMemSizeKB || L3KB_size > (halfHashMemSizeKB * 2048))
printer::inst()->print_msg(L0, "Autoconf failed: L3 size sanity check failed - %u KB.", L3KB_size);
conf += std::string(" { \"low_power_mode\" : false, \"no_prefetch\" : true, \"affine_to_cpu\" : false },\n");
@@ -88,7 +85,7 @@ public:
if(L3KB_size <= 0)
break;
double_mode = L3KB_size / hashMemSize > (int32_t)(corecnt-i);
double_mode = L3KB_size / hashMemSizeKB > (int32_t)(corecnt-i);
conf += std::string(" { \"low_power_mode\" : ");
conf += std::string(double_mode ? "true" : "false");
@@ -107,9 +104,9 @@ public:
aff_id++;
if(double_mode)
L3KB_size -= hashMemSize * 2u;
L3KB_size -= hashMemSizeKB * 2u;
else
L3KB_size -= hashMemSize;
L3KB_size -= hashMemSizeKB;
}
}