Make Hip also use a dumb pointer.

Author: aarongreig

unified-runtime/source/adapters/hip/adapter.cpp

@@ -16,7 +16,7 @@
 #include <memory>
 
 namespace ur::hip {
-std::shared_ptr<ur_adapter_handle_t_> adapter;
+ur_adapter_handle_t adapter;
 }
 
 class ur_legacy_sink : public logger::Sink {
@@ -54,12 +54,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
     uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
   if (phAdapters) {
     static std::once_flag InitFlag;
-    std::call_once(InitFlag, [=]() {
-      ur::hip::adapter = std::make_shared<ur_adapter_handle_t_>();
-    });
+    std::call_once(InitFlag,
+                   [=]() { ur::hip::adapter = new ur_adapter_handle_t_; });
 
-    ur::hip::adapter->RefCount++;
-    *phAdapters = ur::hip::adapter.get();
+    *phAdapters = ur::hip::adapter;
   }
   if (pNumAdapters) {
     *pNumAdapters = 1;
@@ -69,8 +67,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urAdapterRelease(ur_adapter_handle_t) {
-  // No state to clean up so we don't need to check for 0 references
-  ur::hip::adapter->RefCount--;
+  if (--ur::hip::adapter->RefCount == 0) {
+    delete ur::hip::adapter;
+  }
+
   return UR_RESULT_SUCCESS;
 }
 

unified-runtime/source/adapters/hip/adapter.hpp

@@ -25,7 +25,7 @@ struct ur_adapter_handle_t_ {
 };
 
 namespace ur::hip {
-extern std::shared_ptr<ur_adapter_handle_t_> adapter;
+extern ur_adapter_handle_t adapter;
 }
 
 #endif // UR_HIP_ADAPTER_HPP_INCLUDED

unified-runtime/source/adapters/hip/context.hpp

@@ -86,16 +86,20 @@ struct ur_context_handle_t_ {
     void operator()() { Function(UserData); }
   };
 
-  std::shared_ptr<ur_adapter_handle_t_> Adapter;
   std::vector<ur_device_handle_t> Devices;
 
   std::atomic_uint32_t RefCount;
 
   ur_context_handle_t_(const ur_device_handle_t *Devs, uint32_t NumDevices)
-      : Adapter(ur::hip::adapter), Devices{Devs, Devs + NumDevices},
-        RefCount{1} {};
+      : Devices{Devs, Devs + NumDevices}, RefCount{1} {
+    UR_CHECK_ERROR(urAdapterRetain(ur::hip::adapter));
+  };
+
+  ~ur_context_handle_t_() {
+    UR_CHECK_ERROR(urAdapterRelease(ur::hip::adapter));
+  }
 
-  ~ur_context_handle_t_() {}
+  ur_context_handle_t_(const ur_context_handle_t_ &) = delete;
 
   void invokeExtendedDeleters() {
     std::lock_guard<std::mutex> Guard(Mutex);

unified-runtime/source/adapters/hip/device.cpp

@@ -1179,7 +1179,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceCreateWithNativeHandle(
 
   // Get list of platforms
   uint32_t NumPlatforms = 0;
-  ur_adapter_handle_t AdapterHandle = ur::hip::adapter.get();
+  ur_adapter_handle_t AdapterHandle = ur::hip::adapter;
   ur_result_t Result =
       urPlatformGet(&AdapterHandle, 1, 0, nullptr, &NumPlatforms);
   if (Result != UR_RESULT_SUCCESS)

unified-runtime/source/adapters/hip/platform.cpp

@@ -36,7 +36,7 @@ urPlatformGetInfo(ur_platform_handle_t, ur_platform_info_t propName,
     return ReturnValue("");
   }
   case UR_PLATFORM_INFO_ADAPTER: {
-    return ReturnValue(ur::hip::adapter.get());
+    return ReturnValue(ur::hip::adapter);
   }
   default:
     return UR_RESULT_ERROR_INVALID_ENUMERATION;

unified-runtime/source/adapters/hip/usm.cpp

@@ -199,7 +199,7 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
 
       // hip backend has only one platform containing all devices
       ur_platform_handle_t platform;
-      ur_adapter_handle_t AdapterHandle = ur::hip::adapter.get();
+      ur_adapter_handle_t AdapterHandle = ur::hip::adapter;
       UR_CHECK_ERROR(urPlatformGet(&AdapterHandle, 1, 1, &platform, nullptr));
 
       // get the device from the platform