Refactor sycl offload (#19464)

Co-authored-by: Michael D Toguchi <[email protected]>

Author: 2 people

clang/include/clang/Basic/OffloadArch.h

@@ -11,6 +11,7 @@
 
 namespace llvm {
 class StringRef;
+template <typename T, typename R> class StringSwitch;
 } // namespace llvm
 
 namespace clang {
@@ -103,9 +104,62 @@ enum class OffloadArch {
   Generic, // A processor model named 'generic' if the target backend defines a
            // public one.
   // Intel CPUs
+  SKYLAKEAVX512,
+  COREAVX2,
+  COREI7AVX,
+  COREI7,
+  WESTMERE,
+  SANDYBRIDGE,
+  IVYBRIDGE,
+  BROADWELL,
+  COFFEELAKE,
+  ALDERLAKE,
+  SKYLAKE,
+  SKX,
+  CASCADELAKE,
+  ICELAKECLIENT,
+  ICELAKESERVER,
+  SAPPHIRERAPIDS,
   GRANITERAPIDS,
   // Intel GPUs
+  BDW,
+  SKL,
+  KBL,
+  CFL,
+  APL,
+  BXT,
+  GLK,
+  WHL,
+  AML,
+  CML,
+  ICLLP,
+  ICL,
+  EHL,
+  JSL,
+  TGLLP,
+  TGL,
+  RKL,
+  ADL_S,
+  RPL_S,
+  ADL_P,
+  ADL_N,
+  DG1,
+  ACM_G10,
+  DG2_G10,
+  ACM_G11,
+  DG2_G11,
+  ACM_G12,
+  DG2_G12,
+  PVC,
+  PVC_VG,
+  MTL_U,
+  MTL_S,
+  ARL_U,
+  ARL_S,
+  MTL_H,
+  ARL_H,
   BMG_G21,
+  LNL_M,
   LAST,
 
   CudaDefault = OffloadArch::SM_52,
@@ -122,17 +176,41 @@ static inline bool IsAMDOffloadArch(OffloadArch A) {
 }
 
 static inline bool IsIntelCPUOffloadArch(OffloadArch Arch) {
-  return Arch >= OffloadArch::GRANITERAPIDS && Arch < OffloadArch::BMG_G21;
+  return Arch >= OffloadArch::SKYLAKEAVX512 &&
+         Arch <= OffloadArch::GRANITERAPIDS;
 }
 
 static inline bool IsIntelGPUOffloadArch(OffloadArch Arch) {
-  return Arch >= OffloadArch::BMG_G21 && Arch < OffloadArch::LAST;
+  return Arch >= OffloadArch::BDW && Arch < OffloadArch::LAST;
 }
 
 static inline bool IsIntelOffloadArch(OffloadArch Arch) {
   return IsIntelCPUOffloadArch(Arch) || IsIntelGPUOffloadArch(Arch);
 }
 
+// Check if the given Arch value is a Generic AMD GPU.
+// Currently GFX*_GENERIC AMD GPUs do not support SYCL offloading.
+// This list is used to filter out GFX*_GENERIC AMD GPUs in
+// `IsSYCLSupportedAMDGPUArch`.
+static inline bool IsAMDGenericGPUArch(OffloadArch Arch) {
+  return Arch == OffloadArch::GFX9_GENERIC ||
+         Arch == OffloadArch::GFX10_1_GENERIC ||
+         Arch == OffloadArch::GFX10_3_GENERIC ||
+         Arch == OffloadArch::GFX11_GENERIC ||
+         Arch == OffloadArch::GFX12_GENERIC;
+}
+
+// Check if the given Arch value is a valid SYCL supported AMD GPU.
+static inline bool IsSYCLSupportedAMDGPUArch(OffloadArch Arch) {
+  return Arch >= OffloadArch::GFX700 && Arch < OffloadArch::AMDGCNSPIRV &&
+         !IsAMDGenericGPUArch(Arch);
+}
+
+// Check if the given Arch value is a valid SYCL supported NVidia GPU.
+static inline bool IsSYCLSupportedNVidiaGPUArch(OffloadArch Arch) {
+  return Arch >= OffloadArch::SM_50 && Arch <= OffloadArch::SM_90a;
+}
+
 const char *OffloadArchToString(OffloadArch A);
 const char *OffloadArchToVirtualArchString(OffloadArch A);
 

clang/lib/Basic/OffloadArch.cpp

@@ -89,9 +89,62 @@ static const OffloadArchToStringMap ArchNames[] = {
     GFX(1250), // gfx1250
     {OffloadArch::AMDGCNSPIRV, "amdgcnspirv", "compute_amdgcn"},
     // Intel CPUs
+    {OffloadArch::SKYLAKEAVX512, "skylake-avx512", ""},
+    {OffloadArch::COREAVX2, "core-avx2", ""},
+    {OffloadArch::COREI7AVX, "corei7-avx", ""},
+    {OffloadArch::COREI7, "corei7", ""},
+    {OffloadArch::WESTMERE, "westmere", ""},
+    {OffloadArch::SANDYBRIDGE, "sandybridge", ""},
+    {OffloadArch::IVYBRIDGE, "ivybridge", ""},
+    {OffloadArch::BROADWELL, "broadwell", ""},
+    {OffloadArch::COFFEELAKE, "coffeelake", ""},
+    {OffloadArch::ALDERLAKE, "alderlake", ""},
+    {OffloadArch::SKYLAKE, "skylake", ""},
+    {OffloadArch::SKX, "skx", ""},
+    {OffloadArch::CASCADELAKE, "cascadelake", ""},
+    {OffloadArch::ICELAKECLIENT, "icelake-client", ""},
+    {OffloadArch::ICELAKESERVER, "icelake-server", ""},
+    {OffloadArch::SAPPHIRERAPIDS, "sapphirerapids", ""},
     {OffloadArch::GRANITERAPIDS, "graniterapids", ""},
     // Intel GPUS
+    {OffloadArch::BDW, "bdw", ""},
+    {OffloadArch::SKL, "skl", ""},
+    {OffloadArch::KBL, "kbl", ""},
+    {OffloadArch::CFL, "cfl", ""},
+    {OffloadArch::APL, "apl", ""},
+    {OffloadArch::BXT, "bxt", ""},
+    {OffloadArch::GLK, "glk", ""},
+    {OffloadArch::WHL, "whl", ""},
+    {OffloadArch::AML, "aml", ""},
+    {OffloadArch::CML, "cml", ""},
+    {OffloadArch::ICLLP, "icllp", ""},
+    {OffloadArch::ICL, "icl", ""},
+    {OffloadArch::EHL, "ehl", ""},
+    {OffloadArch::JSL, "jsl", ""},
+    {OffloadArch::TGLLP, "tgllp", ""},
+    {OffloadArch::TGL, "tgl", ""},
+    {OffloadArch::RKL, "rkl", ""},
+    {OffloadArch::ADL_S, "adl_s", ""},
+    {OffloadArch::RPL_S, "rpl_s", ""},
+    {OffloadArch::ADL_P, "adl_p", ""},
+    {OffloadArch::ADL_N, "adl_n", ""},
+    {OffloadArch::DG1, "dg1", ""},
+    {OffloadArch::ACM_G10, "acm_g10", ""},
+    {OffloadArch::DG2_G10, "dg2_g10", ""},
+    {OffloadArch::ACM_G11, "acm_g11", ""},
+    {OffloadArch::DG2_G11, "dg2_g11", ""},
+    {OffloadArch::ACM_G12, "acm_g12", ""},
+    {OffloadArch::DG2_G12, "dg2_g12", ""},
+    {OffloadArch::PVC, "pvc", ""},
+    {OffloadArch::PVC_VG, "pvc_vg", ""},
+    {OffloadArch::MTL_U, "mtl_u", ""},
+    {OffloadArch::MTL_S, "mtl_s", ""},
+    {OffloadArch::ARL_U, "arl_u", ""},
+    {OffloadArch::ARL_S, "arl_s", ""},
+    {OffloadArch::MTL_H, "mtl_h", ""},
+    {OffloadArch::ARL_H, "arl_h", ""},
     {OffloadArch::BMG_G21, "bmg_g21", ""},
+    {OffloadArch::LNL_M, "lnl_m", ""},
     {OffloadArch::Generic, "generic", ""},
     // clang-format on
 };