Require opencl-cpu-rt feature instead of XFAILing

Author: ayylol

sycl/test-e2e/AOT/cpu.cpp

@@ -6,10 +6,7 @@
 //
 //===---------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, cpu
-
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
+// REQUIRES: opencl-aot, cpu, opencl-cpu-rt
 
 // CPU AOT targets host isa, so we compile on the run system instead.
 // RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out

sycl/test-e2e/AOT/multiple-devices.cpp

@@ -6,10 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, ocloc, cpu, gpu, target-spir
-
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
+// REQUIRES: opencl-aot, ocloc, cpu, gpu, target-spir, opencl-cpu-rt
 
 // Produce a fat object for all targets (generic SPIR-V, CPU, GPU)
 // RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64,spir64_gen %S/Inputs/aot.cpp -c -o %t.o

sycl/test-e2e/AOT/reqd-sg-size.cpp

@@ -1,10 +1,7 @@
 // This test ensures that a program that has a kernel
 // using various required sub-group sizes can be compiled AOT.
 
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
-
-// REQUIRES: ocloc, opencl-aot, any-device-is-cpu
+// REQUIRES: ocloc, opencl-aot, any-device-is-cpu, opencl-cpu-rt
 // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp -o %t.tgllp.out %s
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
 

sycl/test-e2e/E2EExpr.py

@@ -14,6 +14,7 @@ class E2EExpr(BooleanExpression):
         "any-target-is-nvidia",
         "any-target-is-amd",
         "any-target-is-native_cpu",
+        "opencl-cpu-rt",
         "spirv-backend",
         "linux",
         "system-linux",

sycl/test-e2e/NewOffloadDriver/cpu.cpp

@@ -6,10 +6,7 @@
 //
 //===---------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, cpu
-
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
+// REQUIRES: opencl-aot, cpu, opencl-cpu-rt
 
 // CPU AOT targets host isa, so we compile on the run system instead.
 // Test with  `--offload-new-driver`

sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp

@@ -1,8 +1,4 @@
-// REQUIRES: opencl-aot, ocloc
-
-// UNSUPPORTED: windows
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// There is no CPU device on win yet, so opencl-aot fails to compile the kernel.
+// REQUIRES: opencl-aot, ocloc, opencl-cpu-rt
 
 // RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %S/Inputs/is_compatible_with_env.cpp -o %t.out
 

sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp

@@ -1,8 +1,4 @@
-// REQUIRES: opencl-aot
-
-// UNSUPPORTED: windows
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// There is no CPU device on win yet, so opencl-aot fails to compile the kernel.
+// REQUIRES: opencl-aot, opencl-cpu-rt
 
 // RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/is_compatible_with_env.cpp -o %t.out
 

sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp

@@ -1,7 +1,4 @@
-// REQUIRES: any-device-is-cpu, gpu, opencl-aot, ocloc, target-spir
-
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
+// REQUIRES: any-device-is-cpu, gpu, opencl-aot, ocloc, target-spir, opencl-cpu-rt
 
 // UNSUPPORTED: linux
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17305

sycl/test-e2e/SpecConstants/2020/non_native/multiple-targets.cpp

@@ -1,7 +1,4 @@
-// REQUIRES: opencl-aot, cpu, target-spir
-
-// XFAIL: windows && !(build-mode && run-mode)
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/17515
+// REQUIRES: opencl-aot, cpu, target-spir, opencl-cpu-rt
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64 %S/Inputs/common.cpp -o %t_spv_cpu.out
 // RUN: %{run} %t_spv_cpu.out

sycl/test-e2e/lit.cfg.py

@@ -597,13 +597,17 @@ def open_check_file(file_name):
     if "amdgcn" in sp[1]:
         config.sycl_build_targets.add("target-amd")
 
+cmd = ("{} {}".format(config.run_launcher, sycl_ls) if config.run_launcher else sycl_ls)
+sycl_ls_output = subprocess.check_output(cmd, text=True, shell=True)
+
+# In contrast to `cpu` feature this is a compile-time feature, which is needed
+# to check if we can build cpu AOT tests.
+if "opencl:cpu" in sycl_ls_output:
+    config.available_features.add("opencl-cpu-rt")
+
 if len(config.sycl_devices) == 1 and config.sycl_devices[0] == "all":
     devices = set()
-    cmd = (
-        "{} {}".format(config.run_launcher, sycl_ls) if config.run_launcher else sycl_ls
-    )
-    sp = subprocess.check_output(cmd, text=True, shell=True)
-    for line in sp.splitlines():
+    for line in sycl_ls_output.splitlines():
         if not line.startswith("["):
             continue
         (backend, device) = line[1:].split("]")[0].split(":")