some comments addressed

Author: mateuszpn

sycl/test-e2e/bindless_images/lit.local.cfg

@@ -1,5 +1,3 @@
 # Support of this feature is waiting for the upstream PR
 # https://github.com/llvm/llvm-project/pull/127737 to be merged with intel/llvm.
 config.unsupported_features += ['spirv-backend']
-# V2 adapter does not support bindless images yet
-config.unsupported_features += ['level_zero_v2_adapter']

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

@@ -267,9 +267,14 @@ ur_result_t ze2urImageFormat(const ze_image_format_t &ZeImageFormat,
 }
 
 /// Construct UR bindless image struct from ZE image handle and desc.
-ur_result_t createUrImgFromZeImage(ze_image_handle_t ZeImage,
+ur_result_t createUrImgFromZeImage(ze_context_handle_t hContext,
+                                   ze_device_handle_t hDevice,
                                    const ZeStruct<ze_image_desc_t> &ZeImageDesc,
                                    ur_exp_image_mem_native_handle_t *pImg) {
+  ze_image_handle_t ZeImage;
+  ZE2UR_CALL(zeImageCreate, (hContext, hDevice, &ZeImageDesc, &ZeImage));
+  ZE2UR_CALL(zeContextMakeImageResident, (hContext, hDevice, ZeImage));
+
   try {
     ur_bindless_mem_handle_t *urImg =
         new ur_bindless_mem_handle_t(ZeImage, ZeImageDesc);
@@ -951,12 +956,8 @@ ur_result_t urBindlessImagesImageAllocateExp(
   ZeImageBindlessDesc.flags = ZE_IMAGE_BINDLESS_EXP_FLAG_BINDLESS;
   ZeImageDesc.pNext = &ZeImageBindlessDesc;
 
-  ze_image_handle_t ZeImage;
-  ZE2UR_CALL(zeImageCreate, (hContext->getZeHandle(), hDevice->ZeDevice,
-                             &ZeImageDesc, &ZeImage));
-  ZE2UR_CALL(zeContextMakeImageResident,
-             (hContext->getZeHandle(), hDevice->ZeDevice, ZeImage));
-  UR_CALL(createUrImgFromZeImage(ZeImage, ZeImageDesc, phImageMem));
+  UR_CALL(createUrImgFromZeImage(hContext->getZeHandle(), hDevice->ZeDevice,
+                                 ZeImageDesc, phImageMem));
   return UR_RESULT_SUCCESS;
 }
 
@@ -990,9 +991,9 @@ ur_result_t urBindlessImagesUnsampledImageHandleDestroyExp(
   auto item = hDevice->ZeOffsetToImageHandleMap.find(hImage);
 
   if (item != hDevice->ZeOffsetToImageHandleMap.end()) {
-    ZE2UR_CALL(zeImageDestroy, (item->second));
     hDevice->ZeOffsetToImageHandleMap.erase(item);
     Lock.release();
+    ZE2UR_CALL(zeImageDestroy, (item->second));
   } else {
     Lock.release();
     return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
@@ -1165,12 +1166,9 @@ ur_result_t urBindlessImagesMapExternalArrayExp(
   ZeImageBindlessDesc.flags = ZE_IMAGE_BINDLESS_EXP_FLAG_BINDLESS;
   ZeImageDesc.pNext = &ZeImageBindlessDesc;
 
-  ze_image_handle_t ZeImage;
-  ZE2UR_CALL(zeImageCreate, (hContext->getZeHandle(), hDevice->ZeDevice,
-                             &ZeImageDesc, &ZeImage));
-  ZE2UR_CALL(zeContextMakeImageResident,
-             (hContext->getZeHandle(), hDevice->ZeDevice, ZeImage));
-  UR_CALL(createUrImgFromZeImage(ZeImage, ZeImageDesc, phImageMem));
+  UR_CALL(createUrImgFromZeImage(hContext->getZeHandle(), hDevice->ZeDevice,
+                                 ZeImageDesc, phImageMem));
+
   externalMemoryData->urMemoryHandle =
       reinterpret_cast<ur_mem_handle_t>(*phImageMem);
   return UR_RESULT_SUCCESS;

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

@@ -30,18 +30,4 @@ 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;
-// }
-
 } // namespace ur::level_zero

unified-runtime/source/adapters/level_zero/v2/memory.hpp

@@ -15,6 +15,7 @@
 #include <ur_api.h>
 
 #include "../device.hpp"
+#include "../image_common.hpp"
 #include "common.hpp"
 
 using usm_unique_ptr_t = std::unique_ptr<void, std::function<void(void *)>>;