Add offload-arch support for SYCL.

Author: srividya-sundaram

clang/lib/Driver/Driver.cpp

@@ -1185,6 +1185,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   llvm::StringMap<llvm::DenseSet<StringRef>> DerivedArchs;
   llvm::StringMap<StringRef> FoundNormalizedTriples;
   llvm::SmallVector<llvm::Triple, 4> UniqueSYCLTriplesVec;
+  // StringSet to contain SYCL target triples.
   llvm::StringSet<> SYCLTriples;
   if (HasSYCLTargetsOption) {
     // At this point, we know we have a valid combination
@@ -1299,7 +1300,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   else if (HasValidSYCLRuntime &&
            C.getInputArgs().hasArg(options::OPT_offload_arch_EQ) && !IsHIP &&
            !IsCuda) {
-      // SYCL offloading to Intel CPUs and Intel GPUs with ``--offload-arch``
+      // SYCL offloading to AOT Targets with ``--offload-arch``
       // is currently enabled only with ``--offload-new-driver`` option.
       // Emit a diagnostic if ``--offload-arch`` is invoked without
       // ``--offload-new driver`` option.
@@ -1371,8 +1372,6 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
       llvm::Triple SYCLTargetTriple(MakeSYCLDeviceTriple(Val.getKey()));
       std::string NormalizedName = SYCLTargetTriple.normalize();
 
-
-
       // Make sure we don't have a duplicate triple.
       auto Duplicate = FoundNormalizedTriples.find(NormalizedName);
       if (Duplicate != FoundNormalizedTriples.end()) {

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -28,7 +28,7 @@ using namespace clang;
 using namespace llvm::opt;
 
 // Struct that relates an AOT target value with
-// Intel CPUs and GPUs.
+// Intel CPUs, Intel GPUs, AMD and NVidia GPUs.
 struct StringToOffloadArchSYCLMap {
   const char *ArchName;
   SYCLSupportedOffloadArchs IntelArch;
@@ -151,7 +151,7 @@ static const StringToOffloadArchSYCLMap StringToArchNamesMap[] = {
     {"sm_90a", SYCLSupportedOffloadArchs::SM_90A}};
 
 // Check if the user provided value for --offload-arch is a valid
-// Intel CPU or Intel GPU target.
+// SYCL supported AOT target.
 SYCLSupportedOffloadArchs
 clang::driver::StringToOffloadArchSYCL(llvm::StringRef ArchNameAsString) {
   auto result = std::find_if(

clang/lib/Driver/ToolChains/SYCL.h

@@ -147,20 +147,20 @@ IsSYCLSupportedNVidiaGPUArch(SYCLSupportedOffloadArchs Arch) {
          Arch <= SYCLSupportedOffloadArchs::SM_90A;
 }
 
-// Check if the given Arch value is a valid Intel CPU.
+// Check if the given Arch value is a valid SYCL supported Intel CPU.
 static inline bool IsSYCLSupportedIntelCPUArch(SYCLSupportedOffloadArchs Arch) {
   return Arch >= SYCLSupportedOffloadArchs::SKYLAKEAVX512 &&
          Arch < SYCLSupportedOffloadArchs::BDW;
 }
 
-// Check if the given Arch value is a valid Intel GPU.
+// Check if the given Arch value is a valid SYCL supported Intel GPU.
 static inline bool IsSYCLSupportedIntelGPUArch(SYCLSupportedOffloadArchs Arch) {
   return Arch >= SYCLSupportedOffloadArchs::BDW &&
          Arch <= SYCLSupportedOffloadArchs::LNL_M;
 }
 
 // Check if the user provided value for --offload-arch is a valid
-// Intel CPU or Intel GPU target.
+// SYCL supported AOT target.
 SYCLSupportedOffloadArchs
 StringToOffloadArchSYCL(llvm::StringRef ArchNameAsString);