[HIP] Fix error code for urContextCreateWithNativeHandle

frasercrmck · frasercrmck · commit 6f15e42a3366 · 2024-06-19T09:28:54.000+01:00
Mirrors a similar change made to the CUDA adapater in 00761dc.
diff --git a/source/adapters/cuda/context.cpp b/source/adapters/cuda/context.cpp
@@ -142,16 +142,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetNativeHandle(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urContextCreateWithNativeHandle(
-    ur_native_handle_t hNativeContext, uint32_t numDevices,
-    const ur_device_handle_t *phDevices,
-    const ur_context_native_properties_t *pProperties,
-    ur_context_handle_t *phContext) {
-  std::ignore = hNativeContext;
-  std::ignore = numDevices;
-  std::ignore = phDevices;
-  std::ignore = pProperties;
-  std::ignore = phContext;
-
+    [[maybe_unused]] ur_native_handle_t hNativeContext,
+    [[maybe_unused]] uint32_t numDevices,
+    [[maybe_unused]] const ur_device_handle_t *phDevices,
+    [[maybe_unused]] const ur_context_native_properties_t *pProperties,
+    [[maybe_unused]] ur_context_handle_t *phContext) {
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
diff --git a/source/adapters/hip/context.cpp b/source/adapters/hip/context.cpp
@@ -119,9 +119,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetNativeHandle(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urContextCreateWithNativeHandle(
-    ur_native_handle_t, uint32_t, const ur_device_handle_t *,
-    const ur_context_native_properties_t *, ur_context_handle_t *) {
-  return UR_RESULT_ERROR_INVALID_OPERATION;
+    [[maybe_unused]] ur_native_handle_t hNativeContext,
+    [[maybe_unused]] uint32_t numDevices,
+    [[maybe_unused]] const ur_device_handle_t *phDevices,
+    [[maybe_unused]] const ur_context_native_properties_t *pProperties,
+    [[maybe_unused]] ur_context_handle_t *phContext) {
+  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urContextSetExtendedDeleter(
diff --git a/test/conformance/context/context_adapter_hip.match b/test/conformance/context/context_adapter_hip.match
@@ -1,3 +0,0 @@
-urContextCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_
-urContextCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_
-urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextGetNativeHandle(`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`UR_APIEXPORT ur_result_t UR_APICALL urContextCreateWithNativeHandle(`
`122`		`- ur_native_handle_t, uint32_t, const ur_device_handle_t *,`
`123`		`- const ur_context_native_properties_t , ur_context_handle_t ) {`
`124`		`- return UR_RESULT_ERROR_INVALID_OPERATION;`
	`122`	`+ [[maybe_unused]] ur_native_handle_t hNativeContext,`
	`123`	`+ [[maybe_unused]] uint32_t numDevices,`
	`124`	`+ [[maybe_unused]] const ur_device_handle_t *phDevices,`
	`125`	`+ [[maybe_unused]] const ur_context_native_properties_t *pProperties,`
	`126`	`+ [[maybe_unused]] ur_context_handle_t *phContext) {`
	`127`	`+ return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`125`	`128`	`}`
`126`	`129`
`127`	`130`	`UR_APIEXPORT ur_result_t UR_APICALL urContextSetExtendedDeleter(`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-urContextCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_`
`2`		`-urContextCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_`
`3`		`-urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_`