Skip to content

Commit a5c76b8

Browse files
wenju-hewenju-he
authored
[Driver][SYCL][lit] Fix tests fails when libclc project is disabled (intel#20030)
Since 388ccf5, tests fail when the libclc project is disabled because the libspirv bitcode file is missing. Fix them by adding `-fno-sycl-libspirv` flag. Add `-ccc-install-dir` for libspirv specific tests.
1 parent ccbe355 commit a5c76b8

23 files changed

+137
-134
lines changed

‎clang/test/Driver/sycl-add-default-spec-consts-image-old-model.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=spir64_gen 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1414
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=spir64_x86_64 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1515
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=intel_gpu_pvc 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
16-
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=nvidia_gpu_sm_90 -nocudalib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
16+
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=nvidia_gpu_sm_90 -fno-sycl-libspirv -nocudalib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1717
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=amd_gpu_gfx1034 -fno-sycl-libspirv -nogpulib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1818
// CHECK-AOT-NOT: warning: -fsycl-add-default-spec-consts-image flag has an effect only in Ahead of Time Compilation mode (AOT)
1919
// CHECK-AOT: {{.*}}sycl-post-link{{.*}} "-generate-device-image-default-spec-consts"

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Check device traits macros are defined if sycl is enabled:
22
// Compiling for the default CUDA target passing the triple to '-fsycl-targets'.
3-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \
3+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \
44
// RUN: | FileCheck -check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEFAULT-TRIPLE %s
55
// CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEFAULT-TRIPLE: clang{{.*}} "-triple" "nvptx64-nvidia-cuda"
66
// CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEFAULT-TRIPLE-COUNT-2: "-D__SYCL_ANY_DEVICE_HAS_ANY_ASPECT__=1"
@@ -9,68 +9,68 @@
99

1010
// Compiling for a specific CUDA target passing the device to '-fsycl-targets'.
1111
//
12-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_50 -### %s 2>&1 | \
12+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_50 -### %s 2>&1 | \
1313
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
14-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_52 -### %s 2>&1 | \
14+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_52 -### %s 2>&1 | \
1515
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
16-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_53 -### %s 2>&1 | \
16+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_53 -### %s 2>&1 | \
1717
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
18-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_60 -### %s 2>&1 | \
18+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_60 -### %s 2>&1 | \
1919
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
20-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_61 -### %s 2>&1 | \
20+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_61 -### %s 2>&1 | \
2121
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
22-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_62 -### %s 2>&1 | \
22+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_62 -### %s 2>&1 | \
2323
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
24-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_70 -### %s 2>&1 | \
24+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_70 -### %s 2>&1 | \
2525
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
26-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_72 -### %s 2>&1 | \
26+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_72 -### %s 2>&1 | \
2727
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
28-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_75 -### %s 2>&1 | \
28+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_75 -### %s 2>&1 | \
2929
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
30-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_80 -### %s 2>&1 | \
30+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_80 -### %s 2>&1 | \
3131
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
32-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_86 -### %s 2>&1 | \
32+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_86 -### %s 2>&1 | \
3333
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
34-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_87 -### %s 2>&1 | \
34+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_87 -### %s 2>&1 | \
3535
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
36-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_89 -### %s 2>&1 | \
36+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_89 -### %s 2>&1 | \
3737
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
38-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_90 -### %s 2>&1 | \
38+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_90 -### %s 2>&1 | \
3939
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
40-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvidia_gpu_sm_90a -### %s 2>&1 | \
40+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvidia_gpu_sm_90a -### %s 2>&1 | \
4141
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-DEVICE-TRIPLE
4242

4343
// Compiling for a CUDA target passing the device arch to '--offload-arch' (using the '--cuda-gpu-arch' alias).
4444
//
45-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_50 -### %s 2>&1 | \
45+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_50 -### %s 2>&1 | \
4646
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
47-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_52 -### %s 2>&1 | \
47+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_52 -### %s 2>&1 | \
4848
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
49-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_53 -### %s 2>&1 | \
49+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_53 -### %s 2>&1 | \
5050
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
51-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_60 -### %s 2>&1 | \
51+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_60 -### %s 2>&1 | \
5252
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
53-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_61 -### %s 2>&1 | \
53+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_61 -### %s 2>&1 | \
5454
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
55-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_62 -### %s 2>&1 | \
55+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_62 -### %s 2>&1 | \
5656
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
57-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_70 -### %s 2>&1 | \
57+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_70 -### %s 2>&1 | \
5858
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
59-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_72 -### %s 2>&1 | \
59+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_72 -### %s 2>&1 | \
6060
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
61-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_75 -### %s 2>&1 | \
61+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_75 -### %s 2>&1 | \
6262
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
63-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 -### %s 2>&1 | \
63+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 -### %s 2>&1 | \
6464
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
65-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_86 -### %s 2>&1 | \
65+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_86 -### %s 2>&1 | \
6666
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
67-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_87 -### %s 2>&1 | \
67+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_87 -### %s 2>&1 | \
6868
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
69-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_89 -### %s 2>&1 | \
69+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_89 -### %s 2>&1 | \
7070
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
71-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_90 -### %s 2>&1 | \
71+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_90 -### %s 2>&1 | \
7272
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
73-
// RUN: %clangxx -fsycl -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_90a -### %s 2>&1 | \
73+
// RUN: %clangxx -fsycl -fno-sycl-libspirv -nocudalib -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_90a -### %s 2>&1 | \
7474
// RUN: FileCheck %s --check-prefix=CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH
7575

7676
// Check device traits macros are defined if sycl is enabled:
@@ -86,11 +86,11 @@
8686
// CHECK-SYCL-NVPTX-NVIDIA-CUDA-OFFLOAD-ARCH: "-D__SYCL_ALL_DEVICES_HAVE_{{[a-z0-9_]+}}__=1"
8787

8888
// Test all Cuda devices support at least the aspects of the least capable one.
89-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_50 -### %s > %t 2>&1
90-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_60 -### %s >> %t 2>&1
91-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_70 -### %s >> %t 2>&1
92-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_80 -### %s >> %t 2>&1
93-
// RUN: %clangxx -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_90 -### %s >> %t 2>&1
89+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_50 -### %s > %t 2>&1
90+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_60 -### %s >> %t 2>&1
91+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_70 -### %s >> %t 2>&1
92+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_80 -### %s >> %t 2>&1
93+
// RUN: %clangxx -fno-sycl-libspirv -nocudalib -fsycl -fsycl-targets=nvidia_gpu_sm_90 -### %s >> %t 2>&1
9494
// RUN: FileCheck --input-file=%t --check-prefixes=CHECK-SM50,CHECK-SM60,CHECK-SM70,CHECK-SM80,CHECK-SM90 %s
9595
// CHECK-SM50: "-D__SYCL_TARGET_NVIDIA_GPU_SM_50__"{{.*}} "-D__SYCL_ALL_DEVICES_HAVE_[[ASPECT:[a-z0-9]+]]__=1"
9696
// CHECK-SM60: "-D__SYCL_TARGET_NVIDIA_GPU_SM_60__"{{.*}} "-D__SYCL_ALL_DEVICES_HAVE_[[ASPECT]]__=1"

‎clang/test/Driver/sycl-instrumentation-old-model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
// Verify that ITT annotations are not pulled in for non-SPIR-V targets as
3434
// well as when device code instrumentation is explicitly turned off.
3535
// RUN: %clangxx -fsycl --no-offload-new-driver --sysroot=%S/Inputs/SYCL \
36-
// RUN: -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -### %s 2>&1 \
36+
// RUN: -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-libspirv -nocudalib -### %s 2>&1 \
3737
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
3838
// RUN: %clangxx -fsycl --no-offload-new-driver --sysroot=%S/Inputs/SYCL \
3939
// RUN: -fno-sycl-instrument-device-code -fsycl-targets=spir64 -### %s 2>&1 \
4040
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
4141
// RUN: %clangxx -fsycl --no-offload-new-driver --sysroot=%s/Inputs/SYCL \
4242
// RUN: -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-instrument-device-code \
43-
// RUN: -nocudalib -### %s 2>&1 \
43+
// RUN: -fno-sycl-libspirv -nocudalib -### %s 2>&1 \
4444
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
4545

4646
// CHECK-NONPASSED-NOT: "-fsycl-instrument-device-code"

‎clang/test/Driver/sycl-instrumentation.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
// we still link ITT annotations libraries to ensure ABI compatibility with previous release.
2424
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-targets=spir64 -### %s 2>&1 \
2525
// RUN: | FileCheck -check-prefixes=CHECK-ITT-LINK-ONLY %s
26-
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -### %s 2>&1 \
26+
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-libspirv -nocudalib -### %s 2>&1 \
2727
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
2828

2929
// CHECK-ITT-LINK-ONLY-NOT: "-fsycl-instrument-device-code"
3030
// CHECK-ITT-LINK-ONLY: clang-linker-wrapper{{.*}} {{.*}}libsycl-itt-{{.*}}
3131

3232
// RUN: %clangxx -fsycl --offload-new-driver -fno-sycl-instrument-device-code -fsycl-targets=spir64 -### %s 2>&1 \
3333
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
34-
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-instrument-device-code -nocudalib -### %s 2>&1 \
34+
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-instrument-device-code -fno-sycl-libspirv -nocudalib -### %s 2>&1 \
3535
// RUN: | FileCheck -check-prefixes=CHECK-NONPASSED %s
3636

3737
// CHECK-NONPASSED-NOT: "-fsycl-instrument-device-code"

‎clang/test/Driver/sycl-libspirv-toolchain.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
// DEFINE: %{install_dir} = %/S/Inputs/SYCL/bin
44
// DEFINE: %{resource_dir} = %/S/Inputs/SYCL/lib/clang/resource_dir
55

6-
// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-msvc %s 2>&1 \
6+
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-msvc %s 2>&1 \
77
// RUN: | FileCheck %s --check-prefixes=CHECK-WINDOWS
8-
// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-gnu %s 2>&1 \
8+
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-gnu %s 2>&1 \
99
// RUN: | FileCheck %s --check-prefixes=CHECK-WINDOWS
1010
// CHECK-WINDOWS: "-cc1"{{.*}} "-fsycl-is-device"{{.*}} "-mlink-builtin-bitcode" "{{.*[\\/]}}remangled-l32-signed_char.libspirv-nvptx64-nvidia-cuda.bc"
1111
//
12-
// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-linux-gnu %s 2>&1 \
12+
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-linux-gnu %s 2>&1 \
1313
// RUN: | FileCheck %s --check-prefixes=CHECK-LINUX
14-
// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-cygnus %s 2>&1 \
14+
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib -target x86_64-unknown-windows-cygnus %s 2>&1 \
1515
// RUN: | FileCheck %s --check-prefixes=CHECK-LINUX
1616
// CHECK-LINUX: "-cc1"{{.*}} "-fsycl-is-device"{{.*}} "-mlink-builtin-bitcode" "{{.*[\\/]}}remangled-l64-signed_char.libspirv-nvptx64-nvidia-cuda.bc"
1717
//
1818
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx908 -nogpulib -target x86_64-unknown-windows-msvc %s 2>&1 \
1919
// RUN: | FileCheck %s --check-prefixes=CHECK-AMDGCN-WINDOWS
2020
// CHECK-AMDGCN-WINDOWS: "-cc1"{{.*}} "-fsycl-is-device"{{.*}} "-mlink-builtin-bitcode" "{{.*[\\/]}}remangled-l32-signed_char.libspirv-amdgcn-amd-amdhsa.bc"
2121
//
22-
// RUN: %clang -### -fsycl -fsycl-device-only -fsycl-targets=nvptx64-nvidia-cuda -nocudalib %s 2>&1 \
22+
// RUN: %clang -### -ccc-install-dir %{install_dir} -fsycl -fsycl-device-only -fsycl-targets=nvptx64-nvidia-cuda -nocudalib %s 2>&1 \
2323
// RUN: | FileCheck %s --check-prefixes=CHECK-DEVICE-ONLY
2424
// CHECK-DEVICE-ONLY: "-cc1"{{.*}} "-fsycl-is-device"{{.*}} "-mlink-builtin-bitcode" "{{.*[\\/]}}remangled-{{.*}}.libspirv-nvptx64-nvidia-cuda.bc"
2525
//

‎clang/test/Driver/sycl-no-bundle-offload-arch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib\
1+
// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-libspirv -nocudalib\
22
// RUN: -fno-bundle-offload-arch -c %s 2>&1 \
33
// RUN: | FileCheck -check-prefix=CHK-BUNDLE-TAG-OBJ %s
44
//
55
// CHK-BUNDLE-TAG-OBJ-NOT: clang-offload-bundler{{.*}}-targets=sycl-nvptx64-nvidia-cuda-sm_"
66

7-
// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nocudalib\
7+
// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-libspirv -nocudalib\
88
// RUN: -fno-bundle-offload-arch %s 2>&1 \
99
// RUN: | FileCheck -check-prefix=CHK-BUNDLE-TAG %s
1010
//

‎clang/test/Driver/sycl-nvptx-fast-math.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// REQUIRES: nvptx-registered-target
22

3-
// RUN: %clang -### -nocudalib \
3+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
44
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
55
// RUN: | FileCheck --check-prefix=CHECK-DEFAULT %s
66

7-
// RUN: %clang -### -nocudalib \
7+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
88
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda -ffast-math %s 2>&1 \
99
// RUN: | FileCheck --check-prefix=CHECK-FAST %s
1010

11-
// RUN: %clang -### -nocudalib \
11+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
1212
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda -funsafe-math-optimizations %s 2>&1 \
1313
// RUN: | FileCheck --check-prefix=CHECK-FAST %s
1414

‎clang/test/Driver/sycl-nvptx-id-queries-fit-in-int.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// REQUIRES: nvptx-registered-target
22

3-
// RUN: %clang -### -nocudalib \
3+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
44
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
55
// RUN: | FileCheck --check-prefix=CHECK-DEFAULT %s
66

7-
// RUN: %clang -### -nocudalib \
7+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
88
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda -fno-sycl-id-queries-fit-in-int %s 2>&1 \
99
// RUN: | FileCheck --check-prefix=CHECK-DEFAULT %s
1010

11-
// RUN: %clang -### -nocudalib \
11+
// RUN: %clang -### -fno-sycl-libspirv -nocudalib \
1212
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda -fsycl-id-queries-fit-in-int %s 2>&1 \
1313
// RUN: | FileCheck --check-prefix=CHECK-INT %s
1414

0 commit comments

Comments
 (0)