[SYCL][E2E] Replace TEMPORARY_DISABLED by UNSUPPORTED

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

@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: overall
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

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: overall
 // UNSUPPORTED: cuda || hip
 // CUDA and HIP compilation and runtime do not yet support sub-groups.
 //

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: overall
 
 // UNSUPPORTED: cuda || hip
 // CUDA does not support SYCL 1.2.1 images.

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: overall
 
 // RUN: %{build} -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80
 // RUN: %{run} %t.out

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: overall
 //
 // 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

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: overall
 //
 // Check that full compilation works:
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out

sycl/test-e2e/README.md

@@ -348,7 +348,7 @@ If you add `XFAIL` without `XFAIL-TRACKER` directive,
 
 Some tests may be considered unsupported, e.g.:
 * the test checks the feature that is not supported by some
-  backend / device / OS / etc.
+  backend / device / OS / overall.
 * the test is flaky or hangs, so it can't be marked with `XFAIL`.
 
 In these cases the test can be marked with `UNSUPPORTED`. This mark should be
@@ -369,3 +369,12 @@ 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: overall *OR* hangs *OR* flaky
+```
+See `unsupported_feature` set in sycl/test-e2e/lit.cfg.py for these features.
+
+Note: please do not use `REQUIRES: TEMPORARY_DISABLED`. Use `UNSUPPORTED`
+instead.

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: flaky
 
 #include <sycl/detail/core.hpp>
 

sycl/test-e2e/Regression/event_destruction.cpp

@@ -1,4 +1,4 @@
-// REQUIRES: TEMPORARY_DISABLED
+// UNSUPPORTED: overall
 // Temporarily disabled because the test is out of time
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

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: overall
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/10682
 
 //==-- local-arg-align.cpp - Test for local argument alignmnent ------------==//
 //

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

@@ -1,4 +1,5 @@
-// REQUIRES: ocloc, gpu, TEMPORARY_DISABLED
+// UNSUPPORTED: overall
+// REQUIRES: ocloc, gpu
 // UNSUPPORTED: cuda
 // CUDA is not compatible with SPIR.
 //

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: overall
 
 #include "helper.hpp"
 #include <complex>

sycl/test-e2e/lit.cfg.py

@@ -789,10 +789,13 @@ def open_check_file(file_name):
     aspect_features = set("aspect-" + a for a in aspects)
     sg_size_features = set("sg-" + s for s in sg_sizes)
     architecture_feature = set("arch-" + s for s in architectures)
+    # keywords to use with UNSUPPORTED to completely disable the test
+    unsupported_feature = {"hangs", "flaky", "overall"}
     features = set()
     features.update(aspect_features)
     features.update(sg_size_features)
     features.update(architecture_feature)
+    features.update(unsupported_feature)
 
     be, dev = sycl_device.split(":")
     features.add(dev.replace("fpga", "accelerator"))

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: 478
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 487
 //
 // 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
@@ -243,13 +245,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
@@ -438,6 +443,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
@@ -472,7 +479,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