Address review comments

Author: jzc

clang/include/clang/Basic/OffloadArch.h

@@ -101,10 +101,6 @@ enum class OffloadArch {
   AMDGCNSPIRV,
   Generic, // A processor model named 'generic' if the target backend defines a
            // public one.
-  // Intel CPUs
-  GRANITERAPIDS,
-  // Intel GPUs
-  BMG_G21,
   LAST,
 
   CudaDefault = OffloadArch::SM_52,
@@ -120,22 +116,11 @@ static inline bool IsAMDOffloadArch(OffloadArch A) {
   return A >= OffloadArch::GFX600 && A < OffloadArch::Generic;
 }
 
-static inline bool IsIntelCPUArch(OffloadArch Arch) {
-  return Arch >= OffloadArch::GRANITERAPIDS && Arch < OffloadArch::BMG_G21;
-}
-
-static inline bool IsIntelGPUArch(OffloadArch Arch) {
-  return Arch >= OffloadArch::BMG_G21 && Arch < OffloadArch::LAST;
-}
-
-static inline bool IsIntelOffloadArch(OffloadArch Arch) {
-  return IsIntelCPUArch(Arch) || IsIntelGPUArch(Arch);
-}
-
 const char *OffloadArchToString(OffloadArch A);
 const char *OffloadArchToVirtualArchString(OffloadArch A);
 
-// The input should have the form "sm_20".
+// Convert a string to an OffloadArch enum value. Returns
+// OffloadArch::UNKNOWN if the string is not recognized.
 OffloadArch StringToOffloadArch(llvm::StringRef S);
 
 } // namespace clang

clang/lib/Basic/OffloadArch.cpp

@@ -89,19 +89,12 @@ static const OffloadArchToStringMap arch_names[] = {
     GFX(1200), // gfx1200
     GFX(1201), // gfx1201
     {OffloadArch::AMDGCNSPIRV, "amdgcnspirv", "compute_amdgcn"},
-    // Note: this is an initial list of Intel GPU and GPU offloading architectures.
-    // The list will be expanded later as support for more architectures is added.
-    // Intel CPUs
-    {OffloadArch::GRANITERAPIDS, "graniterapids", ""},
-    // Intel GPUS
-    {OffloadArch::BMG_G21, "bmg_g21", ""},
     {OffloadArch::Generic, "generic", ""},
     // clang-format on
 };
 #undef SM
 #undef SM2
 #undef GFX
-#undef INTEL
 
 const char *OffloadArchToString(OffloadArch A) {
   auto result = std::find_if(

clang/lib/Basic/Targets/NVPTX.cpp

@@ -241,8 +241,6 @@ void NVPTXTargetInfo::getTargetDefines(const LangOptions &Opts,
       case OffloadArch::GFX1201:
       case OffloadArch::AMDGCNSPIRV:
       case OffloadArch::Generic:
-      case OffloadArch::GRANITERAPIDS:
-      case OffloadArch::BMG_G21:
       case OffloadArch::LAST:
         break;
       case OffloadArch::UNKNOWN:

clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp

@@ -2335,8 +2335,6 @@ void CGOpenMPRuntimeGPU::processRequiresDirective(const OMPRequiresDecl *D) {
       case OffloadArch::GFX1201:
       case OffloadArch::AMDGCNSPIRV:
       case OffloadArch::Generic:
-      case OffloadArch::GRANITERAPIDS:
-      case OffloadArch::BMG_G21:
       case OffloadArch::UNUSED:
       case OffloadArch::UNKNOWN:
         break;

clang/unittests/Basic/CMakeLists.txt

@@ -5,7 +5,6 @@ add_clang_unittest(BasicTests
   FileEntryTest.cpp
   FileManagerTest.cpp
   LineOffsetMappingTest.cpp
-  OffloadArchTest.cpp
   SanitizersTest.cpp
   SarifTest.cpp
   SourceManagerTest.cpp