Reviewer suggestions

mikolaj-pirog · mikolaj-pirog · commit 67841d20f3cc · 2025-10-14T17:00:13.000+02:00
diff --git a/compiler-rt/lib/builtins/cpu_model/x86.c b/compiler-rt/lib/builtins/cpu_model/x86.c
@@ -104,7 +104,6 @@ enum ProcessorSubtypes {
   INTEL_COREI7_PANTHERLAKE,
   AMDFAM1AH_ZNVER5,
   INTEL_COREI7_DIAMONDRAPIDS,
-  INTEL_COREI7_WILDCATLAKE,
   CPU_SUBTYPE_MAX
 };
 
@@ -525,7 +524,7 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,
     case 0xd5:
       CPU = "wildcatlake";
       *Type = INTEL_COREI7;
-      *Subtype = INTEL_COREI7_WILDCATLAKE;
+      *Subtype = INTEL_COREI7_PANTHERLAKE;
       break;
 
     // Icelake Xeon:
diff --git a/llvm/include/llvm/TargetParser/X86TargetParser.def b/llvm/include/llvm/TargetParser/X86TargetParser.def
@@ -108,14 +108,14 @@ X86_CPU_SUBTYPE(INTEL_COREI7_ARROWLAKE_S,    "arrowlake-s")
 X86_CPU_SUBTYPE(INTEL_COREI7_PANTHERLAKE,    "pantherlake")
 X86_CPU_SUBTYPE(AMDFAM1AH_ZNVER5,            "znver5")
 X86_CPU_SUBTYPE(INTEL_COREI7_DIAMONDRAPIDS,  "diamondrapids")
-X86_CPU_SUBTYPE(INTEL_COREI7_WILDCATLAKE,    "wildcatlake")
 
 // Alternate names supported by __builtin_cpu_is and target multiversioning.
 X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_ALDERLAKE, "raptorlake")
 X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_ALDERLAKE, "meteorlake")
 X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_SAPPHIRERAPIDS, "emeraldrapids")
 X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_ARROWLAKE_S,"lunarlake")
 X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_ALDERLAKE, "gracemont")
+X86_CPU_SUBTYPE_ALIAS(INTEL_COREI7_PANTHERLAKE, "wildcatlake")
 
 #undef X86_CPU_SUBTYPE_ALIAS
 #undef X86_CPU_SUBTYPE
diff --git a/llvm/lib/Target/X86/X86.td b/llvm/lib/Target/X86/X86.td
@@ -1338,9 +1338,6 @@ def ProcessorFeatures {
   list<SubtargetFeature> PTLFeatures =
     !listremove(ARLSFeatures, [FeatureWIDEKL]);
 
-  // Wildcatlake
-  list<SubtargetFeature> WCLFeatures = PTLFeatures;
-
   // Clearwaterforest
   list<SubtargetFeature> CWFAdditionalFeatures = [FeaturePREFETCHI,
                                                   FeatureAVXVNNIINT16,
diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
@@ -968,7 +968,7 @@ static StringRef getIntelProcessorTypeAndSubtype(unsigned Family,
     case 0xd5:
       CPU = "wildcatlake";
       *Type = X86::INTEL_COREI7;
-      *Subtype = X86::INTEL_COREI7_WILDCATLAKE;
+      *Subtype = X86::INTEL_COREI7_PANTHERLAKE;
       break;
 
     // Graniterapids:
