Skip to content

Commit a31aa2c

Browse files
maarquitos14maarquitos14
authored
[SYCL] Use %t.dir for DeviceImageDependencies tests (#20372)
Last pulldown pulled the deprecation of `%T` for llvm-lit, and DeviceImageDependencies tests were using it. It was reported that `%t.dir` wasn't working for these tests in the pulldown PR (#20343 (comment)), and a workaround was made to make them pass provisionally. This patch moves to `%t.dir` as it's the standard way after `%T` removal.
1 parent b8f1bed commit a31aa2c

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

‎sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/dynamic.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
44
// DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
55

6-
// DEFINE: %{tdir} = %t/..
7-
// RUN: mkdir -p %{tdir}
8-
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/d.cpp -o %{tdir}/libdevice_d.%{dynamic_lib_suffix}
9-
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%{tdir}/libdevice_d.lib%} -o %{tdir}/libdevice_c.%{dynamic_lib_suffix}
10-
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%{tdir}/libdevice_c.lib%} -o %{tdir}/libdevice_b.%{dynamic_lib_suffix}
11-
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%{tdir}/libdevice_b.lib%} -o %{tdir}/libdevice_a.%{dynamic_lib_suffix}
12-
13-
// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies -I %S/Inputs -o %t.out \
6+
// RUN: rm -rf %t.dir; mkdir -p %t.dir
7+
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/d.cpp -o %t.dir/libdevice_d.%{dynamic_lib_suffix}
8+
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%t.dir/libdevice_d.lib%} -o %t.dir/libdevice_c.%{dynamic_lib_suffix}
9+
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%t.dir/libdevice_c.lib%} -o %t.dir/libdevice_b.%{dynamic_lib_suffix}
10+
// RUN: %clangxx --offload-new-driver %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%t.dir/libdevice_b.lib%} -o %t.dir/libdevice_a.%{dynamic_lib_suffix}
11+
12+
// RUN: %{build} --offload-new-driver -fsycl-allow-device-image-dependencies -I %S/Inputs -o %t.dir/%{t:stem}.out \
1413
// RUN: %if windows \
15-
// RUN: %{%{tdir}/libdevice_a.lib%} \
14+
// RUN: %{%t.dir/libdevice_a.lib%} \
1615
// RUN: %else \
17-
// RUN: %{-L%{tdir} -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%{tdir}%}
16+
// RUN: %{-L%t.dir -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%t.dir%}
1817

19-
// RUN: %{run} %t.out
18+
// RUN: %{run} %t.dir/%{t:stem}.out
2019

2120
// XFAIL: target-native_cpu
2221
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142

‎sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/singleDynamicLibrary.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
// Test -fsycl-allow-device-image-dependencies with a single dynamic library on
22
// Windows and Linux.
33

4-
// DEFINE: %{tdir} = %t/..
5-
// RUN: mkdir -p %{tdir}
4+
// RUN: rm -rf %t.dir; mkdir -p %t.dir
65
// RUN: %clangxx --offload-new-driver -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
76
// RUN: %S/Inputs/a.cpp \
87
// RUN: %S/Inputs/b.cpp \
98
// RUN: %S/Inputs/c.cpp \
109
// RUN: %S/Inputs/d.cpp \
1110
// RUN: %S/Inputs/wrapper.cpp \
12-
// RUN: -o %if windows %{%{tdir}/device_single.dll%} %else %{%{tdir}/libdevice_single.so%}
11+
// RUN: -o %if windows %{%t.dir/device_single.dll%} %else %{%t.dir/libdevice_single.so%}
1312

14-
// RUN: %{build} --offload-new-driver -I%S/Inputs -o %t.out \
13+
// RUN: %{build} --offload-new-driver -I%S/Inputs -o %t.dir/%{t:stem}.out \
1514
// RUN: %if windows \
16-
// RUN: %{%{tdir}/device_single.lib%} \
15+
// RUN: %{%t.dir/device_single.lib%} \
1716
// RUN: %else \
18-
// RUN: %{-L%{tdir} -ldevice_single -Wl,-rpath=%{tdir}%}
17+
// RUN: %{-L%t.dir -ldevice_single -Wl,-rpath=%t.dir%}
1918

20-
// RUN: %{run} %t.out
19+
// RUN: %{run} %t.dir/%{t:stem}.out
2120

2221
// XFAIL: target-native_cpu
2322
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142

‎sycl/test-e2e/DeviceImageDependencies/dynamic.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
44
// DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
55

6-
// DEFINE: %{tdir} = %t/..
7-
// RUN: mkdir -p %{tdir}
8-
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/d.cpp -o %{tdir}/libdevice_d.%{dynamic_lib_suffix}
9-
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%{tdir}/libdevice_d.lib%} -o %{tdir}/libdevice_c.%{dynamic_lib_suffix}
10-
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%{tdir}/libdevice_c.lib%} -o %{tdir}/libdevice_b.%{dynamic_lib_suffix}
11-
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%{tdir}/libdevice_b.lib%} -o %{tdir}/libdevice_a.%{dynamic_lib_suffix}
6+
// RUN: rm -rf %t.dir; mkdir -p %t.dir
7+
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/d.cpp -o %t.dir/libdevice_d.%{dynamic_lib_suffix}
8+
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/c.cpp %if windows %{%t.dir/libdevice_d.lib%} -o %t.dir/libdevice_c.%{dynamic_lib_suffix}
9+
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/b.cpp %if windows %{%t.dir/libdevice_c.lib%} -o %t.dir/libdevice_b.%{dynamic_lib_suffix}
10+
// RUN: %clangxx %{dynamic_lib_options} %S/Inputs/a.cpp %if windows %{%t.dir/libdevice_b.lib%} -o %t.dir/libdevice_a.%{dynamic_lib_suffix}
1211

13-
// RUN: %clangxx -fsycl %{sycl_target_opts} -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel %S/Inputs/basic.cpp -o %t.out \
12+
// RUN: %clangxx -fsycl %{sycl_target_opts} -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel %S/Inputs/basic.cpp -o %t.dir/%{t:stem}.out \
1413
// RUN: %if windows \
15-
// RUN: %{%{tdir}/libdevice_a.lib%} \
14+
// RUN: %{%t.dir/libdevice_a.lib%} \
1615
// RUN: %else \
17-
// RUN: %{-L%{tdir} -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%{tdir}%}
16+
// RUN: %{-L%t.dir -ldevice_a -ldevice_b -ldevice_c -ldevice_d -Wl,-rpath=%t.dir%}
1817

19-
// RUN: %{run} %t.out
18+
// RUN: %{run} %t.dir/%{t:stem}.out
2019

2120
// XFAIL: target-native_cpu
2221
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142

‎sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
// Test -fsycl-allow-device-image-dependencies with a single dynamic library on Windows
22
// and Linux.
33

4-
// DEFINE: %{tdir} = %t/..
5-
// RUN: mkdir -p %{tdir}
4+
// RUN: rm -rf %t.dir; mkdir -p %t.dir
65
// RUN: %clangxx -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
76
// RUN: %S/Inputs/a.cpp \
87
// RUN: %S/Inputs/b.cpp \
98
// RUN: %S/Inputs/c.cpp \
109
// RUN: %S/Inputs/d.cpp \
1110
// RUN: %S/Inputs/wrapper.cpp \
12-
// RUN: -o %if windows %{%{tdir}/device_single.dll%} %else %{%{tdir}/libdevice_single.so%}
11+
// RUN: -o %if windows %{%t.dir/device_single.dll%} %else %{%t.dir/libdevice_single.so%}
1312

14-
// RUN: %{build} -I%S/Inputs -o %t.out \
13+
// RUN: %{build} -I%S/Inputs -o %t.dir/%{t:stem}.out \
1514
// RUN: %if windows \
16-
// RUN: %{%{tdir}/device_single.lib%} \
15+
// RUN: %{%t.dir/device_single.lib%} \
1716
// RUN: %else \
18-
// RUN: %{-L%{tdir} -ldevice_single -Wl,-rpath=%{tdir}%}
17+
// RUN: %{-L%t.dir -ldevice_single -Wl,-rpath=%t.dir%}
1918

20-
// RUN: %{run} %t.out
19+
// RUN: %{run} %t.dir/%{t:stem}.out
2120

2221
// XFAIL: target-native_cpu
2322
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142

0 commit comments

Comments
 (0)