From 199d299ce5291a5740a567f0f91784d9c754215a Mon Sep 17 00:00:00 2001 From: Mykola Hohsadze Date: Tue, 5 Sep 2023 15:13:27 +0300 Subject: [PATCH] Add ZEN4 Phoenix detection (#328) --- src/impl_x86__base_implementation.inl | 1 + test/cpuinfo_x86_test.cc | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/impl_x86__base_implementation.inl b/src/impl_x86__base_implementation.inl index a7faad3..e7705f3 100644 --- a/src/impl_x86__base_implementation.inl +++ b/src/impl_x86__base_implementation.inl @@ -834,6 +834,7 @@ X86Microarchitecture GetX86Microarchitecture(const X86Info* info) { return AMD_ZEN3; case CPUID(0x19, 0x10): case CPUID(0x19, 0x61): + case CPUID(0x19, 0x74): // https://en.wikichip.org/wiki/amd/microarchitectures/zen_4 return AMD_ZEN4; default: diff --git a/test/cpuinfo_x86_test.cc b/test/cpuinfo_x86_test.cc index c9469a7..00f0251 100644 --- a/test/cpuinfo_x86_test.cc +++ b/test/cpuinfo_x86_test.cc @@ -909,6 +909,21 @@ TEST_F(CpuidX86Test, AMD_K19_ZEN4_RAPHAEL) { EXPECT_EQ(GetX86Microarchitecture(&info), X86Microarchitecture::AMD_ZEN4); } +// http://users.atw.hu/instlatx64/AuthenticAMD/AuthenticAMD0A70F41_K19_Phoenix_03_CPUID.txt +TEST_F(CpuidX86Test, AMD_K19_ZEN4_PHOENIX) { + cpu().SetLeaves({ + {{0x00000000, 0}, Leaf{0x00000010, 0x68747541, 0x444D4163, 0x69746E65}}, + {{0x00000001, 0}, Leaf{0x00A70F41, 0x00100800, 0x7EF8320B, 0x178BFBFF}}, + {{0x80000000, 0}, Leaf{0x80000028, 0x68747541, 0x444D4163, 0x69746E65}}, + {{0x80000001, 0}, Leaf{0x00A70F41, 0x50000000, 0x75C237FF, 0x2FD3FBFF}}, + }); + const auto info = GetX86Info(); + + EXPECT_STREQ(info.vendor, CPU_FEATURES_VENDOR_AUTHENTIC_AMD); + EXPECT_EQ(info.family, 0x19); + EXPECT_EQ(info.model, 0x74); +} + // http://users.atw.hu/instlatx64/HygonGenuine/HygonGenuine0900F11_Hygon_01_CPUID.txt TEST_F(CpuidX86Test, AMD_K18_ZEN_DHYANA_OCTAL_CORE_C86_3250) { cpu().SetLeaves({