[SYCL][E2E] Replace TEMPORARY_DISABLED by UNSUPPORTED (#15946)

KornevNikita · web-flow · commit 75f476d66b92 · 2024-11-12T15:22:34.000Z
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".
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 // UNSUPPORTED: cuda || hip
 // CUDA and HIP compilation and runtime do not yet support sub-groups.
 //
diff --git a/sycl/test-e2e/Basic/image/image_accessor_range.cpp b/sycl/test-e2e/Basic/image/image_accessor_range.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-ext_intel_legacy_image
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 
 // UNSUPPORTED: cuda || hip
 // CUDA does not support SYCL 1.2.1 images.
diff --git a/sycl/test-e2e/GroupAlgorithm/barrier.cpp b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
@@ -1,6 +1,6 @@
 // Temporarily disabled due to regressions introduced by
 // https://github.com/intel/llvm/pull/8412.
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 
 // RUN: %{build} -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 //
 // Check that full compilation works:
 // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../popcnt.cpp -o %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 //
 // Check that full compilation works:
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
diff --git a/sycl/test-e2e/README.md b/sycl/test-e2e/README.md
@@ -369,3 +369,13 @@ temporarily disabled due to some issue.
 If you add `UNSUPPORTED` without `UNSUPPORTED-TRACKER` or `UNSUPPORTED-INTENDED`
 directive, the `no-unsupported-without-tracker.cpp` test will fail, notifying
 you about that.
+
+To disable the test completely, you can use:
+```
+// USNUPPORTED: true
+```
+
+Note: please avoid using `REQUIRES: TEMPORARY_DISABLED` for this purpose, it's
+a non-standard mechanism. Use `UNSUPPORTED: true` instead, we track
+`UNSUPPORTED` tests using the mechanism described above. Otherwise the test
+risks remaining untraceable.
diff --git a/sycl/test-e2e/Regression/complex_global_object.cpp b/sycl/test-e2e/Regression/complex_global_object.cpp
@@ -6,8 +6,8 @@
 // such objects do not cause problems if the first call to SYCL is inside main
 // and the last call is in global destructor.
 
-// REQUIRES: TEMPORARY_DISABLED
 // Disable test due to flacky failures
+// UNSUPPORTED: true
 
 #include <sycl/detail/core.hpp>
 
diff --git a/sycl/test-e2e/Regression/event_destruction.cpp b/sycl/test-e2e/Regression/event_destruction.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 // Temporarily disabled because the test is out of time
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Regression/local-arg-align.cpp b/sycl/test-e2e/Regression/local-arg-align.cpp
@@ -2,8 +2,8 @@
 //
 // RUN: %{run} %t.out
 
-// https://github.com/intel/llvm/issues/10682
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/10682
 
 //==-- local-arg-align.cpp - Test for local argument alignmnent ------------==//
 //
diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: ocloc, gpu, TEMPORARY_DISABLED
+// UNSUPPORTED: true
+// REQUIRES: ocloc, gpu
 // UNSUPPORTED: cuda
 // CUDA is not compatible with SPIR.
 //
diff --git a/sycl/test-e2e/SubGroup/generic_reduce.cpp b/sycl/test-e2e/SubGroup/generic_reduce.cpp
@@ -5,7 +5,7 @@
 // by the reduce functions in SYCL 2020, but the standard C++ syntax is used for
 // forward compatibility with future SYCL versions.
 //
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: true
 
 #include "helper.hpp"
 #include <complex>
diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp
@@ -54,7 +54,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 477
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 486
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.
@@ -78,13 +78,15 @@
 // CHECK-NEXT: Basic/build_log.cpp
 // CHECK-NEXT: Basic/code_location_e2e.cpp
 // CHECK-NEXT: Basic/free_function_queries/free_function_queries.cpp
+// CHECK-NEXT: Basic/free_function_queries/free_function_queries.cpp
 // CHECK-NEXT: Basic/free_function_queries/free_function_queries_sub_group.cpp
 // CHECK-NEXT: Basic/free_function_queries/free_function_queries_sub_group.cpp
 // CHECK-NEXT: Basic/gpu_max_wgs_error.cpp
 // CHECK-NEXT: Basic/group_async_copy.cpp
 // CHECK-NEXT: Basic/host-task-dependency.cpp
 // CHECK-NEXT: Basic/image/image.cpp
 // CHECK-NEXT: Basic/image/image_accessor_range.cpp
+// CHECK-NEXT: Basic/image/image_accessor_range.cpp
 // CHECK-NEXT: Basic/image/image_accessor_readsampler.cpp
 // CHECK-NEXT: Basic/image/image_accessor_readwrite.cpp
 // CHECK-NEXT: Basic/image/image_accessor_readwrite_half.cpp
@@ -242,13 +244,16 @@
 // CHECK-NEXT: Graph/RecordReplay/work_group_size_prop.cpp
 // CHECK-NEXT: Graph/UnsupportedDevice/device_query.cpp
 // CHECK-NEXT: GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp
+// CHECK-NEXT: GroupAlgorithm/barrier.cpp
 // CHECK-NEXT: GroupAlgorithm/reduce_sycl2020.cpp
 // CHECK-NEXT: GroupAlgorithm/root_group.cpp
 // CHECK-NEXT: HierPar/hier_par_wgscope.cpp
 // CHECK-NEXT: HostInteropTask/host-task-failure.cpp
 // CHECK-NEXT: HostInteropTask/interop-task.cpp
 // CHECK-NEXT: InOrderEventsExt/get_last_event.cpp
 // CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/SPMD_invoke_ESIMD_external.cpp
+// CHECK-NEXT: InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
+// CHECK-NEXT: InvokeSimd/Feature/popcnt.cpp
 // CHECK-NEXT: InvokeSimd/Regression/ImplicitSubgroup/call_vadd_1d_spill.cpp
 // CHECK-NEXT: InvokeSimd/Regression/call_vadd_1d_spill.cpp
 // CHECK-NEXT: KernelAndProgram/build-log.cpp
@@ -437,6 +442,8 @@
 // CHECK-NEXT: Regression/DAE-separate-compile.cpp
 // CHECK-NEXT: Regression/acos.cpp
 // CHECK-NEXT: Regression/barrier_waitlist_with_interop_event.cpp
+// CHECK-NEXT: Regression/complex_global_object.cpp
+// CHECK-NEXT: Regression/event_destruction.cpp
 // CHECK-NEXT: Regression/get_subgroup_sizes.cpp
 // CHECK-NEXT: Regression/get_subgroup_sizes.cpp
 // CHECK-NEXT: Regression/image_access.cpp
@@ -471,7 +478,9 @@
 // CHECK-NEXT: SpecConstants/2020/kernel-bundle-api.cpp
 // CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
 // CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
+// CHECK-NEXT: SpecConstants/2020/non_native/gpu.cpp
 // CHECK-NEXT: SpecConstants/2020/non_native/multiple-targets.cpp
+// CHECK-NEXT: SubGroup/generic_reduce.cpp
 // CHECK-NEXT: Tracing/code_location_queue_copy.cpp
 // CHECK-NEXT: Tracing/code_location_queue_parallel_for.cpp
 // CHECK-NEXT: Tracing/code_location_queue_submit.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// REQUIRES: TEMPORARY_DISABLED`
	`1`	`+// UNSUPPORTED: true`
`2`	`2`	`// Temporarily disabled because the test is out of time`
`3`	`3`	`// RUN: %{build} -o %t.out`
`4`	`4`	`// RUN: %{run} %t.out`