[SYCL][E2E] Fix online compiler test for accelerator

sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp

@@ -7,8 +7,8 @@
 // All Level-Zero specific code is kept here and the common part that can be
 // re-used by other backends is kept in online_compiler_common.hpp file.
 
-#include <sycl/ext/intel/experimental/online_compiler.hpp>
 #include <sycl/detail/core.hpp>
+#include <sycl/ext/intel/experimental/online_compiler.hpp>
 
 #include <vector>
 
@@ -20,6 +20,10 @@
 using byte = unsigned char;
 
 #ifdef RUN_KERNELS
+bool testSupported(sycl::queue &Queue) {
+  return Queue.get_backend() == sycl::backend::ext_oneapi_level_zero;
+}
+
 sycl::kernel getSYCLKernelWithIL(sycl::queue &Queue,
                                  const std::vector<byte> &IL) {
 

sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp

@@ -1,5 +1,4 @@
 // REQUIRES: opencl, opencl_icd, cm-compiler
-// UNSUPPORTED: accelerator
 
 // RUN: %{build} -Wno-error=deprecated-declarations -DRUN_KERNELS %opencl_lib -o %t.out
 // RUN: %{run} %t.out
@@ -18,14 +17,86 @@
 using byte = unsigned char;
 
 #ifdef RUN_KERNELS
+std::tuple<unsigned long, unsigned long> GetOCLVersion(sycl::device Device) {
+  cl_int Err;
+  cl_device_id ClDevice = sycl::get_native<sycl::backend::opencl>(Device);
+
+  size_t VersionSize = 0;
+  Err = clGetDeviceInfo(ClDevice, CL_DEVICE_VERSION, 0, nullptr, &VersionSize);
+  assert(Err == CL_SUCCESS);
+
+  std::string Version(VersionSize, '\0');
+  Err = clGetDeviceInfo(ClDevice, CL_DEVICE_VERSION, VersionSize,
+                        Version.data(), nullptr);
+  assert(Err == CL_SUCCESS);
+
+  std::string_view Prefix = "OpenCL ";
+  size_t VersionBegin = Version.find_first_of(" ");
+  size_t VersionEnd = Version.find_first_of(" ", VersionBegin + 1);
+  size_t VersionSeparator = Version.find_first_of(".", VersionBegin + 1);
+
+  bool HaveOCLPrefix =
+      std::equal(Prefix.begin(), Prefix.end(), Version.begin());
+
+  assert(HaveOCLPrefix && VersionBegin != std::string::npos &&
+         VersionEnd != std::string::npos &&
+         VersionSeparator != std::string::npos);
+
+  std::string VersionMajor{Version.begin() + VersionBegin + 1,
+                           Version.begin() + VersionSeparator};
+  std::string VersionMinor{Version.begin() + VersionSeparator + 1,
+                           Version.begin() + VersionEnd};
+
+  unsigned long OCLMajor = strtoul(VersionMajor.c_str(), nullptr, 10);
+  unsigned long OCLMinor = strtoul(VersionMinor.c_str(), nullptr, 10);
+
+  assert(OCLMajor > 0 && (OCLMajor > 2 || OCLMinor <= 2) &&
+         OCLMajor != UINT_MAX && OCLMinor != UINT_MAX);
+
+  return std::make_tuple(OCLMajor, OCLMinor);
+}
+
+bool testSupported(sycl::queue &Queue) {
+  if (Queue.get_backend() != sycl::backend::opencl)
+    return false;
+
+  sycl::device Device = Queue.get_device();
+  auto [OCLMajor, OCLMinor] = GetOCLVersion(Device);
+
+  // Creating a program from IL is only supported on >=2.1 or if
+  // cl_khr_il_program is supported on the device.
+  return (OCLMajor == 2 && OCLMinor >= 1) || OCLMajor > 2 ||
+         Device.has_extension("cl_khr_il_program");
+}
+
 sycl::kernel getSYCLKernelWithIL(sycl::queue &Queue,
                                  const std::vector<byte> &IL) {
   sycl::context Context = Queue.get_context();
 
-  cl_int Err;
-  cl_program ClProgram =
-      clCreateProgramWithIL(sycl::get_native<sycl::backend::opencl>(Context),
-                            IL.data(), IL.size(), &Err);
+  cl_int Err = 0;
+  cl_program ClProgram = 0;
+
+  sycl::device Device = Queue.get_device();
+  auto [OCLMajor, OCLMinor] = GetOCLVersion(Device);
+  if ((OCLMajor == 2 && OCLMinor >= 1) || OCLMajor > 2) {
+    // clCreateProgramWithIL is supported if OCL version >=2.1.
+    ClProgram =
+        clCreateProgramWithIL(sycl::get_native<sycl::backend::opencl>(Context),
+                              IL.data(), IL.size(), &Err);
+  } else {
+    // Fall back to using extension function for building IR.
+    using ApiFuncT =
+        cl_program(CL_API_CALL *)(cl_context, const void *, size_t, cl_int *);
+    ApiFuncT FuncPtr =
+        reinterpret_cast<ApiFuncT>(clGetExtensionFunctionAddressForPlatform(
+            sycl::get_native<sycl::backend::opencl>(Context.get_platform()),
+            "clCreateProgramWithILKHR"));
+
+    assert(FuncPtr != nullptr);
+
+    ClProgram = FuncPtr(sycl::get_native<sycl::backend::opencl>(Context),
+                        IL.data(), IL.size(), &Err);
+  }
   assert(Err == CL_SUCCESS);
 
   Err = clBuildProgram(ClProgram, 0, nullptr, nullptr, nullptr, nullptr);

sycl/test-e2e/OnlineCompiler/online_compiler_common.hpp

@@ -53,6 +53,13 @@ int main(int argc, char **argv) {
   sycl::queue Q;
   sycl::device Device = Q.get_device();
 
+#ifdef RUN_KERNELS
+  if (!testSupported(Q)) {
+    std::cout << "Building for IL is not supported. Skipping!" << std::endl;
+    return 0;
+  }
+#endif
+
   { // Compile and run a trivial OpenCL kernel.
     std::cout << "Test case1\n";
     sycl::ext::intel::experimental::online_compiler<