Skip to content

Commit 5d666db

Browse files
author
Hugh Delaney
committed
Update tests
1 parent 9ce10d4 commit 5d666db

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎clang/test/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ if( NOT CLANG_BUILT_STANDALONE )
139139
if(TARGET llvm-lto)
140140
list(APPEND CLANG_TEST_DEPS llvm-lto)
141141
endif()
142-
143-
if ("NVPTX" IN_LIST LLVM_TARGETS_TO_BUILD)
144-
list(APPEND CLANG_TEST_DEPS libspirv-builtins libsycldevice)
145-
endif()
146142
endif()
147143

148144
if(CLANG_ENABLE_STATIC_ANALYZER)

‎clang/test/Driver/Inputs/SYCL/lib/nvidiacl/remangled-l32-signed_char.libspirv-nvptx64--nvidiacl.bc

Whitespace-only changes.

‎clang/test/Driver/Inputs/SYCL/lib/nvidiacl/remangled-l64-signed_char.libspirv-nvptx64--nvidiacl.bc

Whitespace-only changes.

‎clang/test/Driver/sycl-cuda-tu-offload.cu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 --cuda-gpu-arch=sm_80 -c %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES
1+
// RUN: %clangxx -ccc-print-phases --sysroot=%S/Inputs/SYCL -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 --cuda-gpu-arch=sm_80 -c %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES
22

33
// Test the correct placement of the offloading actions for compiling CUDA sources (*.cu) in SYCL.
44

@@ -19,7 +19,7 @@
1919
// DEFAULT-PHASES:|- 14: assembler, {13}, object, (host-cuda-sycl)
2020
// DEFAULT-PHASES:15: clang-offload-bundler, {3, 14}, object, (host-cuda-sycl)
2121

22-
// RUN: %clangxx -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 --cuda-gpu-arch=sm_80 %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES2
22+
// RUN: %clangxx -ccc-print-phases --sysroot=%S/Inputs/SYCL --cuda-path=%S/Inputs/CUDA_111/usr/local/cuda -fsycl-libspirv-path=%S/Inputs/SYCL/lib/nvidiacl -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 --cuda-gpu-arch=sm_80 %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES2
2323

2424
// DEFAULT-PHASES2: +- 0: input, "{{.*}}", cuda, (host-cuda)
2525
// DEFAULT-PHASES2: +- 1: preprocessor, {0}, cuda-cpp-output, (host-cuda)
@@ -93,8 +93,8 @@
9393
// DEFAULT-PHASES2:| | +- 69: input, "{{.*}}", object
9494
// DEFAULT-PHASES2:| | +- 70: clang-offload-unbundler, {69}, object
9595
// DEFAULT-PHASES2:| |- 71: offload, " (nvptx64-nvidia-cuda)" {70}, object
96-
// DEFAULT-PHASES2:| |- 72: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_80)
97-
// DEFAULT-PHASES2:| |- 73: input, "{{.*}}libdevice.10.bc", ir, (device-sycl, sm_80)
96+
// DEFAULT-PHASES2:| |- 72: input, "{{.*}}nvidiacl{{.*}}", ir, (device-sycl, sm_80)
97+
// DEFAULT-PHASES2:| |- 73: input, "{{.*}}libdevice{{.*}}", ir, (device-sycl, sm_80)
9898
// DEFAULT-PHASES2:| +- 74: linker, {17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 68, 71, 72, 73}, ir, (device-sycl, sm_80)
9999
// DEFAULT-PHASES2:| +- 75: sycl-post-link, {74}, ir, (device-sycl, sm_80)
100100
// DEFAULT-PHASES2:| | +- 76: file-table-tform, {75}, ir, (device-sycl, sm_80)

‎clang/test/Driver/sycl-offload-nvptx.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@
3434
// CHK-ACTIONS-WIN: clang-offload-wrapper"{{.*}} "-host=x86_64-pc-windows-msvc" "-target=nvptx64" "-kind=sycl"{{.*}}
3535

3636
/// Check phases w/out specifying a compute capability.
37-
// RUN: %clangxx -ccc-print-phases -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \
37+
// RUN: %clangxx -ccc-print-phases --sysroot=%S/Inputs/SYCL -std=c++11 \
38+
// RUN: -target x86_64-unknown-linux-gnu -fsycl \
3839
// RUN: -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
40+
// RUN: -fsycl-libspirv-path=%S/Inputs/SYCL/lib/nvidiacl \
41+
// RUN: --cuda-path=%S/Inputs/CUDA_111/usr/local/cuda \
3942
// RUN: | FileCheck -check-prefix=CHK-PHASES-NO-CC %s
4043
//
4144
// TODO: Enable for clang_cl once device lib linking works for clang_cl
@@ -106,8 +109,8 @@
106109
// CHK-PHASES-NO-CC: 63: input, "{{.*}}libsycl-itt-stubs.o", object
107110
// CHK-PHASES-NO-CC: 64: clang-offload-unbundler, {63}, object
108111
// CHK-PHASES-NO-CC: 65: offload, " (nvptx64-nvidia-cuda)" {64}, object
109-
// CHK-PHASES-NO-CC: 66: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_50)
110-
// CHK-PHASES-NO-CC: 67: input, "{{.*}}libdevice{{.*}}bc", ir, (device-sycl, sm_50)
112+
// CHK-PHASES-NO-CC: 66: input, "{{.*}}nvidiacl{{.*}}", ir, (device-sycl, sm_50)
113+
// CHK-PHASES-NO-CC: 67: input, "{{.*}}libdevice{{.*}}", ir, (device-sycl, sm_50)
111114
// CHK-PHASES-NO-CC: 68: linker, {11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 66, 67}, ir, (device-sycl, sm_50)
112115
// CHK-PHASES-NO-CC: 69: sycl-post-link, {68}, ir, (device-sycl, sm_50)
113116
// CHK-PHASES-NO-CC: 70: file-table-tform, {69}, ir, (device-sycl, sm_50)
@@ -121,8 +124,11 @@
121124
//
122125
//
123126
/// Check phases specifying a compute capability.
124-
// RUN: %clangxx -ccc-print-phases -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \
127+
// RUN: %clangxx -ccc-print-phases --sysroot=%S/Inputs/SYCL -std=c++11 \
128+
// RUN: -target x86_64-unknown-linux-gnu -fsycl \
125129
// RUN: -fsycl-targets=nvptx64-nvidia-cuda \
130+
// RUN: -fsycl-libspirv-path=%S/Inputs/SYCL/lib/nvidiacl \
131+
// RUN: --cuda-path=%S/Inputs/CUDA_111/usr/local/cuda \
126132
// RUN: -Xsycl-target-backend "--cuda-gpu-arch=sm_35" %s 2>&1 \
127133
// RUN: | FileCheck -check-prefix=CHK-PHASES %s
128134
//
@@ -194,8 +200,8 @@
194200
// CHK-PHASES: 63: input, "{{.*}}libsycl-itt-stubs.o", object
195201
// CHK-PHASES: 64: clang-offload-unbundler, {63}, object
196202
// CHK-PHASES: 65: offload, " (nvptx64-nvidia-cuda)" {64}, object
197-
// CHK-PHASES: 66: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_35)
198-
// CHK-PHASES: 67: input, "{{.*}}libdevice{{.*}}bc", ir, (device-sycl, sm_35)
203+
// CHK-PHASES: 66: input, "{{.*}}nvidiacl{{.*}}", ir, (device-sycl, sm_35)
204+
// CHK-PHASES: 67: input, "{{.*}}libdevice{{.*}}", ir, (device-sycl, sm_35)
199205
// CHK-PHASES: 68: linker, {11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 66, 67}, ir, (device-sycl, sm_35)
200206
// CHK-PHASES: 69: sycl-post-link, {68}, ir, (device-sycl, sm_35)
201207
// CHK-PHASES: 70: file-table-tform, {69}, ir, (device-sycl, sm_35)
@@ -214,8 +220,6 @@
214220
// CHK-PREPROC: 2: offload, "device-sycl (nvptx64-nvidia-cuda:sm_[[CUDA_VERSION]])" {1}, c++-cpp-output
215221
// CHK-PREPROC: 4: compiler, {1}, none, (device-sycl, sm_[[CUDA_VERSION]])
216222
//
217-
//
218-
//
219223
// RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \
220224
// RUN: -fsycl-targets=nvptx64-nvidia-cuda --cuda-path=%S/Inputs/no/CUDA/path/here \
221225
// RUN: -fsycl-libspirv-path=%S/Inputs/SYCL/libspirv.bc %s 2>&1 \

0 commit comments

Comments
 (0)