[SYCL][OpenCL] Fix issues after rebase and format cmakefile

Author: Fábio Mestre

sycl/plugins/opencl/CMakeLists.txt

@@ -37,6 +37,7 @@ add_sycl_plugin(opencl
     "../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"

sycl/plugins/opencl/pi_opencl.cpp

@@ -16,30 +16,10 @@
 
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
 
+#include <cstring>
 #include <pi_opencl.hpp>
-#include <sycl/detail/cl.h>
-#include <sycl/detail/iostream_proxy.hpp>
 #include <sycl/detail/pi.h>
 
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-#include <limits>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <sstream>
-#include <string>
-#include <string_view>
-#include <vector>
-
-// Want all the needed casts be explicit, do not define conversion operators.
-template <class To, class From> To cast(From value) {
-  // TODO: see if more sanity checks are possible.
-  static_assert(sizeof(From) == sizeof(To), "cast failed size check");
-  return (To)(value);
-}
-
 extern "C" {
 
 pi_result piextUSMImport(const void *ptr, size_t size, pi_context context) {
@@ -214,12 +194,14 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
          pi2ur::piextCommandBufferMemBufferCopy)
   _PI_CL(piextCommandBufferMemBufferCopyRect,
          pi2ur::piextCommandBufferMemBufferCopyRect)
-  _PI_CL(piextCommandBufferMemBufferRead, piextCommandBufferMemBufferRead)
+  _PI_CL(piextCommandBufferMemBufferRead,
+         pi2ur::piextCommandBufferMemBufferRead)
   _PI_CL(piextCommandBufferMemBufferReadRect,
-         piextCommandBufferMemBufferReadRect)
-  _PI_CL(piextCommandBufferMemBufferWrite, piextCommandBufferMemBufferWrite)
+         pi2ur::piextCommandBufferMemBufferReadRect)
+  _PI_CL(piextCommandBufferMemBufferWrite,
+         pi2ur::piextCommandBufferMemBufferWrite)
   _PI_CL(piextCommandBufferMemBufferWriteRect,
-         piextCommandBufferMemBufferWriteRect)
+         pi2ur::piextCommandBufferMemBufferWriteRect)
   _PI_CL(piextEnqueueCommandBuffer, pi2ur::piextEnqueueCommandBuffer)
   // Kernel
   _PI_CL(piextKernelSetArgMemObj, pi2ur::piextKernelSetArgMemObj)
@@ -228,6 +210,10 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piTearDown, pi2ur::piTearDown)
   _PI_CL(piGetDeviceAndHostTimer, pi2ur::piGetDeviceAndHostTimer)
   _PI_CL(piPluginGetBackendOption, pi2ur::piPluginGetBackendOption)
+  // Peer to Peer
+  _PI_CL(piextEnablePeerAccess, pi2ur::piextEnablePeerAccess)
+  _PI_CL(piextDisablePeerAccess, pi2ur::piextDisablePeerAccess)
+  _PI_CL(piextPeerAccessGetInfo, pi2ur::piextPeerAccessGetInfo)
 
 #undef _PI_CL
 

sycl/plugins/unified_runtime/CMakeLists.txt

@@ -254,34 +254,34 @@ if ("opencl" IN_LIST SYCL_ENABLE_PLUGINS)
   # Build OpenCL adapter
   add_sycl_library("ur_adapter_opencl" SHARED
     SOURCES
-    "ur/ur.hpp"
-    "ur/ur.cpp"
-    "ur/adapters/opencl/command_buffer.hpp"
-    "ur/adapters/opencl/command_buffer.cpp"
-    "ur/adapters/opencl/common.cpp"
-    "ur/adapters/opencl/common.hpp"
-    "ur/adapters/opencl/context.cpp"
-    "ur/adapters/opencl/context.hpp"
-    "ur/adapters/opencl/device.cpp"
-    "ur/adapters/opencl/device.hpp"
-    "ur/adapters/opencl/enqueue.cpp"
-    "ur/adapters/opencl/event.cpp"
-    "ur/adapters/opencl/kernel.cpp"
-    "ur/adapters/opencl/memory.cpp"
-    "ur/adapters/opencl/platform.cpp"
-    "ur/adapters/opencl/platform.hpp"
-    "ur/adapters/opencl/program.cpp"
-    "ur/adapters/opencl/queue.cpp"
-    "ur/adapters/opencl/sampler.cpp"
-    "ur/adapters/opencl/ur_interface_loader.cpp"
-    "ur/adapters/opencl/usm.cpp"
-
+      "ur/ur.hpp"
+      "ur/ur.cpp"
+      "ur/adapters/opencl/command_buffer.hpp"
+      "ur/adapters/opencl/command_buffer.cpp"
+      "ur/adapters/opencl/common.cpp"
+      "ur/adapters/opencl/common.hpp"
+      "ur/adapters/opencl/context.cpp"
+      "ur/adapters/opencl/context.hpp"
+      "ur/adapters/opencl/device.cpp"
+      "ur/adapters/opencl/device.hpp"
+      "ur/adapters/opencl/enqueue.cpp"
+      "ur/adapters/opencl/event.cpp"
+      "ur/adapters/opencl/kernel.cpp"
+      "ur/adapters/opencl/memory.cpp"
+      "ur/adapters/opencl/platform.cpp"
+      "ur/adapters/opencl/platform.hpp"
+      "ur/adapters/opencl/program.cpp"
+      "ur/adapters/opencl/queue.cpp"
+      "ur/adapters/opencl/sampler.cpp"
+      "ur/adapters/opencl/ur_interface_loader.cpp"
+      "ur/adapters/opencl/usm.cpp"
+      "ur/adapters/opencl/usm_p2p.cpp"
     INCLUDE_DIRS
-    ${sycl_inc_dir}
+      ${sycl_inc_dir}
     LIBRARIES
-    UnifiedRuntime-Headers
-    Threads::Threads
-    OpenCL-ICD
+      UnifiedRuntime-Headers
+      Threads::Threads
+      OpenCL-ICD
     )
 
   set_target_properties("ur_adapter_opencl" PROPERTIES

sycl/plugins/unified_runtime/ur/adapters/opencl/queue.cpp

@@ -73,13 +73,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreate(
   cl_command_queue_properties CLProperties =
       convertURQueuePropertiesToCL(pProperties);
 
-  // Check that unexpected bits are not set.
-  assert(!(CLProperties & ~(CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE |
-                            CL_QUEUE_PROFILING_ENABLE | CL_QUEUE_ON_DEVICE |
-                            CL_QUEUE_ON_DEVICE_DEFAULT)));
-
   // Properties supported by OpenCL backend.
-  cl_command_queue_properties SupportByOpenCL =
+  const cl_command_queue_properties SupportByOpenCL =
       CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE | CL_QUEUE_PROFILING_ENABLE |
       CL_QUEUE_ON_DEVICE | CL_QUEUE_ON_DEVICE_DEFAULT;
 

sycl/plugins/unified_runtime/ur/adapters/opencl/ur_interface_loader.cpp

@@ -283,6 +283,19 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
   return retVal;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetUsmP2PExpProcAddrTable(
+    ur_api_version_t version, ur_usm_p2p_exp_dditable_t *pDdiTable) {
+  auto retVal = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != retVal) {
+    return retVal;
+  }
+  pDdiTable->pfnEnablePeerAccessExp = urUsmP2PEnablePeerAccessExp;
+  pDdiTable->pfnDisablePeerAccessExp = urUsmP2PDisablePeerAccessExp;
+  pDdiTable->pfnPeerAccessGetInfoExp = urUsmP2PPeerAccessGetInfoExp;
+
+  return retVal;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif

sycl/plugins/unified_runtime/ur/adapters/opencl/usm_p2p.cpp

@@ -0,0 +1,39 @@
+//===--------- usm_p2p.cpp - OpenCL Adapter-------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------===//
+
+#include "common.hpp"
+
+UR_APIEXPORT ur_result_t UR_APICALL
+urUsmP2PEnablePeerAccessExp([[maybe_unused]] ur_device_handle_t commandDevice,
+                            [[maybe_unused]] ur_device_handle_t peerDevice) {
+
+  cl_adapter::die(
+      "Experimental P2P feature is not implemented for OpenCL adapter.");
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
+UR_APIEXPORT ur_result_t UR_APICALL
+urUsmP2PDisablePeerAccessExp([[maybe_unused]] ur_device_handle_t commandDevice,
+                             [[maybe_unused]] ur_device_handle_t peerDevice) {
+
+  cl_adapter::die(
+      "Experimental P2P feature is not implemented for OpenCL adapter.");
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
+UR_APIEXPORT ur_result_t UR_APICALL urUsmP2PPeerAccessGetInfoExp(
+    [[maybe_unused]] ur_device_handle_t commandDevice,
+    [[maybe_unused]] ur_device_handle_t peerDevice,
+    [[maybe_unused]] ur_exp_peer_info_t propName,
+    [[maybe_unused]] size_t propSize, [[maybe_unused]] void *pPropValue,
+    [[maybe_unused]] size_t *pPropSizeRet) {
+
+  cl_adapter::die(
+      "Experimental P2P feature is not implemented for OpenCL adapter.");
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}