Skip to content

Commit a99eae6

Browse files
authored
[SYCL][E2E] Cleanup DeviceImageDependencies unsupported (#19016)
This feature is not supported on CUDA and HIP. There was only one test without the unsupported directive, the `free_function_kernels.cpp` test, but this is also tested in `KernelAndProgram` without the image dependency flag and more thoroughly. So since the feature is unsupported anyway it makes sense to disable it as well.
1 parent 7f76000 commit a99eae6

File tree

11 files changed

+3
-26
lines changed

11 files changed

+3
-26
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Test -fsycl-allow-device-image-dependencies with dynamic libraries.
22

3-
// UNSUPPORTED: target-nvidia || target-amd
4-
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.
5-
63
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
74
// DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
85

sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// REQUIRES: aspect-fp64
2-
// UNSUPPORTED: target-amd || target-nvidia
3-
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.
42

53
// DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
64

sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/objects.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Test -fsycl-allow-device-image-dependencies with objects.
22

3-
// UNSUPPORTED: target-nvidia || target-amd
4-
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.
5-
63
// RUN: %clangxx --offload-new-driver -fsycl %S/Inputs/a.cpp -I %S/Inputs -c -o %t_a.o
74
// RUN: %clangxx --offload-new-driver -fsycl %S/Inputs/b.cpp -I %S/Inputs -c -o %t_b.o
85
// RUN: %clangxx --offload-new-driver -fsycl %S/Inputs/c.cpp -I %S/Inputs -c -o %t_c.o

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

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

4-
// UNSUPPORTED: target-nvidia || target-amd
5-
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.
6-
74
// RUN: %clangxx --offload-new-driver -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
85
// RUN: %S/Inputs/a.cpp \
96
// RUN: %S/Inputs/b.cpp \

sycl/test-e2e/DeviceImageDependencies/dynamic.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Test -fsycl-allow-device-image-dependencies with dynamic libraries.
22

3-
// UNSUPPORTED: target-nvidia || target-amd
4-
53
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
64
// DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
75

sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Test device image linking when using dynamic libraries when one of
22
// the device image is compressed and the other is not.
33

4-
// UNSUPPORTED: target-nvidia || target-amd
5-
// UNSUPPORTED-INTENDED: Linking using dynamic libraries is not supported on AMD
6-
// and Nvidia.
74
// REQUIRES: zstd
85

96
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Device image dependencies aren't supported on Nvidia and AMD
2+
config.unsupported_features += ['target-nvidia', 'target-amd']

sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// REQUIRES: aspect-fp64
2-
// UNSUPPORTED: target-amd || target-nvidia
32

43
// DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
54

sycl/test-e2e/DeviceImageDependencies/objects.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Test -fsycl-allow-device-image-dependencies with objects.
22

3-
// UNSUPPORTED: target-nvidia || target-amd
4-
53
// RUN: %clangxx -fsycl %S/Inputs/a.cpp -I %S/Inputs -c -o %t_a.o
64
// RUN: %clangxx -fsycl %S/Inputs/b.cpp -I %S/Inputs -c -o %t_b.o
75
// RUN: %clangxx -fsycl %S/Inputs/c.cpp -I %S/Inputs -c -o %t_c.o

sycl/test-e2e/DeviceImageDependencies/singleDynamicLibrary.cpp

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

4-
// UNSUPPORTED: target-nvidia || target-amd
5-
64
// RUN: %clangxx -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs \
75
// RUN: %S/Inputs/a.cpp \
86
// RUN: %S/Inputs/b.cpp \

sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
// tests to match the required format and in that case you should just update
5555
// (i.e. reduce) the number and the list below.
5656
//
57-
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 252
57+
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 248
5858
//
5959
// List of improperly UNSUPPORTED tests.
6060
// Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -92,10 +92,6 @@
9292
// CHECK-NEXT: Basic/kernel_info_attr.cpp
9393
// CHECK-NEXT: Basic/submit_time.cpp
9494
// CHECK-NEXT: DeprecatedFeatures/DiscardEvents/discard_events_using_assert.cpp
95-
// CHECK-NEXT: DeviceImageDependencies/dynamic.cpp
96-
// CHECK-NEXT: DeviceImageDependencies/math_device_lib.cpp
97-
// CHECK-NEXT: DeviceImageDependencies/objects.cpp
98-
// CHECK-NEXT: DeviceImageDependencies/singleDynamicLibrary.cpp
9995
// CHECK-NEXT: DeviceLib/built-ins/printf.cpp
10096
// CHECK-NEXT: DeviceLib/cmath-aot.cpp
10197
// CHECK-NEXT: DeviceLib/imf_bfloat16_integeral_convesions.cpp

0 commit comments

Comments
 (0)