[HIP] Return error on silently failing urEventGetInfo queries for interop created events

Author: Georgi Mirazchiyski

source/adapters/hip/event.cpp

@@ -178,8 +178,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,
 
   UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
   switch (propName) {
-  case UR_EVENT_INFO_COMMAND_QUEUE:
+  case UR_EVENT_INFO_COMMAND_QUEUE: {
+    // If the runtime owns the native handle, we have reference to the queue.
+    // Otherwise, the event handle comes from an interop API with no RT refs.
+    if (!hEvent->backendHasOwnership()) {
+      setErrorMessage("Command queue info cannot be queried for the event. The "
+                      "event object was created from a native event and has no "
+                      "valid reference to a command queue.",
+                      UR_RESULT_ERROR_INVALID_VALUE);
+      return UR_RESULT_ERROR_ADAPTER_SPECIFIC;
+    }
+    assert(hEvent->getQueue());
     return ReturnValue(hEvent->getQueue());
+  }
   case UR_EVENT_INFO_COMMAND_TYPE:
     return ReturnValue(hEvent->getCommandType());
   case UR_EVENT_INFO_REFERENCE_COUNT:

test/adapters/hip/CMakeLists.txt

@@ -11,6 +11,7 @@ add_adapter_test(hip
         urDeviceGetNativeHandle.cpp
         urEventGetNativeHandle.cpp
         test_context.cpp
+        test_event.cpp
     ENVIRONMENT
         "UR_ADAPTERS_FORCE_LOAD=\"$<TARGET_FILE:ur_adapter_hip>\""
 )

test/adapters/hip/test_event.cpp

@@ -0,0 +1,49 @@
+// Copyright (C) 2022-2024 Intel Corporation
+// 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 "event.hpp"
+#include "fixtures.h"
+#include "uur/raii.h"
+
+#include <hip/hip_runtime.h>
+#include <tuple>
+
+struct RAIIHipEvent {
+    hipEvent_t handle = nullptr;
+
+    ~RAIIHipEvent() {
+        if (handle) {
+            std::ignore = hipEventDestroy(handle);
+        }
+    }
+
+    hipEvent_t *ptr() { return &handle; }
+    hipEvent_t get() { return handle; }
+};
+
+using urHipEventTest = uur::urContextTest;
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipEventTest);
+
+// Testing the urEventGetInfo behaviour for natively constructed (HIP) events.
+// Backend interop APIs can lead to creating event objects that are not fully
+// initialized. In the Cuda adapter, an event can have nullptr command queue
+// because the interop API does not associate a UR-owned queue with the event.
+TEST_P(urHipEventTest, GetQueueFromEventCreatedWithNativeHandle) {
+    RAIIHipEvent hip_event;
+    ASSERT_SUCCESS_HIP(
+        hipEventCreateWithFlags(hip_event.ptr(), hipEventDefault));
+
+    auto native_event = reinterpret_cast<ur_native_handle_t>(hip_event.get());
+    uur::raii::Event event{nullptr};
+    ASSERT_SUCCESS(urEventCreateWithNativeHandle(native_event, context, nullptr,
+                                                 event.ptr()));
+    EXPECT_NE(event, nullptr);
+
+    size_t ret_size{};
+    ur_queue_handle_t q{};
+    ASSERT_EQ_RESULT(urEventGetInfo(event, UR_EVENT_INFO_COMMAND_QUEUE,
+                                    sizeof(ur_queue_handle_t), &q, &ret_size),
+                     UR_RESULT_ERROR_ADAPTER_SPECIFIC);
+}