fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed autoconf mode for AMD FX CPUs.

Browse source
This commit is contained in:
XMRig 2017-08-02 18:59:24 +03:00
parent 2d1fdec618
commit a680220d28
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Cpu.cpp
View file

@ -29,13 +29,14 @@
#include "Cpu.h" #include "Cpu.h"
char Cpu::m_brand[64] = { 0 }; bool Cpu::m_l2_exclusive = false;
int Cpu::m_flags = 0; char Cpu::m_brand[64] = { 0 };
int Cpu::m_l2_cache = 0; int Cpu::m_flags = 0;
int Cpu::m_l3_cache = 0; int Cpu::m_l2_cache = 0;
int Cpu::m_sockets = 1; int Cpu::m_l3_cache = 0;
int Cpu::m_totalCores = 0; int Cpu::m_sockets = 1;
int Cpu::m_totalThreads = 0; int Cpu::m_totalCores = 0;
int Cpu::m_totalThreads = 0;
int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage) int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
@ -44,7 +45,14 @@ int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
return 1; return 1;
} }
int cache = m_l3_cache ? m_l3_cache : m_l2_cache; int cache = 0;
if (m_l3_cache) {
cache = m_l2_exclusive ? (m_l2_cache + m_l3_cache) : m_l3_cache;
}
else {
cache = m_l2_cache;
}
int count = 0; int count = 0;
const int size = (algo ? 1024 : 2048) * (doubleHash ? 2 : 1); const int size = (algo ? 1024 : 2048) * (doubleHash ? 2 : 1);
@ -84,8 +92,9 @@ void Cpu::initCommon()
m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0; m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0;
// Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97 // Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97
if (data.vendor == VENDOR_AMD && data.l3_cache <= 0 && data.l2_assoc == 16 && data.ext_family >= 21) { if (data.vendor == VENDOR_AMD && data.ext_family >= 0x15 && data.ext_family < 0x17) {
m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets; m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets;
m_l2_exclusive = true;
} }
else { else {
m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0; m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0;

1
src/Cpu.h
View file

@ -53,6 +53,7 @@ public:
private: private:
static void initCommon(); static void initCommon();
static bool m_l2_exclusive;
static char m_brand[64]; static char m_brand[64];
static int m_flags; static int m_flags;
static int m_l2_cache; static int m_l2_cache;

2
src/config.json
View file

@ -12,7 +12,7 @@
"retry-pause": 5, "retry-pause": 5,
"safe": false, "safe": false,
"syslog": false, "syslog": false,
"threads": 4, "threads": null,
"pools": [ "pools": [
{ {
"url": "pool.minemonero.pro:5555", "url": "pool.minemonero.pro:5555",