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

Merge branch 'dev' of https://github.com/SChernykh/xmrig into feature-asm-bulldozer

Browse source
This commit is contained in:
XMRig 2018-10-22 22:52:53 +07:00
commit caa70a1e9d
10 changed files with 211 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/ConfigLoader_platform.h
View file

@ -84,7 +84,7 @@ Options:\n\
"\
--max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75)\n\
--safe safe adjust threads and av settings for current CPU\n\
--asm=ASM ASM code for cn/2, possible values: auto, none, intel, ryzen.\n\
--asm=ASM ASM code for cn/2, possible values: auto, none, intel, ryzen, bulldozer.\n\
--print-time=N print hashrate report every N seconds\n\
--api-port=N port for the miner API\n\
--api-access-token=T access token for API\n\

2
src/core/cpu/AdvancedCpuInfo.cpp
View file

@ -76,7 +76,7 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
m_aes = true;
if (data.vendor == VENDOR_AMD) {
m_assembly = ASM_RYZEN;
m_assembly = (data.ext_family >= 23) ? ASM_RYZEN : ASM_BULLDOZER;
}
else if (data.vendor == VENDOR_INTEL) {
m_assembly = ASM_INTEL;