Apply suggestions

1. restore modified tests
2. use llvm-lit instead of grep
3. update a set of available features to match everything from
   lit.cfg.py

Author: KornevNikita

sycl/test-e2e/Basic/fpga_tests/fpga_aocx_win.cpp

@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, accelerator, windows
+// REQUIRES: opencl-aot, accelerator
+// REQUIRES: system-windows
 
 /// E2E test for AOCX creation/use/run for FPGA
 // Produce an archive with device (AOCX) image. To avoid appending objects to

sycl/test-e2e/Plugin/sycl-ls-gpu-default-level-zero.cpp

@@ -1,4 +1,4 @@
-// REQUIRES: gpu, level_zero
+// REQUIRES: gpu, level-zero
 
 // TODO: Remove unsetting SYCL_DEVICE_FILTER when feature is dropped
 // RUN: env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose >%t.default.out

sycl/test-e2e/Regression/msvc_crt.cpp

@@ -2,7 +2,7 @@
 // RUN: %{run} %t1.exe
 // RUN: %{build} /MDd -o %t2.exe
 // RUN: %{run} %t2.exe
-// REQUIRES: windows, cl_options
+// REQUIRES: system-windows, cl_options
 //==-------------- msvc_crt.cpp - SYCL MSVC CRT test -----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp

@@ -3,7 +3,7 @@
 // (because only SPIR-V supports specialization constants natively)
 
 // FIXME: This set is never satisfied all at once in our infrastructure.
-// REQUIRES: opencl, level_zero, cpu, gpu, opencl-aot, ocloc
+// REQUIRES: opencl, level-zero, cpu, gpu, opencl-aot, ocloc
 
 // RUN: %clangxx -fsycl -DJIT %s -o %t.out
 // RUN: %{run} %t.out

sycl/test/e2e_test_requirements/check-correctness-of-requirements.cpp

@@ -0,0 +1,13 @@
+// This test checks that all "REQUIRES", "XFAIL" and "UNSUPPORTED" strings
+// contain the right feature names.
+// If this test fails:
+// 1. there is some typo/non-existing feature request in the
+//    modified test.
+// 2. ...or, there is some new feature. In this case please update the set of
+//    features in check-correctness-of-requirements.py
+//
+// Get a set of all features passed to "REQUIRES", "XFAIL" and "UNSUPPORTED"
+// RUN: llvm-lit --show-used-features %S/../../test-e2e > %t
+//
+// Process this set using a python script as it's easier to work with sets there
+// RUN: python3 %S/check-correctness-of-requirements.py %t %sycl_include

sycl/test/e2e_test_requirements/check-correctness-of-requires.py renamed to sycl/test/e2e_test_requirements/check-correctness-of-requirements.py

@@ -1,4 +1,4 @@
-# See check-correctness-of-requires.cpp
+# See check-correctness-of-requirements.cpp
 
 import re
 import sys
@@ -19,18 +19,22 @@ def parse_requirements(input_data_path, sycl_include_dir_path):
     available_features = {
         # host OS:
         "windows",
+        "system-windows",
         "linux",
+        "system-linux",
         # target device:
         "cpu",
         "gpu",
         "accelerator",
         # target backend:
         "cuda",
         "hip",
+        "hip_amd",
+        "hip_nvidia",
         "opencl",
         "level_zero",
+        "level-zero",
         "native_cpu",
-        "hip_amd",
         # tools:
         "sycl-ls",
         "cm-compiler",
@@ -49,6 +53,8 @@ def parse_requirements(input_data_path, sycl_include_dir_path):
         "gpu-intel-dg2",
         "gpu-intel-pvc",
         "gpu-intel-pvc-vg",
+        "gpu-intel-pvc-1T",
+        "gpu-intel-pvc-2T",
         "gpu-amd-gfx90a",
         # any-device-is-:
         "any-device-is-cpu",
@@ -58,6 +64,7 @@ def parse_requirements(input_data_path, sycl_include_dir_path):
         "any-device-is-hip",
         "any-device-is-opencl",
         "any-device-is-level_zero",
+        "any-device-is-native_cpu",
         # sg-sizes (should we allow any sg-X?)
         "sg-8",
         "sg-16",
@@ -71,6 +78,9 @@ def parse_requirements(input_data_path, sycl_include_dir_path):
         "zstd",
         "preview-breaking-changes-supported",
         "vulkan",
+        "O0",
+        "ze_debug",
+        "igc-dev",
         # Note: aspects and architectures are gathered below
     }
 
@@ -96,20 +106,11 @@ def parse_requirements(input_data_path, sycl_include_dir_path):
 
     exit_code = 0
     with open(input_data_path, "r") as file:
-        for line in file:
-            # get the content of "REQUIRES: "
-            requirements = re.compile(r"// REQUIRES: (.*)").search(line)
-            # Drop all symbols except feature names
-            requirements = re.split(r"&&|\|\||, |,|\(|\)|\s+", requirements.group(1))
-            # Filter out empty names
-            requirements = [req.strip() for req in requirements if req.strip()]
-
-            for feature in requirements:
-                # some names can start with "!" e.g. "!level_zero", drop "!"
-                feature = feature.lstrip("!")
-                if not feature in available_features:
-                    exit_code = 1
-                    print(line + "contains unsupported feature: " + feature)
+        requirements = set(file.read().split())
+        for requirement in requirements:
+            if not requirement in available_features:
+                exit_code = 1
+                print("Unsupported requirement: " + requirement)
     sys.exit(exit_code)
 
 

sycl/test/e2e_test_requirements/check-correctness-of-requires.cpp

@@ -1,7 +1,7 @@
 // RUN: %clangxx -std=gnu++17 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %t.out
 
-// UNSUPPORTED: windows
+// UNSUPPORTED: system-windows
 
 #include <iostream>
 #include <sycl/sycl.hpp>