From bbd97c50b01d18a00dddc0c271e9599f684a0dad Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Thu, 31 Oct 2024 10:09:11 -0700 Subject: [PATCH 1/3] [SYCL][E2E] Extend UNSUPPORTED To completely disable the test "REQUIRES: TEMPORARY_DISABLED" is used. There can be typos, lower-case style, etc, so the disabled test may be missed by grep. To unify the mechanism to disable tests this patch adds new features for `UNSUPPORTED` to disable the test. Also updating the tests using "TEMPORARY_DISABLED". --- .../free_function_queries/free_function_queries.cpp | 2 +- .../free_function_queries_sub_group.cpp | 2 +- sycl/test-e2e/Basic/image/image_accessor_range.cpp | 2 +- sycl/test-e2e/GroupAlgorithm/barrier.cpp | 2 +- .../InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp | 2 +- sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp | 2 +- sycl/test-e2e/README.md | 11 ++++++++++- sycl/test-e2e/Regression/complex_global_object.cpp | 2 +- sycl/test-e2e/Regression/event_destruction.cpp | 2 +- sycl/test-e2e/Regression/local-arg-align.cpp | 4 ++-- sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp | 3 ++- sycl/test-e2e/SubGroup/generic_reduce.cpp | 2 +- sycl/test-e2e/lit.cfg.py | 3 +++ .../no-unsupported-without-info.cpp | 11 ++++++++++- 14 files changed, 36 insertions(+), 14 deletions(-) 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 index 9fe7f0ff6cb90..3fdc4b3701b05 100644 --- 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: overall // 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 index fcbdb79a5d81f..3a83d87b9e83c 100644 --- 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: overall // 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 index 7859e7e2cb82a..bdebd8c9f7159 100644 --- 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: overall // 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 index 8fb0addcf7924..59e1329770fce 100644 --- 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: overall // 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 index 153478c11580a..bffe825cf40f0 100644 --- 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: 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 diff --git a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp index f99c6fd0e097b..732b5a17b84b4 100644 --- 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: overall // // 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 index 61215e31d3bcc..c41f3c8491194 100644 --- a/sycl/test-e2e/README.md +++ b/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. diff --git a/sycl/test-e2e/Regression/complex_global_object.cpp b/sycl/test-e2e/Regression/complex_global_object.cpp index a65545b499eb9..65f417c0a0d66 100644 --- 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: flaky #include diff --git a/sycl/test-e2e/Regression/event_destruction.cpp b/sycl/test-e2e/Regression/event_destruction.cpp index 737535835a28c..bb1a5f1ff5275 100644 --- a/sycl/test-e2e/Regression/event_destruction.cpp +++ b/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 diff --git a/sycl/test-e2e/Regression/local-arg-align.cpp b/sycl/test-e2e/Regression/local-arg-align.cpp index 8bed2ddb2074d..3513679d2e800 100644 --- 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: overall +// 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 index 907f71ee3800b..773bb4455c4d8 100644 --- 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: overall +// 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 index e158663479ed9..464c2a4e8a406 100644 --- 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: overall #include "helper.hpp" #include diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index ee91220fd3be3..a3b6d5078e77e 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/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")) diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp index 3027df71808ea..518cb79a0bb3a 100644 --- 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: 487 +// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 496 // // List of improperly UNSUPPORTED tests. // Remove the CHECK once the test has been properly UNSUPPORTED. @@ -78,6 +78,7 @@ // 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 @@ -85,6 +86,7 @@ // 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 @@ -252,6 +254,7 @@ // 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 @@ -259,6 +262,8 @@ // 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 @@ -447,6 +452,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 @@ -481,7 +488,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 From 67f66ab55076ead0e2325f08e799967d305d8c2f Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Mon, 4 Nov 2024 12:51:57 -0800 Subject: [PATCH 2/3] use to disable tests --- .../Basic/free_function_queries/free_function_queries.cpp | 2 +- .../free_function_queries_sub_group.cpp | 2 +- sycl/test-e2e/Basic/image/image_accessor_range.cpp | 2 +- sycl/test-e2e/GroupAlgorithm/barrier.cpp | 2 +- .../InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp | 2 +- sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp | 2 +- sycl/test-e2e/README.md | 7 +++---- sycl/test-e2e/Regression/complex_global_object.cpp | 2 +- sycl/test-e2e/Regression/event_destruction.cpp | 2 +- sycl/test-e2e/Regression/local-arg-align.cpp | 2 +- sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp | 2 +- sycl/test-e2e/SubGroup/generic_reduce.cpp | 2 +- sycl/test-e2e/lit.cfg.py | 3 --- 13 files changed, 14 insertions(+), 18 deletions(-) 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 index 3fdc4b3701b05..0dfbf9cc0d32b 100644 --- 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 -// UNSUPPORTED: overall +// 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 index 3a83d87b9e83c..4cbbb5555649e 100644 --- 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 -// UNSUPPORTED: overall +// 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 index bdebd8c9f7159..06302f80e2e6a 100644 --- 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 -// UNSUPPORTED: overall +// 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 index 59e1329770fce..bb3940397fd70 100644 --- 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. -// UNSUPPORTED: overall +// 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 index bffe825cf40f0..83d94c4adcfec 100644 --- 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 -// UNSUPPORTED: overall +// 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 index 732b5a17b84b4..ab5a3afc1dc62 100644 --- 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 -// UNSUPPORTED: overall +// 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 index c41f3c8491194..7d653e7de83a4 100644 --- a/sycl/test-e2e/README.md +++ b/sycl/test-e2e/README.md @@ -372,9 +372,8 @@ you about that. To disable the test completely, you can use: ``` -// USNUPPORTED: overall *OR* hangs *OR* flaky +// USNUPPORTED: true ``` -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. +Note: please avoid using `REQUIRES: TEMPORARY_DISABLED` for this purpose, it's +a non-standard mechanism. Use `UNSUPPORTED: true` instead. diff --git a/sycl/test-e2e/Regression/complex_global_object.cpp b/sycl/test-e2e/Regression/complex_global_object.cpp index 65f417c0a0d66..06a7187a46926 100644 --- a/sycl/test-e2e/Regression/complex_global_object.cpp +++ b/sycl/test-e2e/Regression/complex_global_object.cpp @@ -7,7 +7,7 @@ // and the last call is in global destructor. // Disable test due to flacky failures -// UNSUPPORTED: flaky +// UNSUPPORTED: true #include diff --git a/sycl/test-e2e/Regression/event_destruction.cpp b/sycl/test-e2e/Regression/event_destruction.cpp index bb1a5f1ff5275..8a6635cdaacac 100644 --- a/sycl/test-e2e/Regression/event_destruction.cpp +++ b/sycl/test-e2e/Regression/event_destruction.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: overall +// 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 index 3513679d2e800..b0e7336e14d33 100644 --- a/sycl/test-e2e/Regression/local-arg-align.cpp +++ b/sycl/test-e2e/Regression/local-arg-align.cpp @@ -2,7 +2,7 @@ // // RUN: %{run} %t.out -// UNSUPPORTED: overall +// 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 index 773bb4455c4d8..286c2252b8ec9 100644 --- a/sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp +++ b/sycl/test-e2e/SpecConstants/2020/non_native/gpu.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: overall +// 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 index 464c2a4e8a406..9192c61812d22 100644 --- 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. // -// UNSUPPORTED: overall +// UNSUPPORTED: true #include "helper.hpp" #include diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index a3b6d5078e77e..ee91220fd3be3 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -789,13 +789,10 @@ 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")) From faaf532f36046e698c0d8158dfbf21a2a76266a9 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Tue, 5 Nov 2024 06:21:19 -0800 Subject: [PATCH 3/3] update readme --- sycl/test-e2e/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/README.md b/sycl/test-e2e/README.md index 7d653e7de83a4..1df9e685968f9 100644 --- a/sycl/test-e2e/README.md +++ b/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 / overall. + backend / device / OS / etc. * 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 @@ -376,4 +376,6 @@ To disable the test completely, you can use: ``` Note: please avoid using `REQUIRES: TEMPORARY_DISABLED` for this purpose, it's -a non-standard mechanism. Use `UNSUPPORTED: true` instead. +a non-standard mechanism. Use `UNSUPPORTED: true` instead, we track +`UNSUPPORTED` tests using the mechanism described above. Otherwise the test +risks remaining untraceable.