Merge branch 'fabio/opencl_usm_import' into 'opencl_ur_port'

[SYCL][OpenCL] Port USM import and export entrypoints

See merge request unified-runtime/intel-llvm!146

Author: fabiomestre

sycl/plugins/opencl/pi_opencl.cpp

@@ -22,19 +22,6 @@
 
 extern "C" {
 
-pi_result piextUSMImport(const void *ptr, size_t size, pi_context context) {
-  std::ignore = ptr;
-  std::ignore = size;
-  std::ignore = context;
-  return PI_SUCCESS;
-}
-
-pi_result piextUSMRelease(const void *ptr, pi_context context) {
-  std::ignore = ptr;
-  std::ignore = context;
-  return PI_SUCCESS;
-}
-
 const char SupportedVersion[] = _PI_OPENCL_PLUGIN_VERSION_STRING;
 
 pi_result piPluginInit(pi_plugin *PluginInit) {
@@ -173,8 +160,8 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piextUSMEnqueueMemset2D, pi2ur::piextUSMEnqueueMemset2D)
   _PI_CL(piextUSMEnqueueMemcpy2D, pi2ur::piextUSMEnqueueMemcpy2D)
   _PI_CL(piextUSMGetMemAllocInfo, pi2ur::piextUSMGetMemAllocInfo)
-  _PI_CL(piextUSMImport, piextUSMImport)
-  _PI_CL(piextUSMRelease, piextUSMRelease)
+  _PI_CL(piextUSMImport, pi2ur::piextUSMImport)
+  _PI_CL(piextUSMRelease, pi2ur::piextUSMRelease)
   // Device global variable
   _PI_CL(piextEnqueueDeviceGlobalVariableWrite,
          pi2ur::piextEnqueueDeviceGlobalVariableWrite)

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

@@ -238,6 +238,18 @@ urGetUSMProcAddrTable(ur_api_version_t Version, ur_usm_dditable_t *pDdiTable) {
   return UR_RESULT_SUCCESS;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetUSMExpProcAddrTable(
+    ur_api_version_t Version, ur_usm_exp_dditable_t *pDdiTable) {
+  auto Result = validateProcInputs(Version, pDdiTable);
+  if (UR_RESULT_SUCCESS != Result) {
+    return Result;
+  }
+
+  pDdiTable->pfnImportExp = urUSMImportExp;
+  pDdiTable->pfnReleaseExp = urUSMReleaseExp;
+  return UR_RESULT_SUCCESS;
+}
+
 UR_DLLEXPORT ur_result_t UR_APICALL urGetDeviceProcAddrTable(
     ur_api_version_t Version, ur_device_dditable_t *pDdiTable) {
   auto Result = validateProcInputs(Version, pDdiTable);

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

@@ -440,3 +440,15 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
 
   return RetVal;
 }
+
+UR_APIEXPORT ur_result_t UR_APICALL
+urUSMImportExp([[maybe_unused]] ur_context_handle_t Context,
+               [[maybe_unused]] void *HostPtr, [[maybe_unused]] size_t Size) {
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
+UR_APIEXPORT ur_result_t UR_APICALL
+urUSMReleaseExp([[maybe_unused]] ur_context_handle_t Context,
+                [[maybe_unused]] void *HostPtr) {
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}