Skip to content

[X86][compiler-rt] Split CPU names even they have the same subtype #118237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions compiler-rt/lib/builtins/cpu_model/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,16 +461,31 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,
// Alderlake:
case 0x97:
case 0x9a:
CPU = "alderlake";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ALDERLAKE;
break;

// Raptorlake:
case 0xb7:
case 0xba:
case 0xbf:
CPU = "raptorlake";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ALDERLAKE;
break;

// Meteorlake:
case 0xaa:
case 0xac:
CPU = "meteorlake";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ALDERLAKE;
break;

// Gracemont:
case 0xbe:
CPU = "alderlake";
CPU = "gracement";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ALDERLAKE;
break;
Expand All @@ -486,9 +501,14 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,

// Arrowlake S:
case 0xc6:
CPU = "arrowlake-s";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ARROWLAKE_S;
break;

// Lunarlake:
case 0xbd:
CPU = "arrowlake-s";
CPU = "lunarlake";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_ARROWLAKE_S;
break;
Expand All @@ -510,6 +530,11 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,

// Emerald Rapids:
case 0xcf:
CPU = "emeraldrapids";
*Type = INTEL_COREI7;
*Subtype = INTEL_COREI7_SAPPHIRERAPIDS;
break;

// Sapphire Rapids:
case 0x8f:
CPU = "sapphirerapids";
Expand Down
29 changes: 27 additions & 2 deletions llvm/lib/TargetParser/Host.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -808,16 +808,31 @@ static StringRef getIntelProcessorTypeAndSubtype(unsigned Family,
// Alderlake:
case 0x97:
case 0x9a:
CPU = "alderlake";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ALDERLAKE;
break;

// Gracemont
case 0xbe:
CPU = "gracement";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ALDERLAKE;
break;

// Raptorlake:
case 0xb7:
case 0xba:
case 0xbf:
CPU = "raptorlake";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ALDERLAKE;
break;

// Meteorlake:
case 0xaa:
case 0xac:
CPU = "alderlake";
CPU = "meteorlake";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ALDERLAKE;
break;
Expand All @@ -833,9 +848,14 @@ static StringRef getIntelProcessorTypeAndSubtype(unsigned Family,

// Arrowlake S:
case 0xc6:
CPU = "arrowlake-s";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ARROWLAKE_S;
break;

// Lunarlake:
case 0xbd:
CPU = "arrowlake-s";
CPU = "lunarlake";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_ARROWLAKE_S;
break;
Expand Down Expand Up @@ -871,6 +891,11 @@ static StringRef getIntelProcessorTypeAndSubtype(unsigned Family,

// Emerald Rapids:
case 0xcf:
CPU = "emeraldrapids";
*Type = X86::INTEL_COREI7;
*Subtype = X86::INTEL_COREI7_SAPPHIRERAPIDS;
break;

// Sapphire Rapids:
case 0x8f:
CPU = "sapphirerapids";
Expand Down