[SYCL][TEST E2E] Remove %sycl_be substitution (#9190)

We have %BE_RUN_PLACEHOLDER substitution that can be used instead.

Author: aelovikov-intel

sycl/test-e2e/Basic/aspects.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' %t.out
+// RUN: %BE_RUN_PLACEHOLDER %t.out
 //
 // Hip is missing some of the parameters tested here so it fails with NVIDIA
 // XFAIL: hip_nvidia

sycl/test-e2e/Basic/context_platforms.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' %t.out
+// RUN: %BE_RUN_PLACEHOLDER %t.out
 #include <iostream>
 #include <sycl/sycl.hpp>
 

sycl/test-e2e/Basic/diagnostics/device-check.cpp

@@ -1,14 +1,14 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=cpu %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=gpu %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=acc %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=CPU %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=GPU %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=ACC %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=Cpu %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=Gpu %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=Acc %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' SYCL_DEVICE_TYPE=XPU %t.out
+// RUN: env SYCL_DEVICE_TYPE=cpu %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=gpu %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=acc %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=CPU %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=GPU %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=ACC %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=Cpu %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=Gpu %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=Acc %BE_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_DEVICE_TYPE=XPU %BE_RUN_PLACEHOLDER %t.out
 
 //==------------------- device-check.cpp --------------------------==//
 // This is a diagnostic test which ensures that

sycl/test-e2e/DeprecatedFeatures/platform.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR='%sycl_be:*' %t.out
+// RUN: %BE_RUN_PLACEHOLDER %t.out
 //==--------------- platform.cpp - SYCL platform test ----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test-e2e/Plugin/interop-l0-direct.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %GPU_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: ze_debug-1,ze_debug4
 
 #include <iostream>

sycl/test-e2e/Plugin/interop-level-zero-get-native-mem.cpp

@@ -3,7 +3,7 @@
 // account direct calls to L0 API.
 // UNSUPPORTED: ze_debug-1,ze_debug4
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 // Test get_native_mem for the Level Zero backend.
 

sycl/test-e2e/Plugin/interop-level-zero-interop-task-mem-buffer.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 // Test for Level Zero interop_task for buffer.
 // Level-Zero

sycl/test-e2e/Plugin/interop-level-zero-interop-task-mem-image.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // UNSUPPORTED: gpu-intel-pvc
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 // Test for Level Zero interop_task for image.
 // Level-Zero

sycl/test-e2e/Plugin/interop-level-zero-keep-ownership.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options
-// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 // Test for Level Zero interop API where SYCL RT doesn't take ownership
 

sycl/test-e2e/Plugin/interop-level-zero.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_BE=PI_LEVEL_ZERO SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
+// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: ze_debug-1,ze_debug4
 
 // Test for Level Zero interop API

sycl/test-e2e/Scheduler/MultipleDevices.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="%sycl_be:*" %t.out
+// RUN: %BE_RUN_PLACEHOLDER %t.out
 //
 // XFAIL: hip_nvidia
 

sycl/test-e2e/lit.cfg.py

@@ -243,7 +243,6 @@
 
 lit_config.note("Backend: {BACKEND}".format(BACKEND=config.sycl_be))
 
-config.substitutions.append( ('%sycl_be', config.sycl_be) )
 # Use short names for LIT rules
 config.available_features.add(config.sycl_be.replace('ext_intel_', '').replace('ext_oneapi_', ''))
 be_run_substitute = "env ONEAPI_DEVICE_SELECTOR='{SYCL_PLUGIN}:* '".format(SYCL_PLUGIN=config.sycl_be)