[SYCL] Enable libm for spirv64 in SYCL

buildbot/configure.py

@@ -200,6 +200,16 @@ def do_configure(args, passthrough_args):
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
     ]
 
+    llvm_spirv64_runtimes = "libc"
+    runtime_targets += ";spirv64-unknown-unknown"
+    cmake_cmd.extend(
+        [
+            "-DRUNTIMES_spirv64-unknown-unknown_LLVM_ENABLE_RUNTIMES={}".format(
+                llvm_spirv64_runtimes
+            ),
+        ]
+    )
+
     if llvm_enable_runtimes:
         cmake_cmd.extend(
             [
@@ -225,19 +235,18 @@ def do_configure(args, passthrough_args):
 
     if libclc_enabled:
         for target in runtime_targets.split(";"):
-            if target == "default":
+            if target == "default" or target == "spirv64-unknown-unknown":
                 continue
             cmake_cmd.extend(
                 [
                     f"-DRUNTIMES_{target}_LLVM_ENABLE_RUNTIMES=libclc",
                 ]
             )
-        cmake_cmd.extend(
-            [
-                "-DLLVM_RUNTIME_TARGETS={}".format(runtime_targets),
-            ]
-        )
-
+    cmake_cmd.extend(
+        [
+            "-DLLVM_RUNTIME_TARGETS={}".format(runtime_targets),
+        ]
+    )
     if args.l0_headers and args.l0_loader:
         cmake_cmd.extend(
             [

clang/lib/Driver/Driver.cpp

@@ -5852,6 +5852,15 @@ class OffloadingActionBuilder final {
       SmallVector<SmallString<128>, 4> LibLocCandidates;
       SYCLInstallation.getSYCLDeviceLibPath(LibLocCandidates);
 
+      if (TC->getTriple().isSPIROrSPIRV()) {
+        SmallVector<SmallString<128>, 4> OriginalLibLocs(LibLocCandidates);
+        for (auto LibLoc : OriginalLibLocs) {
+          SmallString<128> SPIRVLibLoc(LibLoc);
+          llvm::sys::path::append(SPIRVLibLoc, "spirv64-unknown-unknown");
+          if (llvm::sys::fs::exists(SPIRVLibLoc))
+            LibLocCandidates.emplace_back(SPIRVLibLoc);
+        }
+      }
       const toolchains::SYCLToolChain &SYCLTC =
           static_cast<const toolchains::SYCLToolChain &>(*TC);
       SmallVector<ToolChain::BitCodeLibraryInfo, 8> DeviceLibraries;

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -604,7 +604,7 @@ SYCLToolChain::getDeviceLibNames(const Driver &D,
 #if defined(_WIN32)
                                              "libsycl-msvc-math",
 #endif
-                                             "libsycl-imf"};
+                                             "libsycl-imf", "libm"};
   auto addLibraries = [&](const SYCLDeviceLibsList &LibsList) {
     for (const StringRef &Lib : LibsList)
       addLibToList(Args.MakeArgString(Lib + ".bc"));
@@ -821,6 +821,9 @@ const char *SYCL::Linker::constructLLVMLinkCommand(
                       InputFilename.contains("libspirv") ||
                       InputFilename.contains("libdevice")))
         return true;
+      if ((InputFilename.compare("libm.bc") == 0) &&
+          (FileName.find("spirv64-unknown-unknown") != std::string::npos))
+        return true;
       StringRef LibSyclPrefix("libsycl-");
       if (!InputFilename.starts_with(LibSyclPrefix) ||
           !InputFilename.ends_with(LibPostfix))
@@ -1908,6 +1911,15 @@ SYCLToolChain::getDeviceLibs(
   SmallVector<SmallString<128>, 4> LibraryPaths;
   SYCLInstallation.getSYCLDeviceLibPath(LibraryPaths);
 
+  if (getTriple().isSPIROrSPIRV()) {
+    SmallVector<SmallString<128>, 4> OriginalLibraryPaths(LibraryPaths);
+    for (auto LP : OriginalLibraryPaths) {
+      SmallString<128> SPIRVLibraryPath(LP);
+      llvm::sys::path::append(SPIRVLibraryPath, "spirv64-unknown-unknown");
+      if (llvm::sys::fs::exists(SPIRVLibraryPath))
+        LibraryPaths.emplace_back(SPIRVLibraryPath);
+    }
+  }
   // Formulate all of the device libraries needed for this compilation.
   SmallVector<BitCodeLibraryInfo, 8> DeviceLibs =
       getDeviceLibNames(getDriver(), DriverArgs, getTriple());

clang/test/Driver/clang-linker-wrapper.cpp

@@ -3,9 +3,9 @@
 // -------
 // Generate .o file as linker wrapper input.
 //
-// RUN: %clang %s -fsycl -fsycl-targets=spir64-unknown-unknown -c --offload-new-driver -o %t.o
-// RUN: %clang %s -fsycl -fsycl-targets=intel_gpu_pvc -c --offload-new-driver -o %t_aot_gpu.o
-// RUN: %clang %s -fsycl -fsycl-targets=spir64_x86_64 -c --offload-new-driver -o %t_aot_cpu.o
+// RUN: %clang %s -fsycl -fsycl-targets=spir64-unknown-unknown -c --offload-new-driver --no-offloadlib -o %t.o
+// RUN: %clang %s -fsycl -fsycl-targets=intel_gpu_pvc -c --offload-new-driver --no-offloadlib -o %t_aot_gpu.o
+// RUN: %clang %s -fsycl -fsycl-targets=spir64_x86_64 -c --offload-new-driver --no-offloadlib -o %t_aot_cpu.o
 // RUN: %clang %s -fsycl -fsycl-targets=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_50 -nocudalib -fno-sycl-libspirv -c --offload-new-driver -o %t_nvptx.o
 // RUN: %clang %s -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx803 -fgpu-rdc -nogpulib -fno-sycl-libspirv -c --offload-new-driver -o %t_amdgcn.o
 // RUN: %clang %s -fsycl -fsycl-targets=native_cpu -fno-sycl-libspirv -c --offload-new-driver -o %t_native_cpu.o
@@ -105,7 +105,7 @@
 // -------
 // Generate .o file as linker wrapper input.
 //
-// RUN: %clang %s -fsycl -fsycl-targets=intel_gpu_pvc -c --offload-new-driver -o %t1.o
+// RUN: %clang %s -fsycl -fsycl-targets=intel_gpu_pvc -c --offload-new-driver --no-offloadlib -o %t1.o
 //
 // Generate .bc file as SYCL device library file.
 //
@@ -136,7 +136,7 @@
 // -------
 // Generate .o file as linker wrapper input.
 //
-// RUN: %clang %s -fsycl -fsycl-targets=spir64_x86_64 -c --offload-new-driver -o %t2.o
+// RUN: %clang %s -fsycl -fsycl-targets=spir64_x86_64 -c --offload-new-driver --no-offloadlib -o %t2.o
 //
 // Generate .bc file as SYCL device library file.
 //
@@ -251,7 +251,7 @@
 // -------
 // Generate .o file as linker wrapper input.
 //
-// RUN: %clang %s -fsycl -fsycl-targets=spir64-unknown-unknown -c --offload-new-driver -o %t5.o
+// RUN: %clang %s -fsycl -fsycl-targets=spir64-unknown-unknown -c --offload-new-driver --no-offloadlib -o %t5.o
 //
 // RUN: clang-linker-wrapper -sycl-post-link-options="SYCL_POST_LINK_OPTIONS" -llvm-spirv-options="LLVM_SPIRV_OPTIONS" "--host-triple=x86_64-unknown-linux-gnu" "--linker-path=/usr/bin/ld" "--" HOST_LINKER_FLAGS "-dynamic-linker" HOST_DYN_LIB "-o" "a.out" HOST_LIB_PATH HOST_STAT_LIB %t5.o --bitcode-library=spir64-unknown-unknown=%S/Inputs/SYCL/lib/libsycl-crt.bc -sycl-device-library-location=%S/Inputs/SYCL/lib --dry-run 2>&1 | FileCheck -check-prefix=CHK-CMDS-DEVICE-LIB-DIR %s
 // CHK-CMDS-DEVICE-LIB-DIR: spirv-to-ir-wrapper{{.*}} --llvm-spirv-opts --spirv-preserve-auxdata --spirv-target-env=SPV-IR --spirv-builtin-format=global

clang/test/Driver/sycl-allow-device-image-deps-win.cpp

@@ -6,27 +6,27 @@
 
 /// Check that /OPT:NOREF is passed to the MSVC linker when both -fsycl and
 /// -fsycl-allow-device-image-dependencies are specified.
-// RUN: %clang_cl -fsycl --offload-new-driver \
+// RUN: %clang_cl -fsycl --offload-new-driver /clang:--sysroot=%S/Inputs/SYCL \
 // RUN:          -fsycl-allow-device-image-dependencies /O2 -### -- %s 2>&1 \
 // RUN:  | FileCheck -check-prefix CHECK_OPT_NOREF %s
 // CHECK_OPT_NOREF: link.exe{{.*}} "/OPT:NOREF"
 
 /// Check that /OPT:NOREF is NOT passed when -fsycl-allow-device-image-dependencies
 /// is not set (even with -fsycl present).
-// RUN: %clang_cl -fsycl --offload-new-driver /O2 -### -- %s 2>&1 \
-// RUN:  | FileCheck -check-prefix CHECK_NO_OPT_NOREF %s
+// RUN: %clang_cl -fsycl --offload-new-driver /clang:--sysroot=%S/Inputs/SYCL \
+// RUN:  /O2 -### -- %s 2>&1 | FileCheck -check-prefix CHECK_NO_OPT_NOREF %s
 // CHECK_NO_OPT_NOREF-NOT: "/OPT:NOREF"
 
 /// Check that /OPT:NOREF is NOT passed when -fsycl is not set (even with
 /// -fsycl-allow-device-image-dependencies present).
-// RUN: %clang_cl --offload-new-driver \
+// RUN: %clang_cl --offload-new-driver /clang:--sysroot=%S/Inputs/SYCL \
 // RUN:          -fsycl-allow-device-image-dependencies /O2 -### -- %s 2>&1 \
 // RUN:  | FileCheck -check-prefix CHECK_NO_FSYCL %s
 // CHECK_NO_FSYCL-NOT: "/OPT:NOREF"
 
 /// Check that our /OPT:NOREF comes after user-specified /OPT:REF, ensuring
 /// our flag overrides the user's optimization setting for correctness.
-// RUN: %clang_cl -fsycl --offload-new-driver \
+// RUN: %clang_cl -fsycl --offload-new-driver /clang:--sysroot=%S/Inputs/SYCL \
 // RUN:          -fsycl-allow-device-image-dependencies /O2 \
 // RUN:          -### %s /link /OPT:REF 2>&1 \
 // RUN:  | FileCheck -check-prefix CHECK_OPT_ORDER %s

clang/test/Driver/sycl-device-traits-macros.cpp

@@ -8,7 +8,7 @@
 /// In this case, where no specific sycl targets are passed, the sycl
 /// targets are spir64 and the host target (e.g. x86_64). We expect two
 /// occurrences of the macro definition, one for host and one for device.
-// RUN:   %clang -fsycl --no-offload-new-driver -### %s 2>&1 \
+// RUN:   %clang -fsycl --no-offload-new-driver --no-offloadlib -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ENABLED %s
 // RUN:   %clang -fsycl --offload-new-driver --sysroot=%S/Inputs/SYCL -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ENABLED %s
@@ -18,7 +18,7 @@
 /// In this case the sycl targets are spir64, spir64_gen and the host
 /// target (e.g. x86_64). We expect three occurrences of the macro
 /// definition, one for host and one for each of the two devices.
-// RUN:   %clang -fsycl --no-offload-new-driver -fsycl-targets=spir64,spir64_gen -### %s 2>&1 \
+// RUN:   %clang -fsycl --no-offload-new-driver --no-offloadlib -fsycl-targets=spir64,spir64_gen -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-SYCL-TARGETS %s
 // RUN:   %clang -fsycl --offload-new-driver --sysroot=%S/Inputs/SYCL -fsycl-targets=spir64,spir64_gen -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-SYCL-TARGETS %s
@@ -35,11 +35,11 @@
 
 /// Check device traits macros are defined if sycl is enabled:
 /// Verify that when compiling for multiple targets and maySupportOtherAspects
-/// is false for all of the targets, the driver will never add the
+/// is false for all of the targets, the driver --no-offloadlib will never add the
 /// __SYCL_ANY_DEVICE_HAS_ANY_ASPECT__ macro to the compilation arguments.
 /// NOTE: Both intel_gpu_pvc and amd_gpu_gfx906 have non-empty aspects lists and
 /// set maySupportOtherAspects to false, hence why they are used for this test.
-// RUN: %clangxx -fsycl --no-offload-new-driver -nogpulib -fsycl-targets=intel_gpu_pvc,amd_gpu_gfx906 \
+// RUN: %clangxx -fsycl --no-offload-new-driver --no-offloadlib -nogpulib -fsycl-targets=intel_gpu_pvc,amd_gpu_gfx906 \
 // RUN:   -fsycl-libspirv-path=%S/Inputs/SYCL/libspirv.bc -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-SYCL-TARGETS-NO-MAY-SUPPORT-OTHER-ASPECTS %s
 // RUN: %clangxx -fsycl --offload-new-driver --sysroot=%S/Inputs/SYCL -nogpulib -fsycl-targets=intel_gpu_pvc,amd_gpu_gfx906 \

clang/test/Driver/sycl-fsyclbin.cpp

@@ -1,7 +1,7 @@
 /// Tests behaviors of -fsyclbin
 
 /// -fsyclbin is only used with the new offloading model.
-// RUN: %clangxx -fsycl -fsyclbin --no-offload-new-driver %s -### 2>&1 \
+// RUN: %clangxx -fsycl -fsyclbin --no-offload-new-driver --no-offloadlib %s -### 2>&1 \
 // RUN: | FileCheck %s --check-prefix=UNUSED
 // UNUSED: warning: argument unused during compilation: '-fsyclbin'
 

clang/test/Driver/sycl-no-rdc-fat-archive-old-model.cpp

@@ -13,18 +13,18 @@
 // CHECK: 2: clang-offload-unbundler, {1}, tempfilelist
 // CHECK: 3: spirv-to-ir-wrapper, {2}, tempfilelist, (device-sycl)
 // CHECK: 4: input, "{{.*}}libsycl-crt.bc", ir, (device-sycl)
-// CHECK: 10: linker, {4, {{.*}}}, ir, (device-sycl)
-// CHECK: 11: linker, {3, 10}, ir, (device-sycl)
-// CHECK: 12: foreach, {3, 11}, ir, (device-sycl)
-// CHECK: 13: file-table-tform, {3, 12}, tempfilelist, (device-sycl)
-// CHECK: 14: sycl-post-link, {13}, tempfiletable, (device-sycl)
-// CHECK: 15: foreach, {13, 14}, tempfiletable, (device-sycl)
-// CHECK: 16: file-table-tform, {15}, tempfilelist, (device-sycl)
-// CHECK: 17: file-table-tform, {15}, tempfilelist, (device-sycl)
-// CHECK: 18: foreach, {13, 17}, tempfilelist, (device-sycl)
-// CHECK: 19: file-table-tform, {18}, tempfilelist, (device-sycl)
-// CHECK: 20: llvm-spirv, {19}, tempfilelist, (device-sycl)
-// CHECK: 21: file-table-tform, {16, 20}, tempfiletable, (device-sycl)
-// CHECK: 22: clang-offload-wrapper, {21}, object, (device-sycl)
-// CHECK: 23: offload, "device-sycl (spir64-unknown-unknown)" {22}, object
-// CHECK: 24: linker, {0, 23}, image, (host-sycl)
+// CHECK: 11: linker, {4, {{.*}}}, ir, (device-sycl)
+// CHECK: 12: linker, {3, 11}, ir, (device-sycl)
+// CHECK: 13: foreach, {3, 12}, ir, (device-sycl)
+// CHECK: 14: file-table-tform, {3, 13}, tempfilelist, (device-sycl)
+// CHECK: 15: sycl-post-link, {14}, tempfiletable, (device-sycl)
+// CHECK: 16: foreach, {14, 15}, tempfiletable, (device-sycl)
+// CHECK: 17: file-table-tform, {16}, tempfilelist, (device-sycl)
+// CHECK: 18: file-table-tform, {16}, tempfilelist, (device-sycl)
+// CHECK: 19: foreach, {14, 18}, tempfilelist, (device-sycl)
+// CHECK: 20: file-table-tform, {19}, tempfilelist, (device-sycl)
+// CHECK: 21: llvm-spirv, {20}, tempfilelist, (device-sycl)
+// CHECK: 22: file-table-tform, {17, 21}, tempfiletable, (device-sycl)
+// CHECK: 23: clang-offload-wrapper, {22}, object, (device-sycl)
+// CHECK: 24: offload, "device-sycl (spir64-unknown-unknown)" {23}, object
+// CHECK: 25: linker, {0, 24}, image, (host-sycl)

clang/test/Driver/sycl-no-rdc-fat-archive-win.cpp

@@ -18,18 +18,18 @@
 // CHECK: 2: clang-offload-unbundler, {1}, tempfilelist
 // CHECK: 3: spirv-to-ir-wrapper, {2}, tempfilelist, (device-sycl)
 // CHECK: 4: input, "{{.*}}libsycl-crt{{.*}}", ir, (device-sycl)
-// CHECK: 11: linker, {4, {{.*}}}, ir, (device-sycl)
-// CHECK: 12: linker, {3, 11}, ir, (device-sycl)
-// CHECK: 13: foreach, {3, 12}, ir, (device-sycl)
-// CHECK: 14: file-table-tform, {3, 13}, tempfilelist, (device-sycl)
-// CHECK: 15: sycl-post-link, {14}, tempfiletable, (device-sycl)
-// CHECK: 16: foreach, {14, 15}, tempfiletable, (device-sycl)
-// CHECK: 17: file-table-tform, {16}, tempfilelist, (device-sycl)
-// CHECK: 18: file-table-tform, {16}, tempfilelist, (device-sycl)
-// CHECK: 19: foreach, {14, 18}, tempfilelist, (device-sycl)
-// CHECK: 20: file-table-tform, {19}, tempfilelist, (device-sycl)
-// CHECK: 21: llvm-spirv, {20}, tempfilelist, (device-sycl)
-// CHECK: 22: file-table-tform, {17, 21}, tempfiletable, (device-sycl)
-// CHECK: 23: clang-offload-wrapper, {22}, object, (device-sycl)
-// CHECK: 24: offload, "device-sycl (spir64-unknown-unknown)" {23}, object
-// CHECK: 25: linker, {0, 24}, image, (host-sycl)
+// CHECK: 12: linker, {4, {{.*}}}, ir, (device-sycl)
+// CHECK: 13: linker, {3, 12}, ir, (device-sycl)
+// CHECK: 14: foreach, {3, 13}, ir, (device-sycl)
+// CHECK: 15: file-table-tform, {3, 14}, tempfilelist, (device-sycl)
+// CHECK: 16: sycl-post-link, {15}, tempfiletable, (device-sycl)
+// CHECK: 17: foreach, {15, 16}, tempfiletable, (device-sycl)
+// CHECK: 18: file-table-tform, {17}, tempfilelist, (device-sycl)
+// CHECK: 19: file-table-tform, {17}, tempfilelist, (device-sycl)
+// CHECK: 20: foreach, {15, 19}, tempfilelist, (device-sycl)
+// CHECK: 21: file-table-tform, {20}, tempfilelist, (device-sycl)
+// CHECK: 22: llvm-spirv, {21}, tempfilelist, (device-sycl)
+// CHECK: 23: file-table-tform, {18, 22}, tempfiletable, (device-sycl)
+// CHECK: 24: clang-offload-wrapper, {23}, object, (device-sycl)
+// CHECK: 25: offload, "device-sycl (spir64-unknown-unknown)" {24}, object
+// CHECK: 26: linker, {0, 25}, image, (host-sycl)

clang/test/Driver/sycl-no-rdc-old-model.cpp

@@ -12,19 +12,19 @@
 // CHECK: 12: preprocessor, {11}, c++-cpp-output, (device-sycl)
 // CHECK: 13: compiler, {12}, ir, (device-sycl)
 // CHECK: 18: input, "{{.*}}libsycl-crt.bc", ir, (device-sycl)
-// CHECK: 24: linker, {18, {{.*}}}, ir, (device-sycl)
-// CHECK: 25: linker, {4, 24}, ir, (device-sycl)
-// CHECK: 26: sycl-post-link, {25}, tempfiletable, (device-sycl)
-// CHECK: 27: file-table-tform, {26}, tempfilelist, (device-sycl)
-// CHECK: 28: llvm-spirv, {27}, tempfilelist, (device-sycl)
-// CHECK: 29: file-table-tform, {26, 28}, tempfiletable, (device-sycl)
-// CHECK: 30: clang-offload-wrapper, {29}, object, (device-sycl)
-// CHECK: 31: offload, "device-sycl (spir64-unknown-unknown)" {30}, object
-// CHECK: 32: linker, {13, 24}, ir, (device-sycl)
-// CHECK: 33: sycl-post-link, {32}, tempfiletable, (device-sycl)
-// CHECK: 34: file-table-tform, {33}, tempfilelist, (device-sycl)
-// CHECK: 35: llvm-spirv, {34}, tempfilelist, (device-sycl)
-// CHECK: 36: file-table-tform, {33, 35}, tempfiletable, (device-sycl)
-// CHECK: 37: clang-offload-wrapper, {36}, object, (device-sycl)
-// CHECK: 38: offload, "device-sycl (spir64-unknown-unknown)" {37}, object
-// CHECK: 39: linker, {8, 17, 31, 38}, image, (host-sycl)
+// CHECK: 25: linker, {18, {{.*}}}, ir, (device-sycl)
+// CHECK: 26: linker, {4, 25}, ir, (device-sycl)
+// CHECK: 27: sycl-post-link, {26}, tempfiletable, (device-sycl)
+// CHECK: 28: file-table-tform, {27}, tempfilelist, (device-sycl)
+// CHECK: 29: llvm-spirv, {28}, tempfilelist, (device-sycl)
+// CHECK: 30: file-table-tform, {27, 29}, tempfiletable, (device-sycl)
+// CHECK: 31: clang-offload-wrapper, {30}, object, (device-sycl)
+// CHECK: 32: offload, "device-sycl (spir64-unknown-unknown)" {31}, object
+// CHECK: 33: linker, {13, 25}, ir, (device-sycl)
+// CHECK: 34: sycl-post-link, {33}, tempfiletable, (device-sycl)
+// CHECK: 35: file-table-tform, {34}, tempfilelist, (device-sycl)
+// CHECK: 36: llvm-spirv, {35}, tempfilelist, (device-sycl)
+// CHECK: 37: file-table-tform, {34, 36}, tempfiletable, (device-sycl)
+// CHECK: 38: clang-offload-wrapper, {37}, object, (device-sycl)
+// CHECK: 39: offload, "device-sycl (spir64-unknown-unknown)" {38}, object
+// CHECK: 40: linker, {8, 17, 32, 39}, image, (host-sycl)

clang/test/Driver/sycl-no-rdc-win.cpp

@@ -15,22 +15,22 @@
 // CHECK: 13: compiler, {12}, ir, (device-sycl)
 // CHECK: 14: offload, "host-sycl (x86_64-pc-windows-msvc)" {10}, "device-sycl (spir64-unknown-unknown)" {13}, c++-cpp-output
 // CHECK: 18: input, "{{.*}}libsycl-crt{{.*}}", ir, (device-sycl)
-// CHECK: 25: linker, {18, {{.*}}}, ir, (device-sycl)
-// CHECK: 26: linker, {4, 25}, ir, (device-sycl)
-// CHECK: 27: sycl-post-link, {26}, tempfiletable, (device-sycl)
-// CHECK: 28: file-table-tform, {27}, tempfilelist, (device-sycl)
-// CHECK: 29: llvm-spirv, {28}, tempfilelist, (device-sycl)
-// CHECK: 30: file-table-tform, {27, 29}, tempfiletable, (device-sycl)
-// CHECK: 31: clang-offload-wrapper, {30}, object, (device-sycl)
-// CHECK: 32: offload, "device-sycl (spir64-unknown-unknown)" {31}, object
-// CHECK: 33: linker, {13, 25}, ir, (device-sycl)
-// CHECK: 34: sycl-post-link, {33}, tempfiletable, (device-sycl)
-// CHECK: 35: file-table-tform, {34}, tempfilelist, (device-sycl)
-// CHECK: 36: llvm-spirv, {35}, tempfilelist, (device-sycl)
-// CHECK: 37: file-table-tform, {34, 36}, tempfiletable, (device-sycl)
-// CHECK: 38: clang-offload-wrapper, {37}, object, (device-sycl)
-// CHECK: 39: offload, "device-sycl (spir64-unknown-unknown)" {38}, object
-// CHECK: 40: linker, {8, 17, 32, 39}, image, (host-sycl)
+// CHECK: 26: linker, {18, {{.*}}}, ir, (device-sycl)
+// CHECK: 27: linker, {4, 26}, ir, (device-sycl)
+// CHECK: 28: sycl-post-link, {27}, tempfiletable, (device-sycl)
+// CHECK: 29: file-table-tform, {28}, tempfilelist, (device-sycl)
+// CHECK: 30: llvm-spirv, {29}, tempfilelist, (device-sycl)
+// CHECK: 31: file-table-tform, {28, 30}, tempfiletable, (device-sycl)
+// CHECK: 32: clang-offload-wrapper, {31}, object, (device-sycl)
+// CHECK: 33: offload, "device-sycl (spir64-unknown-unknown)" {32}, object
+// CHECK: 34: linker, {13, 26}, ir, (device-sycl)
+// CHECK: 35: sycl-post-link, {34}, tempfiletable, (device-sycl)
+// CHECK: 36: file-table-tform, {35}, tempfilelist, (device-sycl)
+// CHECK: 37: llvm-spirv, {36}, tempfilelist, (device-sycl)
+// CHECK: 38: file-table-tform, {35, 37}, tempfiletable, (device-sycl)
+// CHECK: 39: clang-offload-wrapper, {38}, object, (device-sycl)
+// CHECK: 40: offload, "device-sycl (spir64-unknown-unknown)" {39}, object
+// CHECK: 41: linker, {8, 17, 33, 40}, image, (host-sycl)
 
 // RUN: %clang -### -fsycl -fno-sycl-rdc -c -fsycl-targets=spir64_gen --sysroot=%S/Inputs/SYCL %t1.cpp 2>&1 | FileCheck -check-prefix=CHECK-EARLY %s
 // RUN: %clang_cl -### -fsycl -fno-sycl-rdc -c -fsycl-targets=spir64_gen /clang:--sysroot=%S/Inputs/SYCL %t1.cpp 2>&1 | FileCheck -check-prefix=CHECK-EARLY %s

clang/test/Driver/sycl-offload-arch-intel-cpu.cpp

@@ -1,4 +1,4 @@
-/// Tests the behaviors of using -fsycl --offload-new-driver 
+/// Tests the behaviors of using -fsycl --offload-new-driver
 //  --offload-arch=<intel-cpu-values>.
 
 // SYCL AOT compilation to Intel CPUs using --offload-arch