apply suggestion

Author: KornevNikita

sycl/test-e2e/Basic/kernel_max_wg_size.cpp

@@ -5,9 +5,9 @@
 // https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/experimental/sycl_ext_intel_grf_size.asciidoc
 // REQUIRES: arch-intel_gpu_pvc || gpu-intel-dg2
 // UNSUPPORTED: cuda || hip
-// UNSUPPORTED-TRACKER: INTENDED - This extension is currently implemented in
-// DPC++ only for Intel GPU devices and only when using the Level Zero backend
-// or OpenCL backend.
+// UNSUPPORTED-INTENDED: This extension is currently implemented in DPC++ only
+// for Intel GPU devices and only when using the Level Zero backend or OpenCL
+// backend.
 
 // clang-format off
 #include <sycl/detail/core.hpp>

sycl/test-e2e/README.md

@@ -353,29 +353,20 @@ Some tests may be considered unsupported, e.g.:
 * 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
-followed by `UNSUPPORTED-TRACKER`. There are two options:
-```
-UNSUPPORTED-TRACKER: INTENDED - <Free-text with reason why it's not intended to be supported on the given feature.>
-UNSUPPORTED-TRACKER: <github issue link / internal number>
-```
-
-In the first case it should look like:
+followed by either `UNSUPPORTED-INTENDED` or `UNSUPPORTED-TRACKER` depending on
+whether the test is not intended to be run with some feature at all or it was
+temporarily disabled due to some issue.
 ```
 // UNSUPPORTED: cuda, hip
-// UNSUPPORTED-TRACKER: INTENDED - only supported by backends with SPIR-V IR
+// UNSUPPORTED-INTENDED: only supported by backends with SPIR-V IR
 
-// UNSUPPORTED: gpu
-// UNSUPPORTED-TRACKER: INTENDED - the feature works only on CPU & FPGA
-```
-
-For the second case the tracker should be provided:
-```
 // Sporadically fails on DG2.
 // UNSUPPORTED: gpu-intel-dg2
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/DDDDD
 // *OR*
 // UNSUPPORTED-TRACKER: PRJ-1234
 ```
 
-If you add `UNSUPPORTED` without `UNSUPPORTED-TRACKER` directive,
-`no-unsupported-without-tracker.cpp` test will fail, notifying you about that.
+If you add `UNSUPPORTED` without `UNSUPPORTED-TRACKER` or `UNSUPPORTED-INTENDED`
+directive, the `no-unsupported-without-tracker.cpp` test will fail, notifying
+you about that.

sycl/test/no-unsupported-without-tracker.cpp renamed to sycl/test/no-unsupported-without-info.cpp

@@ -1,39 +1,39 @@
-// This test is intended to ensure that we have no trackers marked as
-// UNSUPPORTED without a tracker information added to a test.
+// This test is intended to ensure that we have no tests marked as
+// UNSUPPORTED without an information added to a test.
 // For more info see: sycl/test-e2e/README.md
 //
 // The format we check is:
 // UNSUPPORTED: lit,features
-// UNSUPPORTED-TRACKER: [GitHub issue URL|Internal tracker ID|INTENDED - reason]
+// UNSUPPORTED-TRACKER: [GitHub issue URL|Internal tracker ID]
+// *OR*
+// UNSUPPORTED: lit,features
+// UNSUPPORTED-INTENDED: explanation why the test isn't intended to be run with this feature
 //
 // GitHub issue URL format:
 //     https://github.com/owner/repo/issues/12345
 //
 // Internal tracker ID format:
 //     PROJECT-123456
 //
-// Reason format:
-//     Just a free form text
-//
 // REQUIRES: linux
 //
 // Explanation of the command:
 // - search for all "UNSUPPORTED" occurrences, display line with match and the next one
 //   -I, --include to drop binary files and other unrelated files
 // - in the result, search for "UNSUPPORTED" again, but invert the result - this
 //   allows us to get the line *after* UNSUPPORTED
-// - in those lines, check that UNSUPPORTED-TRACKER is present and correct. Once
-//   again, invert the search to get all "bad" lines and save the test names in
-//   the temp file
+// - in those lines, check that UNSUPPORTED-TRACKER or UNSUPPORTED-INTENDED is
+//   present and correct. Once again, invert the search to get all "bad" lines
+//   and save the test names in the temp file
 // - make a final count of how many ill-formatted directives there are and
 //   verify that against the reference
 // - ...and check if the list of improperly UNSUPPORTED tests needs to be updated.
 //
 // RUN: grep -rI "UNSUPPORTED:" %S/../test-e2e \
 // RUN: -A 1 --include=*.c --include=*.cpp --no-group-separator | \
 // RUN: grep -v "UNSUPPORTED:" | \
-// RUN: grep -Pv "UNSUPPORTED-TRACKER:\s+(?:https://github.com/[\w\d-]+/[\w\d-]+/issues/[\d]+)|(?:[\w]+-[\d]+)|(?:INTENDED\s*-\s*.+)" > %t | \
-// RUN: cat %t | wc -l | FileCheck %s --check-prefix NUMBER-OF-UNSUPPORTED-WITHOUT-TRACKER
+// RUN: grep -Pv "UNSUPPORTED-TRACKER:\s+(?:https://github.com/[\w\d-]+/[\w\d-]+/issues/[\d]+)|(?:[\w]+-[\d]+)|(?:UNSUPPORTED-INTENDED:\s*.+)" > %t | \
+// RUN: cat %t | wc -l | FileCheck %s --check-prefix NUMBER-OF-UNSUPPORTED-WITHOUT-INFO
 // RUN: cat %t | sed 's/\.cpp.*/.cpp/' | sort | FileCheck %s
 //
 // The number below is a number of tests which are *improperly* UNSUPPORTED, i.e.
@@ -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-TRACKER: 484
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 484
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been propely UNSUPPORTED.