Skip to content

Commit 9b52b6c

Browse files
xddxdNekotekina
authored andcommitted
Clean up and improve Zen CPU detection
1 parent bc7b2ed commit 9b52b6c

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

lib/Support/Host.cpp

+5-11
Original file line numberDiff line numberDiff line change
@@ -1025,17 +1025,14 @@ getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
10251025
*Type = X86::AMD_BTVER2;
10261026
break;
10271027
case 23:
1028-
CPU = "znver1";
10291028
*Type = X86::AMDFAM17H;
1030-
if ((Model >= 0x30 && Model <= 0x3f) || Model == 0x71) {
1029+
if (Model >= 0x30) {
10311030
CPU = "znver2";
10321031
*Subtype = X86::AMDFAM17H_ZNVER2;
1033-
break; // 30h-3fh, 71h: Zen2
1034-
}
1035-
if (Model <= 0x0f) {
1036-
*Subtype = X86::AMDFAM17H_ZNVER1;
1037-
break; // 00h-0Fh: Zen1
1032+
break; // >30h: Zen2
10381033
}
1034+
CPU = "znver1";
1035+
*Subtype = X86::AMDFAM17H_ZNVER1;
10391036
break;
10401037
case 25:
10411038
if (testFeature(X86::FEATURE_AVX512VBMI2)) {
@@ -1046,10 +1043,7 @@ getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
10461043
}
10471044
CPU = "znver3";
10481045
*Type = X86::AMDFAM19H;
1049-
if (Model <= 0x0f || Model == 0x21) {
1050-
*Subtype = X86::AMDFAM19H_ZNVER3;
1051-
break; // 00h-0Fh: Zen3
1052-
}
1046+
*Subtype = X86::AMDFAM19H_ZNVER3;
10531047
break;
10541048
default:
10551049
break; // Unknown AMD CPU.

0 commit comments

Comments
 (0)