urBindlessImagesMapExternalLinearMemoryExp made common for v1 & v2

Author: mateuszpn

unified-runtime/source/adapters/level_zero/image.cpp

@@ -115,20 +115,6 @@ ur_result_t urBindlessImagesImageCopyExp(
   return res;
 }
 
-ur_result_t urBindlessImagesMapExternalLinearMemoryExp(
-    ur_context_handle_t hContext, ur_device_handle_t hDevice, uint64_t offset,
-    uint64_t size, ur_exp_external_mem_handle_t hExternalMem, void **phRetMem) {
-  std::ignore = hContext;
-  std::ignore = hDevice;
-  std::ignore = size;
-  std::ignore = offset;
-  std::ignore = hExternalMem;
-  std::ignore = phRetMem;
-  logger::error("[UR][L0] {} function not implemented!",
-                "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
 ur_result_t urBindlessImagesWaitExternalSemaphoreExp(
     ur_queue_handle_t hQueue, ur_exp_external_semaphore_handle_t hSemaphore,
     bool hasValue, uint64_t waitValue, uint32_t numEventsInWaitList,

unified-runtime/source/adapters/level_zero/image_common.cpp

@@ -772,4 +772,43 @@ ur_result_t urBindlessImagesReleaseExternalSemaphoreExp(
   return UR_RESULT_SUCCESS;
 }
 
+ur_result_t urBindlessImagesMapExternalLinearMemoryExp(
+    ur_context_handle_t hContext, ur_device_handle_t hDevice, uint64_t offset,
+    uint64_t size, ur_exp_external_mem_handle_t hExternalMem, void **phRetMem) {
+  UR_ASSERT(hContext && hDevice && hExternalMem,
+            UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+  UR_ASSERT(offset && size, UR_RESULT_ERROR_INVALID_BUFFER_SIZE);
+
+  struct ur_ze_external_memory_data *externalMemoryData =
+      reinterpret_cast<ur_ze_external_memory_data *>(hExternalMem);
+  UR_ASSERT(externalMemoryData && externalMemoryData->importExtensionDesc,
+            UR_RESULT_ERROR_INVALID_NULL_POINTER);
+
+  ze_device_mem_alloc_desc_t allocDesc = {};
+  allocDesc.stype = ZE_STRUCTURE_TYPE_DEVICE_MEM_ALLOC_DESC;
+  allocDesc.flags = 0;
+  allocDesc.pNext = externalMemoryData->importExtensionDesc;
+  void *mappedMemory;
+
+  ze_result_t zeResult = zeMemAllocDevice(hContext->getZeHandle(), &allocDesc, size,
+                                          1, hDevice->ZeDevice, &mappedMemory);
+  if (zeResult != ZE_RESULT_SUCCESS) {
+    return UR_RESULT_ERROR_OUT_OF_RESOURCES;
+  }
+
+  zeResult = zeContextMakeMemoryResident(hContext->getZeHandle(),
+                                         hDevice->ZeDevice, mappedMemory, size);
+  if (zeResult != ZE_RESULT_SUCCESS) {
+    zeMemFree(hContext->getZeHandle(), mappedMemory);
+    return UR_RESULT_ERROR_UNKNOWN;
+  }
+  *phRetMem = reinterpret_cast<void *>(
+      reinterpret_cast<uintptr_t>(mappedMemory) + offset);
+
+  externalMemoryData->urMemoryHandle =
+      reinterpret_cast<ur_mem_handle_t>(*phRetMem);
+
+  return UR_RESULT_SUCCESS;
+}
+
 } // namespace ur::level_zero

unified-runtime/source/adapters/level_zero/v2/image.cpp

@@ -30,18 +30,18 @@ urBindlessImagesImageFreeExp([[maybe_unused]] ur_context_handle_t hContext,
   return UR_RESULT_SUCCESS;
 }
 
-ur_result_t urBindlessImagesMapExternalLinearMemoryExp(
-    [[maybe_unused]] ur_context_handle_t hContext,
-    [[maybe_unused]] ur_device_handle_t hDevice,
-    [[maybe_unused]] uint64_t offset, [[maybe_unused]] uint64_t size,
-    [[maybe_unused]] ur_exp_external_mem_handle_t hExternalMem,
-    [[maybe_unused]] void **phRetMem) {
-  // implemented in V1 in PR https://github.com/intel/llvm/pull/17458
-  // TODO: implement in V2 after V1 is merged
-  logger::error(
-      logger::LegacyMessage("[UR][L0_v2] {} function not implemented!"),
-      "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
+// ur_result_t urBindlessImagesMapExternalLinearMemoryExp(
+//     [[maybe_unused]] ur_context_handle_t hContext,
+//     [[maybe_unused]] ur_device_handle_t hDevice,
+//     [[maybe_unused]] uint64_t offset, [[maybe_unused]] uint64_t size,
+//     [[maybe_unused]] ur_exp_external_mem_handle_t hExternalMem,
+//     [[maybe_unused]] void **phRetMem) {
+//   // implemented in V1 in PR https://github.com/intel/llvm/pull/17458
+//   // TODO: implement in V2 after V1 is merged
+//   logger::error(
+//       logger::LegacyMessage("[UR][L0_v2] {} function not implemented!"),
+//       "{} function not implemented!", __FUNCTION__);
+//   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+// }
 
 } // namespace ur::level_zero