[HIP] Improve urEnqueueUSMAdvise return code for non-shared mem

We can only call hipMemAdvise on managed pointers allocated via
hipMallocManaged, so can only support the UR entry point on pointers
allocated via urUSMSharedAlloc.

When faced with other pointers, we're supposed to ignore them and result
"success", but instead this PR continues the tradition of returning
UR_RESULT_ERROR_ADAPTER_SPECIFIC with a warning message providing the
user more information. This should all be fixed up later when there's a
better warning mechanism.

Author: frasercrmck

source/adapters/hip/enqueue.cpp

@@ -1424,8 +1424,6 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
   UR_ASSERT(size <= PointerRangeSize, UR_RESULT_ERROR_INVALID_SIZE);
 #endif
 
-  ur_result_t Result = UR_RESULT_SUCCESS;
-
   try {
     ScopedContext Active(Device);
     std::unique_ptr<ur_event_handle_t_> EventPtr{nullptr};
@@ -1480,6 +1478,20 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
       // UR_USM_MEM_ADVICE_SET/MEM_ADVICE_CLEAR_READ_MOSTLY.
     }
 
+    // hipMemAdvise only supports managed memory allocated via
+    // hipMallocManaged. We can't support this API with any other types of
+    // pointer. We should ignore them and result UR_RESULT_SUCCESS but instead
+    // we report a warning.
+    // FIXME: Fix this up when there's a better warning mechanism.
+    if (auto ptrAttribs = getPointerAttributes(pMem);
+        !ptrAttribs || !ptrAttribs->isManaged) {
+      releaseEvent();
+      setErrorMessage("mem_advise is ignored as the pointer argument is not "
+                      "a shared USM pointer",
+                      UR_RESULT_SUCCESS);
+      return UR_RESULT_ERROR_ADAPTER_SPECIFIC;
+    }
+
     const auto DeviceID = Device->get();
     if (advice & UR_USM_ADVICE_FLAG_DEFAULT) {
       UR_CHECK_ERROR(
@@ -1493,7 +1505,11 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
           hipMemAdvise(pMem, size, hipMemAdviseUnsetCoarseGrain, DeviceID));
 #endif
     } else {
-      Result = setHipMemAdvise(HIPDevicePtr, size, advice, DeviceID);
+      ur_result_t Result =
+          setHipMemAdvise(HIPDevicePtr, size, advice, DeviceID);
+      assert((Result == UR_RESULT_SUCCESS ||
+              Result == UR_RESULT_ERROR_INVALID_ENUMERATION) &&
+             "Unexpected return code");
       // UR_RESULT_ERROR_INVALID_ENUMERATION is returned when using a valid
       // but currently unmapped advice arguments as not supported by this
       // platform. Therefore, warn the user instead of throwing and aborting
@@ -1509,12 +1525,12 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
 
     releaseEvent();
   } catch (ur_result_t err) {
-    Result = err;
+    return err;
   } catch (...) {
-    Result = UR_RESULT_ERROR_UNKNOWN;
+    return UR_RESULT_ERROR_UNKNOWN;
   }
 
-  return Result;
+  return UR_RESULT_SUCCESS;
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMFill2D(

test/conformance/enqueue/enqueue_adapter_hip.match

@@ -7,10 +7,15 @@ urEnqueueKernelLaunchUSMLinkedList.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEna
 {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___copy_3d_2d
 {{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___write_row_2D
 {{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___write_3d_2d
+
+# HIP doesn't ignore unsupported USM advice or prefetching. Instead of
+# returning UR_RESULT_SUCCESS as per the spec, it instead returns
+# UR_RESULT_ERROR_ADAPTER_SPECIFIC to issue a warning. These tests will fail
+# until this is rectified.
 urEnqueueUSMAdviseWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
 urEnqueueUSMAdviseTest.MultipleParamsSuccess/AMD_HIP_BACKEND___{{.*}}_
-urEnqueueUSMAdviseTest.NonCoherentDeviceMemorySuccessOrWarning/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueUSMPrefetchWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
 urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
+
 urEnqueueTimestampRecordingExpTest.Success/AMD_HIP_BACKEND___{{.*}}
 urEnqueueTimestampRecordingExpTest.SuccessBlocking/AMD_HIP_BACKEND___{{.*}}