Skip to content

Commit 75f476d

Browse files
authored
[SYCL][E2E] Replace TEMPORARY_DISABLED by UNSUPPORTED (#15946)
To unify the mechanism to disable tests this patch replaces `REQUIRES: TEMPORARY_DISABLED` by `UNSUPPORTED: true` to disable the test. Also updating the tests using "TEMPORARY_DISABLED".
1 parent 10ed997 commit 75f476d

File tree

13 files changed

+33
-13
lines changed

13 files changed

+33
-13
lines changed

sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME: Investigate OS-agnostic failures
2-
// REQUIRES: TEMPORARY_DISABLED
2+
// UNSUPPORTED: true
33
// RUN: %{build} -o %t.out
44
// RUN: %{run} %t.out
55

sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME: Investigate OS-agnostic failures
2-
// REQUIRES: TEMPORARY_DISABLED
2+
// UNSUPPORTED: true
33
// UNSUPPORTED: cuda || hip
44
// CUDA and HIP compilation and runtime do not yet support sub-groups.
55
//

sycl/test-e2e/Basic/image/image_accessor_range.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: aspect-ext_intel_legacy_image
22
// FIXME: Investigate OS-agnostic failures
3-
// REQUIRES: TEMPORARY_DISABLED
3+
// UNSUPPORTED: true
44

55
// UNSUPPORTED: cuda || hip
66
// CUDA does not support SYCL 1.2.1 images.

sycl/test-e2e/GroupAlgorithm/barrier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Temporarily disabled due to regressions introduced by
22
// https://github.com/intel/llvm/pull/8412.
3-
// REQUIRES: TEMPORARY_DISABLED
3+
// UNSUPPORTED: true
44

55
// RUN: %{build} -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80
66
// RUN: %{run} %t.out

sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// NOTE: The feature is not yet supported, there is a discussion on the
22
// feasibility of tests
3-
// REQUIRES: TEMPORARY_DISABLED
3+
// UNSUPPORTED: true
44
//
55
// Check that full compilation works:
66
// RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../popcnt.cpp -o %t.out

sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// NOTE: The feature is not yet supported, there is a discussion on the
22
// feasibility of tests
3-
// REQUIRES: TEMPORARY_DISABLED
3+
// UNSUPPORTED: true
44
//
55
// Check that full compilation works:
66
// RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out

sycl/test-e2e/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,13 @@ temporarily disabled due to some issue.
369369
If you add `UNSUPPORTED` without `UNSUPPORTED-TRACKER` or `UNSUPPORTED-INTENDED`
370370
directive, the `no-unsupported-without-tracker.cpp` test will fail, notifying
371371
you about that.
372+
373+
To disable the test completely, you can use:
374+
```
375+
// USNUPPORTED: true
376+
```
377+
378+
Note: please avoid using `REQUIRES: TEMPORARY_DISABLED` for this purpose, it's
379+
a non-standard mechanism. Use `UNSUPPORTED: true` instead, we track
380+
`UNSUPPORTED` tests using the mechanism described above. Otherwise the test
381+
risks remaining untraceable.

sycl/test-e2e/Regression/complex_global_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// such objects do not cause problems if the first call to SYCL is inside main
77
// and the last call is in global destructor.
88

9-
// REQUIRES: TEMPORARY_DISABLED
109
// Disable test due to flacky failures
10+
// UNSUPPORTED: true
1111

1212
#include <sycl/detail/core.hpp>
1313

sycl/test-e2e/Regression/event_destruction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: TEMPORARY_DISABLED
1+
// UNSUPPORTED: true
22
// Temporarily disabled because the test is out of time
33
// RUN: %{build} -o %t.out
44
// RUN: %{run} %t.out

sycl/test-e2e/Regression/local-arg-align.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
//
33
// RUN: %{run} %t.out
44

5-
// https://github.com/intel/llvm/issues/10682
6-
// REQUIRES: TEMPORARY_DISABLED
5+
// UNSUPPORTED: true
6+
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/10682
77

88
//==-- local-arg-align.cpp - Test for local argument alignmnent ------------==//
99
//

sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// REQUIRES: ocloc, gpu, TEMPORARY_DISABLED
1+
// UNSUPPORTED: true
2+
// REQUIRES: ocloc, gpu
23
// UNSUPPORTED: cuda
34
// CUDA is not compatible with SPIR.
45
//

sycl/test-e2e/SubGroup/generic_reduce.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// by the reduce functions in SYCL 2020, but the standard C++ syntax is used for
66
// forward compatibility with future SYCL versions.
77
//
8-
// REQUIRES: TEMPORARY_DISABLED
8+
// UNSUPPORTED: true
99

1010
#include "helper.hpp"
1111
#include <complex>

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

Lines changed: 10 additions & 1 deletion
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: 477
57+
// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 486
5858
//
5959
// List of improperly UNSUPPORTED tests.
6060
// Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -78,13 +78,15 @@
7878
// CHECK-NEXT: Basic/build_log.cpp
7979
// CHECK-NEXT: Basic/code_location_e2e.cpp
8080
// CHECK-NEXT: Basic/free_function_queries/free_function_queries.cpp
81+
// CHECK-NEXT: Basic/free_function_queries/free_function_queries.cpp
8182
// CHECK-NEXT: Basic/free_function_queries/free_function_queries_sub_group.cpp
8283
// CHECK-NEXT: Basic/free_function_queries/free_function_queries_sub_group.cpp
8384
// CHECK-NEXT: Basic/gpu_max_wgs_error.cpp
8485
// CHECK-NEXT: Basic/group_async_copy.cpp
8586
// CHECK-NEXT: Basic/host-task-dependency.cpp
8687
// CHECK-NEXT: Basic/image/image.cpp
8788
// CHECK-NEXT: Basic/image/image_accessor_range.cpp
89+
// CHECK-NEXT: Basic/image/image_accessor_range.cpp
8890
// CHECK-NEXT: Basic/image/image_accessor_readsampler.cpp
8991
// CHECK-NEXT: Basic/image/image_accessor_readwrite.cpp
9092
// CHECK-NEXT: Basic/image/image_accessor_readwrite_half.cpp
@@ -242,13 +244,16 @@
242244
// CHECK-NEXT: Graph/RecordReplay/work_group_size_prop.cpp
243245
// CHECK-NEXT: Graph/UnsupportedDevice/device_query.cpp
244246
// CHECK-NEXT: GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp
247+
// CHECK-NEXT: GroupAlgorithm/barrier.cpp
245248
// CHECK-NEXT: GroupAlgorithm/reduce_sycl2020.cpp
246249
// CHECK-NEXT: GroupAlgorithm/root_group.cpp
247250
// CHECK-NEXT: HierPar/hier_par_wgscope.cpp
248251
// CHECK-NEXT: HostInteropTask/host-task-failure.cpp
249252
// CHECK-NEXT: HostInteropTask/interop-task.cpp
250253
// CHECK-NEXT: InOrderEventsExt/get_last_event.cpp
251254
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp
255+
// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
256+
// CHECK-NEXT: InvokeSimd/Feature/popcnt.cpp
252257
// CHECK-NEXT: InvokeSimd/Regression/ImplicitSubgroup/call_vadd_1d_spill.cpp
253258
// CHECK-NEXT: InvokeSimd/Regression/call_vadd_1d_spill.cpp
254259
// CHECK-NEXT: KernelAndProgram/build-log.cpp
@@ -437,6 +442,8 @@
437442
// CHECK-NEXT: Regression/DAE-separate-compile.cpp
438443
// CHECK-NEXT: Regression/acos.cpp
439444
// CHECK-NEXT: Regression/barrier_waitlist_with_interop_event.cpp
445+
// CHECK-NEXT: Regression/complex_global_object.cpp
446+
// CHECK-NEXT: Regression/event_destruction.cpp
440447
// CHECK-NEXT: Regression/get_subgroup_sizes.cpp
441448
// CHECK-NEXT: Regression/get_subgroup_sizes.cpp
442449
// CHECK-NEXT: Regression/image_access.cpp
@@ -471,7 +478,9 @@
471478
// CHECK-NEXT: SpecConstants/2020/kernel-bundle-api.cpp
472479
// CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
473480
// CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
481+
// CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
474482
// CHECK-NEXT: SpecConstants/2020/non_native/multiple-targets.cpp
483+
// CHECK-NEXT: SubGroup/generic_reduce.cpp
475484
// CHECK-NEXT: Tracing/code_location_queue_copy.cpp
476485
// CHECK-NEXT: Tracing/code_location_queue_parallel_for.cpp
477486
// CHECK-NEXT: Tracing/code_location_queue_submit.cpp

0 commit comments

Comments
 (0)