Address a few review comments

  - Use spirv32/spirv64 as default triple arch
  - clean up a number of comments
  - Fix file ordering inclusion to be alphabetical

Author: mdtoguchi

clang/lib/Driver/CMakeLists.txt

@@ -77,6 +77,7 @@ add_clang_library(clangDriver
   ToolChains/RISCVToolchain.cpp
   ToolChains/Solaris.cpp
   ToolChains/SPIRV.cpp
+  ToolChains/SYCL.cpp
   ToolChains/TCE.cpp
   ToolChains/VEToolchain.cpp
   ToolChains/WebAssembly.cpp
@@ -85,7 +86,6 @@ add_clang_library(clangDriver
   ToolChains/PPCFreeBSD.cpp
   ToolChains/InterfaceStubs.cpp
   ToolChains/ZOS.cpp
-  ToolChains/SYCL.cpp
   Types.cpp
   XRayArgs.cpp
 

clang/lib/Driver/Driver.cpp

@@ -769,9 +769,10 @@ Driver::OpenMPRuntimeKind Driver::getOpenMPRuntime(const ArgList &Args) const {
 }
 
 static const char *getDefaultSYCLArch(Compilation &C) {
+  // If -fsycl is supplied we will assume SPIR-V
   if (C.getDefaultToolChain().getTriple().getArch() == llvm::Triple::x86)
-    return "spir";
-  return "spir64";
+    return "spirv32";
+  return "spirv64";
 }
 
 static bool addSYCLDefaultTriple(Compilation &C,
@@ -1004,7 +1005,6 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   // SYCL
   //
   // We need to generate a SYCL toolchain if the user specified -fsycl.
-  // If -fsycl is supplied we will assume SPIR-V.
   bool IsSYCL =
       C.getInputArgs().hasFlag(options::OPT_fsycl, options::OPT_fno_sycl,
                                false);
@@ -1023,7 +1023,6 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
 
   llvm::SmallVector<llvm::Triple, 4> UniqueSYCLTriplesVec;
 
-  // If -fsycl is supplied we will assume SPIR-V.
   if (IsSYCL) {
     addSYCLDefaultTriple(C, UniqueSYCLTriplesVec);
 
@@ -6635,7 +6634,6 @@ const ToolChain &Driver::getOffloadingDeviceToolChain(
       break;
     }
     case Action::OFK_SYCL:
-      // TODO: Add additional Arch values for Ahead of Time support for SYCL.
       switch (Target.getArch()) {
       case llvm::Triple::spir:
       case llvm::Triple::spir64:

clang/test/Driver/sycl-offload-jit.cpp

@@ -6,9 +6,6 @@
 // RUN: %clang -ccc-print-phases --target=x86_64-unknown-linux-gnu \
 // RUN:   -fsycl %s 2>&1 \
 // RUN: | FileCheck -check-prefixes=CHK-PHASES %s
-// RUN: %clang -ccc-print-phases --target=x86_64-unknown-linux-gnu -fsycl \
-// RUN:   %s 2>&1 \
-// RUN: | FileCheck -check-prefixes=CHK-PHASES %s
 // RUN: %clang_cl -ccc-print-phases --target=x86_64-pc-windows-msvc -fsycl \
 // RUN:   %s 2>&1 \
 // RUN: | FileCheck -check-prefixes=CHK-PHASES %s
@@ -19,7 +16,7 @@
 // CHK-PHASES: 4: preprocessor, {3}, c++-cpp-output, (device-sycl)
 // CHK-PHASES: 5: compiler, {4}, ir, (device-sycl)
 // CHK-PHASES: 6: backend, {5}, ir, (device-sycl)
-// CHK-PHASES: 7: offload, "device-sycl (spir64-unknown-unknown)" {6}, ir
+// CHK-PHASES: 7: offload, "device-sycl (spirv64-unknown-unknown)" {6}, ir
 // CHK-PHASES: 8: clang-offload-packager, {7}, image, (device-sycl)
 // CHK-PHASES: 9: offload, "host-sycl (x86_64{{.*}})" {2}, "device-sycl (x86_64{{.*}})" {8}, ir
 // CHK-PHASES: 10: backend, {9}, assembler, (host-sycl)
@@ -30,11 +27,11 @@
 /// well as clang-offload-packager inputs.
 // RUN: %clang -### -fsycl -c --target=x86_64-unknown-linux-gnu %s 2>&1 \
 // RUN: | FileCheck -check-prefix=CHK-DEVICE-TRIPLE %s
-// CHK-DEVICE-TRIPLE: clang{{.*}} "-triple" "spir64-unknown-unknown"
+// CHK-DEVICE-TRIPLE: clang{{.*}} "-triple" "spirv64-unknown-unknown"
 // CHK-DEVICE-TRIPLE-SAME: "-aux-triple" "x86_64-unknown-linux-gnu"
 // CHK-DEVICE-TRIPLE-SAME: "-fsycl-is-device"
 // CHK-DEVICE-TRIPLE-SAME: "-O2"
-// CHK-DEVICE-TRIPLE: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spir64-unknown-unknown,arch=,kind=sycl"
+// CHK-DEVICE-TRIPLE: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spirv64-unknown-unknown,arch=,kind=sycl"
 
 /// Check -fsycl-is-device is passed when compiling for the device.
 /// Check -fsycl-is-host is passed when compiling for host.

llvm/include/llvm/TargetParser/Triple.h

@@ -831,11 +831,7 @@ class Triple {
            getArch() == Triple::spirv;
   }
 
-  // Tests whether the target is SPIR-V or SPIR. Currently, we use spir-based
-  // target triples to represent JIT compilation targets for SYCL. We will
-  // transition to using spir-v based target triples to represent JIT
-  // compilation targets for SYCL very soon. This helper function is used
-  // (instead of isSPIR) to ease that transition.
+  // Tests whether the target is SPIR-V or SPIR.
   bool isSPIROrSPIRV() const { return isSPIR() || isSPIRV(); }
 
   /// Tests whether the target is SPIR-V Logical