Skip to content

Commit 3200e5e

Browse files
jinge90jinge90
committed
simplfy device library list
Signed-off-by: jinge90 <[email protected]>
1 parent d64e343 commit 3200e5e

File tree

7 files changed

+119
-290
lines changed

7 files changed

+119
-290
lines changed

‎clang/lib/Driver/ToolChains/SYCL.cpp‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -779,23 +779,7 @@ SYCL::getDeviceLibraries(const Compilation &C, const llvm::Triple &TargetTriple,
779779
}
780780

781781
using SYCLDeviceLibsList = SmallVector<StringRef>;
782-
const SYCLDeviceLibsList SYCLDeviceLibs = {"libsycl-crt",
783-
"libsycl-complex",
784-
"libsycl-complex-fp64",
785-
"libsycl-cmath",
786-
"libsycl-cmath-fp64",
787-
#if defined(_WIN32)
788-
"libsycl-msvc-math",
789-
#endif
790-
"libsycl-imf",
791-
"libsycl-imf-fp64",
792-
"libsycl-imf-bf16",
793-
"libsycl-fallback-cassert",
794-
"libsycl-fallback-cstring",
795-
"libsycl-fallback-complex",
796-
"libsycl-fallback-complex-fp64",
797-
"libsycl-fallback-cmath",
798-
"libsycl-fallback-cmath-fp64",
782+
const SYCLDeviceLibsList SYCLDeviceLibs = {"libsycl-devicelib",
799783
"libsycl-fallback-imf",
800784
"libsycl-fallback-imf-fp64",
801785
"libsycl-fallback-imf-bf16"};
@@ -946,6 +930,7 @@ void SYCL::populateSYCLDeviceTraitsMacrosArgs(
946930
// compiler package. Once we add or remove any SYCL device library files,
947931
// the list should be updated accordingly.
948932
static llvm::SmallVector<StringRef, 16> SYCLDeviceLibList{
933+
"devicelib",
949934
"bfloat16",
950935
"crt",
951936
"cmath",

‎clang/test/Driver/sycl-device-lib-old-model.cpp‎

Lines changed: 44 additions & 117 deletions
Large diffs are not rendered by default.

‎clang/test/Driver/sycl-device-lib.cpp‎

Lines changed: 38 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,44 @@
66

77
/// ###########################################################################
88

9-
/// test behavior of device library default link and fno-sycl-device-lib-jit-link
9+
/// test behavior of device library link with deprecated option
1010
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1111
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
12+
// SYCL_DEVICE_LIB_LINK_DEFAULT: clang-linker-wrapper{{.*}} "-sycl-device-libraries=libsycl-devicelib.new.o
13+
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf.new.o
14+
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
15+
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
16+
17+
/// ###########################################################################
18+
19+
/// test behavior of device library link with deprecated option
1220
// RUN: %clangxx -fsycl --offload-new-driver -fno-sycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
13-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
21+
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT_DEP
1422
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
15-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
23+
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT_DEP
1624
// RUN: %clangxx -fsycl --offload-new-driver -fno-sycl-device-lib-jit-link %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
17-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
25+
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT_DEP
1826
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libm-fp32 --sysroot=%S/Inputs/SYCL -### 2>&1 \
19-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
27+
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT_DEP
2028
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libc,libm-fp32 --sysroot=%S/Inputs/SYCL -### 2>&1 \
21-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
22-
// SYCL_DEVICE_LIB_LINK_DEFAULT: clang-linker-wrapper{{.*}} "-sycl-device-libraries=libsycl-crt.new.o
23-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-complex.new.o
24-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-complex-fp64.new.o
25-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-cmath.new.o
26-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-cmath-fp64.new.o
27-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-imf.new.o
28-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-imf-fp64.new.o
29-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-imf-bf16.new.o
30-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-cassert.new.o
31-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-cstring.new.o
32-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-complex.new.o
33-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
34-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-cmath.new.o
35-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
36-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf.new.o
37-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
38-
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
29+
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT_DEP
30+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP: clang-linker-wrapper{{.*}} "-sycl-device-libraries=libsycl-crt.new.o
31+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-complex.new.o
32+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-complex-fp64.new.o
33+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-cmath.new.o
34+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-cmath-fp64.new.o
35+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-imf.new.o
36+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-imf-fp64.new.o
37+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-imf-bf16.new.o
38+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-cassert.new.o
39+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-cstring.new.o
40+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-complex.new.o
41+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
42+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-cmath.new.o
43+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
44+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-imf.new.o
45+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
46+
// SYCL_DEVICE_LIB_LINK_DEFAULT_DEP-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
3947

4048
/// ###########################################################################
4149
/// test sycl fallback device libraries are not linked by default
@@ -169,20 +177,7 @@
169177
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -Xarch_device "-fsanitize=address -DUSE_SYCL_DEVICE_ASAN" -### 2>&1 \
170178
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_ASAN_MACRO
171179
// SYCL_DEVICE_LIB_ASAN: clang-linker-wrapper{{.*}} "-sycl-device-libraries
172-
// SYCL_DEVICE_LIB_ASAN: {{.*}}libsycl-crt.new.o
173-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-complex.
174-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-complex-fp64.
175-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-cmath.new.o
176-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-cmath-fp64.new.o
177-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-imf.new.o
178-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-imf-fp64.new.o
179-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-imf-bf16.new.o
180-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-cassert.new.o
181-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-cstring.new.o
182-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-complex.new.o
183-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
184-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-cmath.new.o
185-
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
180+
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-devicelib.new.o
186181
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-imf.new.o
187182
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
188183
// SYCL_DEVICE_LIB_ASAN-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -212,20 +207,7 @@
212207
// RUN: -Xarch_device -fsanitize=address -Xs "-device 12.60.7" -### 2>&1 \
213208
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_ASAN_PVC
214209
// SYCL_DEVICE_LIB_ASAN_PVC: clang-linker-wrapper{{.*}} "-sycl-device-libraries
215-
// SYCL_DEVICE_LIB_ASAN_PVC: {{.*}}libsycl-crt.new.o
216-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-complex.
217-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-complex-fp64.
218-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-cmath.new.o
219-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-cmath-fp64.new.o
220-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-imf.new.o
221-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-imf-fp64.new.o
222-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-imf-bf16.new.o
223-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-cassert.new.o
224-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-cstring.new.o
225-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-complex.new.o
226-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
227-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-cmath.new.o
228-
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
210+
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-devicelib.new.o
229211
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-imf.new.o
230212
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
231213
// SYCL_DEVICE_LIB_ASAN_PVC-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -236,20 +218,7 @@
236218
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 --offload-new-driver %s --sysroot=%S/Inputs/SYCL \
237219
// RUN: -Xarch_device -fsanitize=address -### 2>&1 | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_ASAN_CPU
238220
// SYCL_DEVICE_LIB_ASAN_CPU: clang-linker-wrapper{{.*}} "-sycl-device-libraries
239-
// SYCL_DEVICE_LIB_ASAN_CPU: {{.*}}libsycl-crt.new.o
240-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-complex.
241-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-complex-fp64.
242-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-cmath.new.o
243-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-cmath-fp64.new.o
244-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-imf.new.o
245-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-imf-fp64.new.o
246-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-imf-bf16.new.o
247-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-cassert.new.o
248-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-cstring.new.o
249-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-complex.new.o
250-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
251-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-cmath.new.o
252-
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
221+
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-devicelib.new.o
253222
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-imf.new.o
254223
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
255224
// SYCL_DEVICE_LIB_ASAN_CPU-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -269,20 +238,7 @@
269238
// RUN: -Xarch_device -fsanitize=address -Xs "-device dg2" -### 2>&1 \
270239
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_ASAN_DG2
271240
// SYCL_DEVICE_LIB_ASAN_DG2: clang-linker-wrapper{{.*}} "-sycl-device-libraries
272-
// SYCL_DEVICE_LIB_ASAN_DG2: {{.*}}libsycl-crt.new.o
273-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-complex.
274-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-complex-fp64.
275-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-cmath.new.o
276-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-cmath-fp64.new.o
277-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-imf.new.o
278-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-imf-fp64.new.o
279-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-imf-bf16.new.o
280-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-cassert.new.o
281-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-cstring.new.o
282-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-complex.new.o
283-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
284-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-cmath.new.o
285-
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
241+
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-devicelib.new.o
286242
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-imf.new.o
287243
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
288244
// SYCL_DEVICE_LIB_ASAN_DG2-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -298,20 +254,7 @@
298254
// RUN: -Xarch_device -fsanitize=address -Xsycl-target-backend=spir64_gen "-device pvc,dg2" -### 2>&1 \
299255
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_ASAN_MUL
300256
// SYCL_DEVICE_LIB_ASAN_MUL: clang-linker-wrapper{{.*}} "-sycl-device-libraries
301-
// SYCL_DEVICE_LIB_ASAN_MUL: {{.*}}libsycl-crt.new.o
302-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-complex.
303-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-complex-fp64.
304-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-cmath.new.o
305-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-cmath-fp64.new.o
306-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-imf.new.o
307-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-imf-fp64.new.o
308-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-imf-bf16.new.o
309-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-cassert.new.o
310-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-cstring.new.o
311-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-complex.new.o
312-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
313-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-cmath.new.o
314-
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
257+
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-devicelib.new.o
315258
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-imf.new.o
316259
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
317260
// SYCL_DEVICE_LIB_ASAN_MUL-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -333,20 +276,7 @@
333276
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -Xarch_device "-fsanitize=memory -DUSE_SYCL_DEVICE_MSAN" -### 2>&1 \
334277
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_MSAN_MACRO
335278
// SYCL_DEVICE_LIB_MSAN: clang-linker-wrapper{{.*}} "-sycl-device-libraries
336-
// SYCL_DEVICE_LIB_MSAN: {{.*}}libsycl-crt.new.o
337-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-complex.
338-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-complex-fp64.
339-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-cmath.new.o
340-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-cmath-fp64.new.o
341-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-imf.new.o
342-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-imf-fp64.new.o
343-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-imf-bf16.new.o
344-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-cassert.new.o
345-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-cstring.new.o
346-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-complex.new.o
347-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
348-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-cmath.new.o
349-
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
279+
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-devicelib.new.o
350280
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-imf.new.o
351281
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
352282
// SYCL_DEVICE_LIB_MSAN-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
@@ -382,20 +312,7 @@
382312
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -Xarch_device "-fsanitize=thread -DUSE_SYCL_DEVICE_TSAN" -### 2>&1 \
383313
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_TSAN_MACRO
384314
// SYCL_DEVICE_LIB_TSAN: clang-linker-wrapper{{.*}} "-sycl-device-libraries
385-
// SYCL_DEVICE_LIB_TSAN: {{.*}}libsycl-crt.new.o
386-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-complex.
387-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-complex-fp64.
388-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-cmath.new.o
389-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-cmath-fp64.new.o
390-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-imf.new.o
391-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-imf-fp64.new.o
392-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-imf-bf16.new.o
393-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-cassert.new.o
394-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-cstring.new.o
395-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-complex.new.o
396-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-complex-fp64.new.o
397-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-cmath.new.o
398-
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-cmath-fp64.new.o
315+
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-devicelib.new.o
399316
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-imf.new.o
400317
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
401318
// SYCL_DEVICE_LIB_TSAN-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o

‎clang/test/Driver/sycl-force-target.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// CHECK_FORCE_TARGET: clang-offload-bundler{{.*}} "-type=o" "-targets=host-{{.*}},sycl-spir64-unknown-unknown" "-input={{.*}}" "-output={{.*}}" "-output=[[DEVICEOBJECTOUT:.+]]" "-unbundle" "-allow-missing-bundles"
1919
// CHECK_FORCE_TARGET: spirv-to-ir-wrapper{{.*}} "[[DEVICEOBJECTOUT]]" "-o" "[[DEVICEOBJECTBC:.+\.bc]]"
2020
// CHECK_FORCE_TARGET: llvm-link{{.*}} "[[DEVICEOBJECTBC]]"{{.*}} "-o" "[[DEVICEOBJLINKED:.+\.bc]]" "--suppress-warnings"
21-
// CHECK_FORCE_TARGET: llvm-link{{.*}} "{{.*}}libsycl-complex{{.*}}"
21+
// CHECK_FORCE_TARGET: llvm-link{{.*}} "{{.*}}libsycl-devicelib{{.*}}"
2222
// CHECK_FORCE_TARGET_GEN: llvm-foreach{{.*}} {{.*}}ocloc{{.*}}
2323
// CHECK_FORCE_TARGET_CPU: llvm-foreach{{.*}} {{.*}}opencl-aot{{.*}}
2424

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
// CHECK: 1: input, "{{.*}}_lib.a", archive
1313
// CHECK: 2: clang-offload-unbundler, {1}, tempfilelist
1414
// CHECK: 3: spirv-to-ir-wrapper, {2}, tempfilelist, (device-sycl)
15-
// CHECK: 4: input, "{{.*}}libsycl-crt.bc", ir, (device-sycl)
16-
// CHECK: 24: linker, {4, {{.*}}}, ir, (device-sycl)
17-
// CHECK: 25: linker, {3, 24}, ir, (device-sycl)
18-
// CHECK: 26: foreach, {3, 25}, ir, (device-sycl)
19-
// CHECK: 27: file-table-tform, {3, 26}, tempfilelist, (device-sycl)
20-
// CHECK: 28: sycl-post-link, {27}, tempfiletable, (device-sycl)
21-
// CHECK: 29: foreach, {27, 28}, tempfiletable, (device-sycl)
22-
// CHECK: 30: file-table-tform, {29}, tempfilelist, (device-sycl)
23-
// CHECK: 31: file-table-tform, {29}, tempfilelist, (device-sycl)
24-
// CHECK: 32: foreach, {27, 31}, tempfilelist, (device-sycl)
25-
// CHECK: 33: file-table-tform, {32}, tempfilelist, (device-sycl)
26-
// CHECK: 34: llvm-spirv, {33}, tempfilelist, (device-sycl)
27-
// CHECK: 35: file-table-tform, {30, 34}, tempfiletable, (device-sycl)
28-
// CHECK: 36: clang-offload-wrapper, {35}, object, (device-sycl)
29-
// CHECK: 37: offload, "device-sycl (spir64-unknown-unknown)" {36}, object
30-
// CHECK: 38: linker, {0, 37}, image, (host-sycl)
15+
// CHECK: 4: input, "{{.*}}libsycl-devicelib.bc", ir, (device-sycl)
16+
// CHECK: 11: linker, {4, {{.*}}}, ir, (device-sycl)
17+
// CHECK: 12: linker, {3, 11}, ir, (device-sycl)
18+
// CHECK: 13: foreach, {3, 12}, ir, (device-sycl)
19+
// CHECK: 14: file-table-tform, {3, 13}, tempfilelist, (device-sycl)
20+
// CHECK: 15: sycl-post-link, {14}, tempfiletable, (device-sycl)
21+
// CHECK: 16: foreach, {14, 15}, tempfiletable, (device-sycl)
22+
// CHECK: 17: file-table-tform, {16}, tempfilelist, (device-sycl)
23+
// CHECK: 18: file-table-tform, {16}, tempfilelist, (device-sycl)
24+
// CHECK: 19: foreach, {14, 18}, tempfilelist, (device-sycl)
25+
// CHECK: 20: file-table-tform, {19}, tempfilelist, (device-sycl)
26+
// CHECK: 21: llvm-spirv, {20}, tempfilelist, (device-sycl)
27+
// CHECK: 22: file-table-tform, {17, 21}, tempfiletable, (device-sycl)
28+
// CHECK: 23: clang-offload-wrapper, {22}, object, (device-sycl)
29+
// CHECK: 24: offload, "device-sycl (spir64-unknown-unknown)" {23}, object
30+
// CHECK: 25: linker, {0, 24}, image, (host-sycl)

0 commit comments

Comments
 (0)