mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-13 15:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

LLVM: Add workaround for znver2

Browse Source
This commit is contained in:
Nekotekina 2019-11-14 19:09:34 +03:00
parent 8e39c778a1
commit fcc841eaa1
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Utilities/JIT.cpp
View File

@ -490,7 +490,7 @@ private:
}; };
Segment m_curr; Segment m_curr;
std::vector<Segment> m_segs; std::vector<Segment> m_segs;
}; };
// Memory manager mutex // Memory manager mutex
@ -581,7 +581,7 @@ struct MemoryManager : llvm::RTDyldMemoryManager
if (m_tramps) if (m_tramps)
{ {
const s64 tramps_diff = u64(m_tramps) - code_start; const s64 tramps_diff = u64(m_tramps) - code_start;
if (tramps_diff < INT_MIN || tramps_diff > INT_MAX) if (tramps_diff < INT_MIN || tramps_diff > INT_MAX)
m_tramps = nullptr; //previously allocated trampoline section too far away now m_tramps = nullptr; //previously allocated trampoline section too far away now
} }
@ -965,6 +965,12 @@ std::string jit_compiler::cpu(const std::string& _cpu)
m_cpu = "skylake"; m_cpu = "skylake";
} }
} }
if (m_cpu == "znver1" && utils::has_clwb())
{
// Upgrade
m_cpu = "znver2";
}
} }
return m_cpu; return m_cpu;

6
Utilities/sysinfo.cpp
View File

@ -69,6 +69,12 @@ bool utils::has_xop()
return g_value; return g_value;
} }
bool utils::has_clwb()
{
static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x1000000) == 0x1000000;
return g_value;
}
std::string utils::get_system_info() std::string utils::get_system_info()
{ {
std::string result; std::string result;

2
Utilities/sysinfo.h
View File

@ -45,6 +45,8 @@ namespace utils
bool has_xop(); bool has_xop();
bool has_clwb();
std::string get_system_info(); std::string get_system_info();
std::string get_firmware_version(); std::string get_firmware_version();