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

Merge xmrig v6.5.2

Browse source
This commit is contained in:
MoneroOcean 2020-11-13 19:47:22 +00:00
commit 77a951a6a4
21 changed files with 197 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/backend/common/Benchmark.cpp
View file

@ -37,9 +37,35 @@
namespace xmrig {
static uint64_t hashCheck[2][10] = {
{ 0x898B6E0431C28A6BULL, 0xEE9468F8B40926BCULL, 0xC2BC5D11724813C0ULL, 0x3A2C7B285B87F941ULL, 0x3B5BD2C3A16B450EULL, 0x5CD0602F20C5C7C4ULL, 0x101DE939474B6812ULL, 0x52B765A1B156C6ECULL, 0x323935102AB6B45CULL, 0xB5231262E2792B26ULL },
{ 0x0F3E5400B39EA96AULL, 0x85944CCFA2752D1FULL, 0x64AFFCAE991811BAULL, 0x3E4D0B836D3B13BAULL, 0xEB7417D621271166ULL, 0x97FFE10C0949FFA5ULL, 0x84CAC0F8879A4BA1ULL, 0xA1B79F031DA2459FULL, 0x9B65226DA873E65DULL, 0x0F9E00C5A511C200ULL },
static const std::map<int, std::map<uint32_t, uint64_t> > hashCheck = {
{ Algorithm::RX_0, {
{ 250000U, 0x7D6054757BB08A63ULL },
{ 500000U, 0x96607546DE1F5ECCULL },
{ 1000000U, 0x898B6E0431C28A6BULL },
{ 2000000U, 0xEE9468F8B40926BCULL },
{ 3000000U, 0xC2BC5D11724813C0ULL },
{ 4000000U, 0x3A2C7B285B87F941ULL },
{ 5000000U, 0x3B5BD2C3A16B450EULL },
{ 6000000U, 0x5CD0602F20C5C7C4ULL },
{ 7000000U, 0x101DE939474B6812ULL },
{ 8000000U, 0x52B765A1B156C6ECULL },
{ 9000000U, 0x323935102AB6B45CULL },
{ 10000000U, 0xB5231262E2792B26ULL }
}},
{ Algorithm::RX_WOW, {
{ 250000U, 0xC7F712C9603E2603ULL },
{ 500000U, 0x21A0E5AAE6DA7D8DULL },
{ 1000000U, 0x0F3E5400B39EA96AULL },
{ 2000000U, 0x85944CCFA2752D1FULL },
{ 3000000U, 0x64AFFCAE991811BAULL },
{ 4000000U, 0x3E4D0B836D3B13BAULL },
{ 5000000U, 0xEB7417D621271166ULL },
{ 6000000U, 0x97FFE10C0949FFA5ULL },
{ 7000000U, 0x84CAC0F8879A4BA1ULL },
{ 8000000U, 0xA1B79F031DA2459FULL },
{ 9000000U, 0x9B65226DA873E65DULL },
{ 10000000U, 0x0F9E00C5A511C200ULL }
}}
};
@ -87,7 +113,7 @@ bool xmrig::Benchmark::finish(uint64_t totalHashCount)
doc.AddMember("steady_done_ts", m_doneTime, allocator);
doc.AddMember(StringRef(BenchConfig::kHash), Value(fmt::format("{:016X}", m_data).c_str(), allocator), allocator);
doc.AddMember("backend", m_backend->toJSON(doc), allocator); // FIXME
doc.AddMember("backend", m_backend->toJSON(doc), allocator);
send(doc);
}
@ -185,12 +211,13 @@ uint64_t xmrig::Benchmark::referenceHash() const
}
# endif
const uint32_t N = (m_end / 1000000) - 1;
if (((m_algo == Algorithm::RX_0) || (m_algo == Algorithm::RX_WOW)) && ((m_end % 1000000) == 0) && (N < 10)) {
return hashCheck[(m_algo == Algorithm::RX_0) ? 0 : 1][N];
}
uint64_t hash = 0;
return 0;
try {
hash = hashCheck.at(m_algo).at(m_end);
} catch (const std::exception &ex) {}
return hash;
}

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

@ -48,7 +48,8 @@ public:
enum MsrMod : uint32_t {
MSR_MOD_NONE,
MSR_MOD_RYZEN,
MSR_MOD_RYZEN_17H,
MSR_MOD_RYZEN_19H,
MSR_MOD_INTEL,
MSR_MOD_CUSTOM,
MSR_MOD_MAX

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

@ -189,15 +189,32 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
memcpy(vendor + 4, &data[3], 4);
memcpy(vendor + 8, &data[2], 4);
cpuid(PROCESSOR_INFO, data);
m_procInfo = data[EAX_Reg];
m_family = get_masked(m_procInfo, 12, 8) + get_masked(m_procInfo, 28, 20);
m_model = (get_masked(m_procInfo, 20, 16) << 4) | get_masked(m_procInfo, 8, 4);
m_stepping = get_masked(m_procInfo, 4, 0);
if (memcmp(vendor, "AuthenticAMD", 12) == 0) {
m_vendor = VENDOR_AMD;
cpuid(PROCESSOR_INFO, data);
const int32_t family = get_masked(data[EAX_Reg], 12, 8) + get_masked(data[EAX_Reg], 28, 20);
if (family >= 23) {
if (m_family >= 0x17) {
m_assembly = Assembly::RYZEN;
m_msrMod = MSR_MOD_RYZEN;
switch (m_family) {
case 0x17:
m_msrMod = MSR_MOD_RYZEN_17H;
break;
case 0x19:
m_msrMod = MSR_MOD_RYZEN_19H;
break;
default:
m_msrMod = MSR_MOD_NONE;
break;
}
}
else {
m_assembly = Assembly::BULLDOZER;
@ -220,7 +237,6 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
unsigned int reserved2 : 4;
} processor_info;
cpuid(1, data);
memcpy(&processor_info, data, sizeof(processor_info));
// Intel JCC erratum mitigation
@ -323,6 +339,10 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const
Value out(kObjectType);
out.AddMember("brand", StringRef(brand()), allocator);
out.AddMember("family", m_family, allocator);
out.AddMember("model", m_model, allocator);
out.AddMember("stepping", m_stepping, allocator);
out.AddMember("proc_info", m_procInfo, allocator);
out.AddMember("aes", hasAES(), allocator);
out.AddMember("avx2", hasAVX2(), allocator);
out.AddMember("x64", isX64(), allocator);

4
src/backend/cpu/platform/BasicCpuInfo.h
View file

@ -70,6 +70,10 @@ protected:
bool m_jccErratum = false;
private:
uint32_t m_procInfo = 0;
uint32_t m_family = 0;
uint32_t m_model = 0;
uint32_t m_stepping = 0;
Assembly m_assembly = Assembly::NONE;
MsrMod m_msrMod = MSR_MOD_NONE;
std::bitset<FLAG_MAX> m_flags;