From f1e1ad58e799c0ab4f309a3cdf5cd3bc7b97278c Mon Sep 17 00:00:00 2001 From: Xorg Date: Tue, 20 Mar 2018 19:52:40 +0100 Subject: [PATCH] DB: Add Raven Ridge APUs and Threadripper CPUs --- libcpuid/recog_amd.c | 32 ++++++++++++++++++++++++++------ tests/amd/zen/ryzen7.test | 2 +- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index 3867aa8..e8573a1 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -49,6 +49,10 @@ enum _amd_model_codes_t { _1400, _1500, _1600, + _1900, + _2400, + _2500, + _2700, }; @@ -270,12 +274,24 @@ const struct match_entry_t cpudb_amd[] = { { 15, 0, -1, 22, 48, 4, -1, -1, FUSION_A, 0 , 0, "Mullins X4" }, /* Family 17h: Zen Architecture (2017) */ - { 15, -1, -1, 23, 1, 8, -1, -1, NC, 0 , 0, "Ryzen 7" }, - { 15, -1, -1, 23, 1, 6, -1, -1, NC, 0 , _1600, "Ryzen 5" }, - { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , _1500, "Ryzen 5" }, - { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , _1400, "Ryzen 5" }, - { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , 0, "Ryzen 3" }, - //{ 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , 0, "Raven Ridge" }, //TBA + { 15, -1, -1, 23, 1, 16, -1, -1, NC, 0 , 0, "Threadripper (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 12, -1, -1, NC, 0 , 0, "Threadripper (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 8, -1, -1, NC, 0 , _1900, "Threadripper (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 8, -1, -1, NC, 0 , 0, "Ryzen 7 (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 6, -1, -1, NC, 0 , _1600, "Ryzen 5 (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , _1500, "Ryzen 5 (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , _1400, "Ryzen 5 (Summit Ridge)" }, + { 15, -1, -1, 23, 1, 4, -1, -1, NC, 0 , 0, "Ryzen 3 (Summit Ridge)" }, + /* APUs */ + { 15, -1, -1, 23, 17, 4, -1, -1, NC, 0 , _2700, "Ryzen 7 (Raven Ridge)" }, + { 15, -1, -1, 23, 17, 4, -1, -1, NC, 0 , _2500, "Ryzen 5 (Raven Ridge)" }, + { 15, -1, -1, 23, 17, 4, -1, -1, NC, 0 , _2400, "Ryzen 5 (Raven Ridge)" }, + { 15, -1, -1, 23, 17, 4, -1, -1, NC, 0 , 0, "Ryzen 3 (Raven Ridge)" }, + { 15, -1, -1, 23, 17, 2, -1, -1, NC, 0 , 0, "Ryzen 3 (Raven Ridge)" }, + /* 2nd-gen, Zen+ (2018): TBA */ + //{ 15, -1, -1, ??, ??, 8, -1, -1, NC, 0 , 0, "Ryzen 7 (???)" }, + //{ 15, -1, -1, ??, ??, 6, -1, -1, NC, 0 , 0, "Ryzen 5 (???)" }, + /* Newer Opterons: */ { 15, 9, -1, 22, 9, 8, -1, -1, NC, OPTERON_ , 0, "Magny-Cours Opteron" }, @@ -467,6 +483,10 @@ static int decode_amd_ryzen_model_code(const char* bs) int model_code; const char* match_str; } patterns[] = { + { _2700, "2700" }, + { _2500, "2500" }, + { _2400, "2400" }, + { _1900, "1900" }, { _1600, "1600" }, { _1500, "1500" }, { _1400, "1400" }, diff --git a/tests/amd/zen/ryzen7.test b/tests/amd/zen/ryzen7.test index a45be1b..6a17329 100644 --- a/tests/amd/zen/ryzen7.test +++ b/tests/amd/zen/ryzen7.test @@ -92,5 +92,5 @@ intel_fn11[3]=00000000 00000000 00000000 00000000 64 -1 128 (authoritative) -Ryzen 7 +Ryzen 7 (Summit Ridge) fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni pclmul monitor ssse3 cx16 sse4_1 sse4_2 syscall movbe popcnt aes xsave osxsave avx mmxext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw skinit wdt ts ttp tm_amd hwpstate constant_tsc fma3 f16c rdrand aperfmperf avx2 bmi1 bmi2