Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-01-25 12:06:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto-detect proper asm variant.

Browse source
This commit is contained in:
XMRig 2018-09-23 19:09:05 +03:00
parent c9fd8061c2
commit 0c20d7a125
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/cpu/BasicCpuInfo_arm.cpp
View file

@ -36,7 +36,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
memcpy(m_brand, "Unknown", 7); memcpy(m_brand, "Unknown", 7);
# if __ARM_FEATURE_CRYPTO # if __ARM_FEATURE_CRYPTO
m_flags |= AES; m_aes = true;
# endif # endif
} }

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

@ -31,6 +31,7 @@
xmrig::AdvancedCpuInfo::AdvancedCpuInfo() : xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
m_assembly(ASM_NONE),
m_aes(false), m_aes(false),
m_L2_exclusive(false), m_L2_exclusive(false),
m_brand(), m_brand(),
@ -71,7 +72,16 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
m_L2 = data.l2_cache > 0 ? data.l2_cache * cores() * m_sockets : 0; m_L2 = data.l2_cache > 0 ? data.l2_cache * cores() * m_sockets : 0;
} }
m_aes = data.flags[CPU_FEATURE_AES]; if (data.flags[CPU_FEATURE_AES]) {
m_aes = true;
if (data.vendor == VENDOR_AMD && data.ext_family >= 23) {
m_assembly = ASM_RYZEN;
}
else if (data.vendor == VENDOR_INTEL && data.ext_model >= 42) {
m_assembly = ASM_INTEL;
}
}
} }

4
src/core/cpu/AdvancedCpuInfo.h
View file

@ -7,7 +7,6 @@
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2016-2018 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2018 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
*
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -40,7 +39,7 @@ public:
protected: protected:
size_t optimalThreadsCount(size_t memSize, int maxCpuUsage) const override; size_t optimalThreadsCount(size_t memSize, int maxCpuUsage) const override;
inline Assembly assembly() const override { return ASM_NONE; } inline Assembly assembly() const override { return m_assembly; }
inline bool hasAES() const override { return m_aes; } inline bool hasAES() const override { return m_aes; }
inline bool isSupported() const override { return true; } inline bool isSupported() const override { return true; }
inline const char *brand() const override { return m_brand; } inline const char *brand() const override { return m_brand; }
@ -58,6 +57,7 @@ protected:
# endif # endif
private: private:
Assembly m_assembly;
bool m_aes; bool m_aes;
bool m_L2_exclusive; bool m_L2_exclusive;
char m_brand[64]; char m_brand[64];