[SYCL][E2E] Update some incompatible requirements (#18007)

These test are never launched due to the REQUIRES set.

Author: KornevNikita

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

@@ -6,26 +6,26 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, ocloc, cpu, gpu, target-spir, opencl-cpu-rt
+// REQUIRES: opencl-aot, ocloc, any-device-is-cpu, any-device-is-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
 
 // CPU, GPU
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %t.o -o %t_cpu_gpu.out
-// RUN: %if gpu || cpu %{ %{run} %t_cpu_gpu.out %}
+// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %t.o -o %t_cpu_gpu.out
+// RUN: %{run} %t_cpu_gpu.out
 
 // No AOT-compiled image for CPU
 // RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %t.o -o %t_spv_gpu.out
 // Check that execution on AOT-compatible devices is unaffected
-// RUN: %{run} %t_spv_gpu.out
+// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t_spv_gpu.out
 
 // No AOT-compiled image for GPU
-// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64 %t.o -o %t_spv_cpu.out
+// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64 %t.o -o %t_spv_cpu.out
 // Check that execution on AOT-compatible devices is unaffected
-// RUN: %{run} %t_spv_cpu.out
+// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t_spv_cpu.out
 
 // No AOT-compiled image for FPGA
-// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %t.o -o %t_spv_cpu_gpu.out
+// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64,spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %t.o -o %t_spv_cpu_gpu.out
 // Check that execution on AOT-compatible devices is unaffected
 // RUN: %{run} %t_spv_cpu_gpu.out

sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp

@@ -1,6 +1,6 @@
-// REQUIRES: linux, cpu && (gpu && level_zero)
+// REQUIRES: linux, cpu, any-device-is-level_zero
 // RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t
-// RUN: env UR_LAYER_ASAN_OPTIONS="detect_kernel_arguments:1" %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s
+// RUN: env UR_LAYER_ASAN_OPTIONS="detect_kernel_arguments:1" %{run-unfiltered-devices} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s
 
 #include <sycl/detail/core.hpp>
 

sycl/test-e2e/USM/multictxt.cpp

@@ -1,7 +1,7 @@
-// RUN: %{build} -o %t1.out
-// RUN: %{run-unfiltered-devices} %t1.out
+// RUN: %{build} -o %t.out
+// RUN: %{run-unfiltered-devices} %t.out
 
-// REQUIRES: cpu, gpu
+// REQUIRES: cpu, any-device-is-gpu
 
 //==----------------- multictxt.cpp - Multi Context USM test ---------------==//
 //