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

Merge pull request #1946 from SChernykh/dev

Browse source 
Fixed MSR mod names in JSON API
This commit is contained in:
xmrig 2020-11-15 02:41:22 +07:00 • committed by GitHub
commit 8737af0f6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/cpu/interfaces/ICpuInfo.h
View file

@ -55,6 +55,8 @@ public:
MSR_MOD_MAX MSR_MOD_MAX
}; };
# define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "intel", "custom"
enum Flag : uint32_t { enum Flag : uint32_t {
FLAG_AES, FLAG_AES,
FLAG_AVX2, FLAG_AVX2,

2
src/backend/cpu/platform/BasicCpuInfo.cpp
View file

@ -53,7 +53,7 @@ namespace xmrig {
static const std::array<const char *, ICpuInfo::FLAG_MAX> flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" }; static const std::array<const char *, ICpuInfo::FLAG_MAX> flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" };
static const std::array<const char *, ICpuInfo::MSR_MOD_MAX> msrNames = { "none", "ryzen", "intel", "custom" }; static const std::array<const char *, ICpuInfo::MSR_MOD_MAX> msrNames = { MSR_NAMES_LIST };
static inline void cpuid(uint32_t level, int32_t output[4]) static inline void cpuid(uint32_t level, int32_t output[4])

2
src/crypto/rx/RxConfig.cpp
View file

@ -74,7 +74,7 @@ static const std::array<MsrItems, kMsrArraySize> msrPresets = {
MsrItems() MsrItems()
}; };
static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen_17h", "ryzen_19h", "intel", "custom" }; static const std::array<const char *, kMsrArraySize> modNames = { MSR_NAMES_LIST };
static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch"); static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
#endif #endif