[SYCL][OpenCL] Port OpenCL plugin to Unified Runtime (#10490)

Co-authored-by: Martin Morrison-Grant <[email protected]>
Co-authored-by: Petr Vesely <[email protected]>
Co-authored-by: Callum Fare <[email protected]>
Co-authored-by: aarongreig <[email protected]>

Author: 5 people

sycl/plugins/CMakeLists.txt

@@ -2,9 +2,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM" )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default")
 endif()
 
-# level_zero plugin depends today on unified_runtime plugin
+# level_zero and opencl plugins depend today on unified_runtime plugin
 # and unified_runtime plugin is not an independent plugin, adding it explicitly
-if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS)
+if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS OR "opencl" IN_LIST SYCL_ENABLE_PLUGINS)
   add_subdirectory(unified_runtime)
 endif()
 

sycl/plugins/opencl/CMakeLists.txt

@@ -12,9 +12,41 @@
 
 add_sycl_plugin(opencl
   SOURCES
+    # Some code is shared with the UR adapter
+    "../unified_runtime/pi2ur.hpp"
+    "../unified_runtime/pi2ur.cpp"
+    "../unified_runtime/ur/ur.hpp"
+    "../unified_runtime/ur/ur.cpp"
+    "../unified_runtime/ur/adapters/opencl/adapter.cpp"
+    "../unified_runtime/ur/adapters/opencl/adapter.hpp"
+    "../unified_runtime/ur/adapters/opencl/common.cpp"
+    "../unified_runtime/ur/adapters/opencl/common.hpp"
+    "../unified_runtime/ur/adapters/opencl/context.cpp"
+    "../unified_runtime/ur/adapters/opencl/context.hpp"
+    "../unified_runtime/ur/adapters/opencl/device.cpp"
+    "../unified_runtime/ur/adapters/opencl/device.hpp"
+    "../unified_runtime/ur/adapters/opencl/enqueue.cpp"
+    "../unified_runtime/ur/adapters/opencl/image.cpp"
+    "../unified_runtime/ur/adapters/opencl/kernel.cpp"
+    "../unified_runtime/ur/adapters/opencl/platform.cpp"
+    "../unified_runtime/ur/adapters/opencl/platform.hpp"
+    "../unified_runtime/ur/adapters/opencl/sampler.cpp"
+    "../unified_runtime/ur/adapters/opencl/memory.cpp"
+    "../unified_runtime/ur/adapters/opencl/usm.cpp"
+    "../unified_runtime/ur/adapters/opencl/program.cpp"
+    "../unified_runtime/ur/adapters/opencl/event.cpp"
+    "../unified_runtime/ur/adapters/opencl/queue.cpp"
+    "../unified_runtime/ur/adapters/opencl/command_buffer.hpp"
+    "../unified_runtime/ur/adapters/opencl/command_buffer.cpp"
+    "../unified_runtime/ur/adapters/opencl/usm_p2p.cpp"
+    # ---
     "${sycl_inc_dir}/sycl/detail/pi.h"
     "pi_opencl.cpp"
+  INCLUDE_DIRS
+    ${sycl_inc_dir}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../unified_runtime
   LIBRARIES
+    UnifiedRuntime-Headers
     OpenCL-ICD
 )