OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-15 11:40:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7997 from Wunkolo/cpu_detect_more

Browse Source 
cpu_detect: Add additional x86 flags and telemetry
This commit is contained in:
bunnei 2022-03-11 17:26:41 -08:00 committed by GitHub
commit 27cc7b6a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 90 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/common/telemetry.cpp
View File

@ -55,22 +55,50 @@ void AppendBuildInfo(FieldCollection& fc) {
void AppendCPUInfo(FieldCollection& fc) { void AppendCPUInfo(FieldCollection& fc) {
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
fc.AddField(FieldType::UserSystem, "CPU_Model", Common::GetCPUCaps().cpu_string);
fc.AddField(FieldType::UserSystem, "CPU_BrandString", Common::GetCPUCaps().brand_string); const auto& caps = Common::GetCPUCaps();
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_AES", Common::GetCPUCaps().aes); const auto add_field = [&fc](std::string_view field_name, const auto& field_value) {
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_AVX", Common::GetCPUCaps().avx); fc.AddField(FieldType::UserSystem, field_name, field_value);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_AVX2", Common::GetCPUCaps().avx2); };
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_AVX512", Common::GetCPUCaps().avx512); add_field("CPU_Model", caps.cpu_string);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_BMI1", Common::GetCPUCaps().bmi1); add_field("CPU_BrandString", caps.brand_string);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_BMI2", Common::GetCPUCaps().bmi2);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_FMA", Common::GetCPUCaps().fma); add_field("CPU_Extension_x64_SSE", caps.sse);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_FMA4", Common::GetCPUCaps().fma4); add_field("CPU_Extension_x64_SSE2", caps.sse2);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSE", Common::GetCPUCaps().sse); add_field("CPU_Extension_x64_SSE3", caps.sse3);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSE2", Common::GetCPUCaps().sse2); add_field("CPU_Extension_x64_SSSE3", caps.ssse3);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSE3", Common::GetCPUCaps().sse3); add_field("CPU_Extension_x64_SSE41", caps.sse4_1);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSSE3", Common::GetCPUCaps().ssse3); add_field("CPU_Extension_x64_SSE42", caps.sse4_2);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSE41", Common::GetCPUCaps().sse4_1);
fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_SSE42", Common::GetCPUCaps().sse4_2); add_field("CPU_Extension_x64_AVX", caps.avx);
add_field("CPU_Extension_x64_AVX_VNNI", caps.avx_vnni);
add_field("CPU_Extension_x64_AVX2", caps.avx2);
// Skylake-X/SP level AVX512, for compatibility with the previous telemetry field
add_field("CPU_Extension_x64_AVX512",
caps.avx512f && caps.avx512cd && caps.avx512vl && caps.avx512dq && caps.avx512bw);
add_field("CPU_Extension_x64_AVX512F", caps.avx512f);
add_field("CPU_Extension_x64_AVX512CD", caps.avx512cd);
add_field("CPU_Extension_x64_AVX512VL", caps.avx512vl);
add_field("CPU_Extension_x64_AVX512DQ", caps.avx512dq);
add_field("CPU_Extension_x64_AVX512BW", caps.avx512bw);
add_field("CPU_Extension_x64_AVX512BITALG", caps.avx512bitalg);
add_field("CPU_Extension_x64_AVX512VBMI", caps.avx512vbmi);
add_field("CPU_Extension_x64_AES", caps.aes);
add_field("CPU_Extension_x64_BMI1", caps.bmi1);
add_field("CPU_Extension_x64_BMI2", caps.bmi2);
add_field("CPU_Extension_x64_F16C", caps.f16c);
add_field("CPU_Extension_x64_FMA", caps.fma);
add_field("CPU_Extension_x64_FMA4", caps.fma4);
add_field("CPU_Extension_x64_GFNI", caps.gfni);
add_field("CPU_Extension_x64_INVARIANT_TSC", caps.invariant_tsc);
add_field("CPU_Extension_x64_LZCNT", caps.lzcnt);
add_field("CPU_Extension_x64_MOVBE", caps.movbe);
add_field("CPU_Extension_x64_PCLMULQDQ", caps.pclmulqdq);
add_field("CPU_Extension_x64_POPCNT", caps.popcnt);
add_field("CPU_Extension_x64_SHA", caps.sha);
#else #else
fc.AddField(FieldType::UserSystem, "CPU_Model", "Other"); fc.AddField(FieldType::UserSystem, "CPU_Model", "Other");
#endif #endif

7
src/common/telemetry.h
View File

@ -8,6 +8,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <string_view>
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
@ -55,8 +56,8 @@ class Field : public FieldInterface {
public: public:
YUZU_NON_COPYABLE(Field); YUZU_NON_COPYABLE(Field);
Field(FieldType type_, std::string name_, T value_) Field(FieldType type_, std::string_view name_, T value_)
: name(std::move(name_)), type(type_), value(std::move(value_)) {} : name(name_), type(type_), value(std::move(value_)) {}
~Field() override = default; ~Field() override = default;
@ -123,7 +124,7 @@ public:
* @param value Value for the field to add. * @param value Value for the field to add.
*/ */
template <typename T> template <typename T>
void AddField(FieldType type, const char* name, T value) { void AddField(FieldType type, std::string_view name, T value) {
return AddField(std::make_unique<Field<T>>(type, name, std::move(value))); return AddField(std::make_unique<Field<T>>(type, name, std::move(value)));
} }

30
src/common/x64/cpu_detect.cpp
View File

@ -93,10 +93,14 @@ static CPUCaps Detect() {
caps.sse = Common::Bit<25>(cpu_id[3]); caps.sse = Common::Bit<25>(cpu_id[3]);
caps.sse2 = Common::Bit<26>(cpu_id[3]); caps.sse2 = Common::Bit<26>(cpu_id[3]);
caps.sse3 = Common::Bit<0>(cpu_id[2]); caps.sse3 = Common::Bit<0>(cpu_id[2]);
caps.pclmulqdq = Common::Bit<1>(cpu_id[2]);
caps.ssse3 = Common::Bit<9>(cpu_id[2]); caps.ssse3 = Common::Bit<9>(cpu_id[2]);
caps.sse4_1 = Common::Bit<19>(cpu_id[2]); caps.sse4_1 = Common::Bit<19>(cpu_id[2]);
caps.sse4_2 = Common::Bit<20>(cpu_id[2]); caps.sse4_2 = Common::Bit<20>(cpu_id[2]);
caps.movbe = Common::Bit<22>(cpu_id[2]);
caps.popcnt = Common::Bit<23>(cpu_id[2]);
caps.aes = Common::Bit<25>(cpu_id[2]); caps.aes = Common::Bit<25>(cpu_id[2]);
caps.f16c = Common::Bit<29>(cpu_id[2]);
// AVX support requires 3 separate checks: // AVX support requires 3 separate checks:
// - Is the AVX bit set in CPUID? // - Is the AVX bit set in CPUID?
@ -112,16 +116,26 @@ static CPUCaps Detect() {
if (max_std_fn >= 7) { if (max_std_fn >= 7) {
__cpuidex(cpu_id, 0x00000007, 0x00000000); __cpuidex(cpu_id, 0x00000007, 0x00000000);
// Can't enable AVX2 unless the XSAVE/XGETBV checks above passed // Can't enable AVX{2,512} unless the XSAVE/XGETBV checks above passed
caps.avx2 = caps.avx && Common::Bit<5>(cpu_id[1]); if (caps.avx) {
caps.avx2 = Common::Bit<5>(cpu_id[1]);
caps.avx512f = Common::Bit<16>(cpu_id[1]);
caps.avx512dq = Common::Bit<17>(cpu_id[1]);
caps.avx512cd = Common::Bit<28>(cpu_id[1]);
caps.avx512bw = Common::Bit<30>(cpu_id[1]);
caps.avx512vl = Common::Bit<31>(cpu_id[1]);
caps.avx512vbmi = Common::Bit<1>(cpu_id[2]);
caps.avx512bitalg = Common::Bit<12>(cpu_id[2]);
}
caps.bmi1 = Common::Bit<3>(cpu_id[1]); caps.bmi1 = Common::Bit<3>(cpu_id[1]);
caps.bmi2 = Common::Bit<8>(cpu_id[1]); caps.bmi2 = Common::Bit<8>(cpu_id[1]);
// Checks for AVX512F, AVX512CD, AVX512VL, AVX512DQ, AVX512BW (Intel Skylake-X/SP) caps.sha = Common::Bit<29>(cpu_id[1]);
if (Common::Bit<16>(cpu_id[1]) && Common::Bit<28>(cpu_id[1]) &&
Common::Bit<31>(cpu_id[1]) && Common::Bit<17>(cpu_id[1]) && caps.gfni = Common::Bit<8>(cpu_id[2]);
Common::Bit<30>(cpu_id[1])) {
caps.avx512 = caps.avx2; __cpuidex(cpu_id, 0x00000007, 0x00000001);
} caps.avx_vnni = caps.avx && Common::Bit<4>(cpu_id[0]);
} }
} }

21
src/common/x64/cpu_detect.h
View File

@ -35,16 +35,31 @@ struct CPUCaps {
bool ssse3 : 1; bool ssse3 : 1;
bool sse4_1 : 1; bool sse4_1 : 1;
bool sse4_2 : 1; bool sse4_2 : 1;
bool lzcnt : 1;
bool avx : 1; bool avx : 1;
bool avx_vnni : 1;
bool avx2 : 1; bool avx2 : 1;
bool avx512 : 1; bool avx512f : 1;
bool avx512dq : 1;
bool avx512cd : 1;
bool avx512bw : 1;
bool avx512vl : 1;
bool avx512vbmi : 1;
bool avx512bitalg : 1;
bool aes : 1;
bool bmi1 : 1; bool bmi1 : 1;
bool bmi2 : 1; bool bmi2 : 1;
bool f16c : 1;
bool fma : 1; bool fma : 1;
bool fma4 : 1; bool fma4 : 1;
bool aes : 1; bool gfni : 1;
bool invariant_tsc : 1; bool invariant_tsc : 1;
bool lzcnt : 1;
bool movbe : 1;
bool pclmulqdq : 1;
bool popcnt : 1;
bool sha : 1;
}; };
/** /**

4
src/yuzu/main.cpp
View File

@ -249,9 +249,9 @@ GMainWindow::GMainWindow()
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
const auto& caps = Common::GetCPUCaps(); const auto& caps = Common::GetCPUCaps();
std::string cpu_string = caps.cpu_string; std::string cpu_string = caps.cpu_string;
if (caps.avx || caps.avx2 || caps.avx512) { if (caps.avx || caps.avx2 || caps.avx512f) {
cpu_string += " | AVX"; cpu_string += " | AVX";
if (caps.avx512) { if (caps.avx512f) {
cpu_string += "512"; cpu_string += "512";
} else if (caps.avx2) { } else if (caps.avx2) {
cpu_string += '2'; cpu_string += '2';