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

Merge Assembly enum and Asm class.

Browse source
This commit is contained in:
XMRig 2019-06-28 13:08:08 +07:00
parent 188338c493
commit 66d62de681
19 changed files with 164 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/cpu/BasicCpuInfo.h
View file

@ -40,7 +40,7 @@ public:
protected:
size_t optimalThreadsCount(size_t memSize, int maxCpuUsage) const override;
inline Assembly assembly() const override { return m_assembly; }
inline Assembly::Id assembly() const override { return m_assembly; }
inline bool hasAES() const override { return m_aes; }
inline bool hasAVX2() const override { return m_avx2; }
inline bool isSupported() const override { return true; }

6
src/common/interfaces/ICpuInfo.h
View file

@ -30,7 +30,7 @@
#include <stdint.h>
#include "common/xmrig.h"
#include "crypto/common/Assembly.h"
namespace xmrig {
@ -39,7 +39,7 @@ namespace xmrig {
class ICpuInfo
{
public:
virtual ~ICpuInfo() {}
virtual ~ICpuInfo() = default;
virtual bool hasAES() const = 0;
virtual bool hasAVX2() const = 0;
@ -53,7 +53,7 @@ public:
virtual int32_t sockets() const = 0;
virtual int32_t threads() const = 0;
virtual size_t optimalThreadsCount(size_t memSize, int maxCpuUsage) const = 0;
virtual xmrig::Assembly assembly() const = 0;
virtual Assembly::Id assembly() const = 0;
};

10
src/common/xmrig.h
View file

@ -72,16 +72,6 @@ enum OclVendor {
};
enum Assembly {
ASM_NONE,
ASM_AUTO,
ASM_INTEL,
ASM_RYZEN,
ASM_BULLDOZER,
ASM_MAX
};
} /* namespace xmrig */