Skip to content

Commit 5d9fd66

Browse files
authored
[SYCL][E2E] Cleanup some UNSUPPORTED tests (#17143)
This patch mostly focuses on UNSUPPORTED related to CUDA and HIP, most of the changes here fall into one of the following category: * Use `target-spir` for tests hardcoding spir triples * Re-enable tests that had opaque pointer issues * Enable tests that are now passing * Fix formatting of unsupported info * Remove unsupported already covered by requires
1 parent 1d5076f commit 5d9fd66

File tree

29 files changed

+32
-96
lines changed

29 files changed

+32
-96
lines changed

sycl/test-e2e/AOT/early_aot.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Test early-AOT behaviors with -fsycl -fno-sycl-rdc. This targets spir64_gen
22

3-
// REQUIRES: ocloc, gpu
4-
// UNSUPPORTED: cuda, hip
3+
// REQUIRES: ocloc, gpu, target-spir
54

65
// Build the early AOT device binaries
76
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts -fno-sycl-rdc -c -DADD_CPP %s -o %t_add.o

sycl/test-e2e/AOT/gpu.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
//
77
//===---------------------------------------------------------------------===//
88

9-
// REQUIRES: ocloc, gpu
10-
// UNSUPPORTED: cuda, hip
11-
// CUDA, HIP are not compatible with SPIR.
9+
// REQUIRES: ocloc, gpu, target-spir
1210
//
1311
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %S/Inputs/aot.cpp -o %t.out
1412
// RUN: %{run} %t.out

sycl/test-e2e/AOT/multiple-devices.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// REQUIRES: opencl-aot, ocloc, cpu, gpu
10-
// UNSUPPORTED: cuda
11-
// CUDA is not compatible with SPIR.
9+
// REQUIRES: opencl-aot, ocloc, cpu, gpu, target-spir
1210

1311
// Produce a fat object for all targets (generic SPIR-V, CPU, GPU)
1412
// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64,spir64_gen %S/Inputs/aot.cpp -c -o %t.o

sycl/test-e2e/Adapters/sycl-ls-gpu-default-any.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// RUN: %{run-unfiltered-devices} env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose | \
55
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM
66

7-
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}{{Level-Zero|CUDA|OpenCL}}
7+
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}{{Level-Zero|CUDA|OpenCL|HIP}}
88
// clang-format off
9-
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}{{Level-Zero|CUDA|OpenCL}}
9+
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}{{Level-Zero|CUDA|OpenCL|HIP}}
1010
// clang-format on
1111

1212
//==--------------------- sycl-ls-gpu-default-any.cpp ----------------------==//
@@ -19,4 +19,3 @@
1919

2020
// This test checks that a valid GPU is returned by sycl-ls by default if one
2121
// is present.
22-
// UNSUPPORTED: hip

sycl/test-e2e/Adapters/sycl-ls.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@
99
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1010
//
1111
//===----------------------------------------------------------------------===//
12-
// The test crashed on CUDA CI machines with the latest OpenCL GPU RT
13-
// (21.19.19792).
14-
// UNSUPPORTED: cuda

sycl/test-e2e/AddressCast/static_address_cast.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// OpGenericCastToPtr* intrinsics not implemented on AMD or NVIDIA
10-
// UNSUPPORTED: hip, cuda
119
// RUN: %{build} -o %t.out
1210
// RUN: %{run} %t.out
1311

sycl/test-e2e/BFloat16/bfloat16_vec.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// TODO enable opaque pointers support on CPU.
10-
// UNSUPPORTED: cpu
11-
129
// RUN: %{build} -o %t.out
1310
// RUN: %{run} %t.out
1411
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}

sycl/test-e2e/Basic/code_location_e2e.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
31
// RUN: %{build} -DNDEBUG -o %t1.out
42
// RUN: %{run} %t1.out | FileCheck %s
53

sycl/test-e2e/Basic/multisource_spv_obj.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: target-nvidia || target-amd
9+
// REQUIRES: target-spir
1010
//
1111
// Separate kernel sources and host code sources
1212
// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL

sycl/test-e2e/Basic/spirv_device_obj_smoke.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
1+
// REQUIRES: target-spir
22
// RUN: %clangxx -fsycl -fsycl-device-obj=spirv -c -o %t.o %s
33
// RUN: %clangxx -fsycl -Wno-unused-command-line-argument -o %t.out %t.o
44
// RUN: %{run} %t.out

0 commit comments

Comments
 (0)