Merge pull request #2350 from pbalcer/fix-get-native-mem

[L0 v2] fix urMemGetNativeHandle

Author: pbalcer

source/adapters/level_zero/v2/memory.cpp

@@ -260,7 +260,6 @@ void *ur_discrete_mem_handle_t::getDevicePtr(
   std::ignore = access;
   std::ignore = size;
   std::ignore = migrate;
-
   if (!activeAllocationDevice) {
     if (!hDevice) {
       hDevice = hContext->getDevices()[0];
@@ -269,6 +268,10 @@ void *ur_discrete_mem_handle_t::getDevicePtr(
     allocateOnDevice(hDevice, getSize());
   }
 
+  if (!hDevice) {
+    hDevice = activeAllocationDevice;
+  }
+
   char *ptr;
   if (activeAllocationDevice == hDevice) {
     ptr = ur_cast<char *>(deviceAllocations[hDevice->Id.value()].get());
@@ -559,12 +562,10 @@ ur_result_t urMemRelease(ur_mem_handle_t hMem) try {
 ur_result_t urMemGetNativeHandle(ur_mem_handle_t hMem,
                                  ur_device_handle_t hDevice,
                                  ur_native_handle_t *phNativeMem) try {
-  std::ignore = hDevice;
-
   std::scoped_lock<ur_shared_mutex> lock(hMem->getMutex());
 
   auto ptr = hMem->getDevicePtr(
-      nullptr, ur_mem_handle_t_::device_access_mode_t::read_write, 0,
+      hDevice, ur_mem_handle_t_::device_access_mode_t::read_write, 0,
       hMem->getSize(), nullptr);
   *phNativeMem = reinterpret_cast<ur_native_handle_t>(ptr);
   return UR_RESULT_SUCCESS;

test/conformance/memory/memory_adapter_level_zero_v2.match

@@ -10,11 +10,6 @@
 {{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*
 {{OPT}}urMemImageGetInfoTest.InvalidNullPointerParamValue/*
 {{OPT}}urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/*
-{{OPT}}urMemBufferCreateWithNativeHandleTest.Success/*
-{{OPT}}urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/*
-{{OPT}}urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/*
-{{OPT}}urMemBufferCreateWithNativeHandleTest.InvalidNullHandle/*
-{{OPT}}urMemBufferCreateWithNativeHandleTest.InvalidNullPointer/*
 {{OPT}}urMemImageCreateWithNativeHandleTest.Success/*
 {{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullHandle/*
 {{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullPointer/*

test/conformance/memory/urMemGetNativeHandle.cpp

@@ -2,6 +2,8 @@
 // Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#include "ur_api.h"
+#include <gtest/gtest.h>
 #include <uur/fixtures.h>
 
 using urMemGetNativeHandleTest = uur::urMemBufferTest;
@@ -14,6 +16,26 @@ TEST_P(urMemGetNativeHandleTest, Success) {
     }
 }
 
+TEST_P(urMemGetNativeHandleTest, SuccessNullDeviceTwice) {
+    ur_native_handle_t hNativeMem = 0;
+    if (auto error = urMemGetNativeHandle(buffer, nullptr, &hNativeMem)) {
+        ASSERT_TRUE(error == UR_RESULT_ERROR_UNSUPPORTED_FEATURE ||
+                    error == UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+    }
+    if (auto error = urMemGetNativeHandle(buffer, nullptr, &hNativeMem)) {
+        ASSERT_TRUE(error == UR_RESULT_ERROR_UNSUPPORTED_FEATURE ||
+                    error == UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+    }
+}
+
+TEST_P(urMemGetNativeHandleTest, SuccessNullDevice) {
+    ur_native_handle_t hNativeMem = 0;
+    if (auto error = urMemGetNativeHandle(buffer, nullptr, &hNativeMem)) {
+        ASSERT_TRUE(error == UR_RESULT_ERROR_UNSUPPORTED_FEATURE ||
+                    error == UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+    }
+}
+
 TEST_P(urMemGetNativeHandleTest, InvalidNullHandleMem) {
     ur_native_handle_t phNativeMem;
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,