[SYCL] [E2E] fix reenabled tests

Author: dklochkov-emb

sycl/test-e2e/Basic/interop/interop_all_backends.cpp

@@ -1,4 +1,4 @@
-// XFAIL: any-device-is-opencl, any-device-is-cuda, any-device-is-level_zero, gpu-intel-dg2, hip_amd
+// XFAIL: any-device-is-opencl, any-device-is-cuda, any-device-is-level_zero
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15819
 // RUN: %if any-device-is-opencl %{ %{build} -o %t-opencl.out %}
 // RUN: %if any-device-is-level_zero %{ %{build} -DBUILD_FOR_L0 -o %t-l0.out %}
@@ -12,25 +12,24 @@
 using namespace sycl;
 
 #ifdef BUILD_FOR_CUDA
-#include <sycl/ext/oneapi/experimental/backend/cuda.hpp>
 constexpr auto BACKEND = backend::ext_oneapi_cuda;
 using nativeDevice = CUdevice;
 using nativeQueue = CUstream;
 using nativeEvent = CUevent;
 #elif defined(BUILD_FOR_HIP)
 #include <sycl/ext/oneapi/backend/hip.hpp>
 constexpr auto BACKEND = backend::ext_oneapi_hip;
-using nativeDevice = hipDevice_t;
-using nativeQueue = hipStream_t;
-using nativeEvent = hipEvent_t;
+using nativeDevice = device;
+using nativeQueue = ihipStream_t;
+using nativeEvent = ihipEvent_t;
 #elif defined(BUILD_FOR_L0)
 constexpr auto BACKEND = backend::ext_oneapi_level_zero;
 using nativeDevice = ze_device_handle_t;
 using nativeQueue = ze_command_queue_handle_t;
 using nativeEvent = ze_event_handle_t;
 #else
 constexpr auto BACKEND = backend::opencl;
-using nativeDevice = cl_device;
+using nativeDevice = cl_device_id;
 using nativeQueue = cl_command_queue;
 using nativeEvent = cl_event;
 #endif

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

@@ -1,8 +1,7 @@
-// REQUIRES: ocloc, level_zero, gpu, cpu
+// REQUIRES: ocloc, any-device-is-level_zero, any-device-is-gpu, any-device-is-cpu
 
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga,spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out

sycl/test-e2e/lit.cfg.py

@@ -78,6 +78,7 @@
         "CL_CONFIG_DEVICES",
         "SYCL_DEVICE_ALLOWLIST",
         "SYCL_CONFIG_FILE_NAME",
+        "OCL_ICD_VENDORS",
     ]
 )