some features were missing when using arch-based selection

Author: mateuszpn

sycl/test-e2e/format.py

@@ -368,6 +368,11 @@ def get_extra_env(sycl_devices):
                     "linux",
                     "windows",
                     "preview-breaking-changes-supported",
+                    # the following entries are used by architecture-based filtering
+                    # (:arch- device, not :gpu or :cpu)
+                    "cpu",
+                    "gpu",
+                    "accelerator",
                 ]:
                     if cond_features in test.config.available_features:
                         conditions[cond_features] = True

sycl/test-e2e/lit.cfg.py

@@ -1156,6 +1156,13 @@ def get_sycl_ls_verbose(sycl_device, env):
     else:
         config.intel_driver_ver[full_name] = {}
 
+# When running with a single device, merge device-specific features into global
+# available_features so that %if conditionals work correctly, even if device is not :gpu or :cpu
+if len(config.sycl_devices) == 1:
+    single_device = list(config.sycl_dev_features.keys())[0]
+    device_features = config.sycl_dev_features[single_device]
+    config.available_features.update(device_features)
+
 if lit_config.params.get("compatibility_testing", "False") != "False":
     config.substitutions.append(("%clangxx", " true "))
     config.substitutions.append(("%clang", " true "))