Add any-target-is- features

Author: ayylol

sycl/test-e2e/E2EExpr.py

@@ -8,6 +8,10 @@ class E2EExpr(BooleanExpression):
         "target-nvidia",
         "target-amd",
         "target-native_cpu",
+        "any-target-is-spir",
+        "any-target-is-nvidia",
+        "any-target-is-amd",
+        "any-target-is-native_cpu",
         "linux",
         "system-linux",
         "windows",

sycl/test-e2e/Regression/multiple-targets.cpp

@@ -2,17 +2,17 @@
 // It tests if the target triples can be specified with any order.
 // The test is repeated for per_kernel device code splitting.
 //
-// REQUIRES: target-nvidia || target-amd || target-native_cpu
-// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 %if any-device-is-hip %{ %{hip_arch_opts} %} -o %t1.out %s
+// REQUIRES: (target-nvidia || target-amd || target-native_cpu) && any-target-is-spir
+// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 %if any-target-is-amd %{ %{hip_arch_opts} %} -o %t1.out %s
 // RUN: %{run} %t1.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} %if any-device-is-hip %{ %{hip_arch_opts} %} -o %t2.out %s
+// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} %if any-target-is-amd %{ %{hip_arch_opts} %} -o %t2.out %s
 // RUN: %{run} %t2.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 %if any-device-is-hip %{ %{hip_arch_opts} %} -fsycl-device-code-split=per_kernel -o %t3.out %s
+// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 %if any-target-is-amd %{ %{hip_arch_opts} %} -fsycl-device-code-split=per_kernel -o %t3.out %s
 // RUN: %{run} %t3.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} %if any-device-is-hip %{ %{hip_arch_opts} %} -fsycl-device-code-split=per_kernel -o %t4.out %s
+// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} %if any-target-is-amd %{ %{hip_arch_opts} %} -fsycl-device-code-split=per_kernel -o %t4.out %s
 // RUN: %{run} %t4.out
 
 #include <sycl/detail/core.hpp>

sycl/test-e2e/format.py

@@ -288,9 +288,6 @@ def get_extra_env(sycl_devices):
 
         substitutions.append(("%{run-unfiltered-devices}", run_unfiltered_substitution))
 
-        for target in build_targets:
-            test.config.available_features.add(target)
-
         new_script = []
         for directive in script:
             if not isinstance(directive, lit.TestRunner.CommandDirective):

sycl/test-e2e/lit.cfg.py

@@ -69,7 +69,6 @@
 elif config.test_mode == "build-only":
     lit_config.note("build-only test mode enabled, only compiling tests")
     config.sycl_devices = []
-    config.sycl_build_targets = set("target-" + t for t in config.sycl_build_targets)
     if not config.amd_arch:
         config.amd_arch = "gfx1031"
 else:
@@ -697,12 +696,21 @@ def open_check_file(file_name):
             "Couldn't find pre-installed AOT device compiler " + aot_tool
         )
 
+# Clear build targets when not in build-only, to populate according to devices
+if config.test_mode != "build-only":
+    config.sycl_build_targets = set()
+
 for sycl_device in config.sycl_devices:
     be, dev = sycl_device.split(":")
     config.available_features.add("any-device-is-" + dev)
     # Use short names for LIT rules.
     config.available_features.add("any-device-is-" + be)
 
+    target = config.backend_to_target[be]
+    config.sycl_build_targets.add(target)
+
+for target in config.sycl_build_targets:
+    config.available_features.add("any-target-is-" + target.replace("target-",""))
 # That has to be executed last so that all device-independent features have been
 # discovered already.
 config.sycl_dev_features = {}

sycl/test-e2e/lit.site.cfg.py.in

@@ -31,7 +31,7 @@ config.igc_tag_file = os.path.join("/usr/local/lib/igc/", 'IGCTAG.txt')
 config.sycl_devices = lit_config.params.get("sycl_devices", "@SYCL_TEST_E2E_TARGETS@").split(';')
 
 # FIXME: current test markup only supports spir in build-only
-config.sycl_build_targets = lit_config.params.get("sycl_build_targets", "spir").split(';')
+config.sycl_build_targets = set("target-" + t for t in lit_config.params.get("sycl_build_targets", "spir").split(';'))
 
 config.amd_arch = lit_config.params.get("amd_arch", "@AMD_ARCH@")
 config.sycl_threads_lib = '@SYCL_THREADS_LIB@'