Skip to content

Commit ff75bf6

Browse files
committed
[X86] Add AMD Matisse (znver2) model number to getHostCPUName and compiler-rt's getAMDProcessorTypeAndSubtype.
This is the CPUID model used on Ryzen 3000 series (Zen 2/Matisse) CPUs. Patch by Alex James Differential Revision: https://reviews.llvm.org/D70279
1 parent d4e1ba3 commit ff75bf6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler-rt/lib/builtins/cpu_model.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,9 @@ static void getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
471471
break; // "btver2"
472472
case 23:
473473
*Type = AMDFAM17H;
474-
if (Model >= 0x30 && Model <= 0x3f) {
474+
if ((Model >= 0x30 && Model <= 0x3f) || Model == 0x71) {
475475
*Subtype = AMDFAM17H_ZNVER2;
476-
break; // "znver2"; 30h-3fh: Zen2
476+
break; // "znver2"; 30h-3fh, 71h: Zen2
477477
}
478478
if (Model <= 0x0f) {
479479
*Subtype = AMDFAM17H_ZNVER1;

llvm/lib/Support/Host.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,9 +959,9 @@ static void getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
959959
break; // "btver2"
960960
case 23:
961961
*Type = X86::AMDFAM17H;
962-
if (Model >= 0x30 && Model <= 0x3f) {
962+
if ((Model >= 0x30 && Model <= 0x3f) || Model == 0x71) {
963963
*Subtype = X86::AMDFAM17H_ZNVER2;
964-
break; // "znver2"; 30h-3fh: Zen2
964+
break; // "znver2"; 30h-3fh, 71h: Zen2
965965
}
966966
if (Model <= 0x0f) {
967967
*Subtype = X86::AMDFAM17H_ZNVER1;

0 commit comments

Comments
 (0)