make RefCount public and remove getRefCount().

Author: martygrant

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

@@ -15,17 +15,13 @@
 
 struct ur_adapter_handle_t_ : ur::native_cpu::handle_base {
   logger::Logger &logger = logger::get_logger("native_cpu");
-
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
-
-private:
   ur::RefCount RefCount;
 } Adapter;
 
 UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
     uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
   if (phAdapters) {
-    Adapter.getRefCount().retain();
+    Adapter.RefCount.retain();
     *phAdapters = &Adapter;
   }
   if (pNumAdapters) {
@@ -35,12 +31,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urAdapterRelease(ur_adapter_handle_t) {
-  Adapter.getRefCount().release();
+  Adapter.RefCount.release();
   return UR_RESULT_SUCCESS;
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urAdapterRetain(ur_adapter_handle_t) {
-  Adapter.getRefCount().retain();
+  Adapter.RefCount.retain();
   return UR_RESULT_SUCCESS;
 }
 
@@ -62,7 +58,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetInfo(ur_adapter_handle_t,
   case UR_ADAPTER_INFO_BACKEND:
     return ReturnValue(UR_BACKEND_NATIVE_CPU);
   case UR_ADAPTER_INFO_REFERENCE_COUNT:
-    return ReturnValue(Adapter.getRefCount().getCount());
+    return ReturnValue(Adapter.RefCount.getCount());
   case UR_ADAPTER_INFO_VERSION:
     return ReturnValue(uint32_t{1});
   default:

unified-runtime/source/adapters/native_cpu/common.hpp

@@ -50,7 +50,7 @@ struct ur_object {
 };
 
 template <typename T> inline void decrementOrDelete(T *refC) {
-  if (refC->getRefCount().release() == 0)
+  if (refC->RefCount.release() == 0)
     delete refC;
 }
 

unified-runtime/source/adapters/native_cpu/context.cpp

@@ -30,7 +30,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextCreate(
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urContextRetain(ur_context_handle_t hContext) {
-  hContext->getRefCount().retain();
+  hContext->RefCount.retain();
   return UR_RESULT_SUCCESS;
 }
 
@@ -51,7 +51,7 @@ urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
   case UR_CONTEXT_INFO_DEVICES:
     return returnValue(hContext->_device);
   case UR_CONTEXT_INFO_REFERENCE_COUNT:
-    return returnValue(uint32_t{hContext->getRefCount().getCount()});
+    return returnValue(uint32_t{hContext->RefCount.getCount()});
   case UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT:
     return returnValue(true);
   case UR_CONTEXT_INFO_USM_FILL2D_SUPPORT:

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

@@ -136,10 +136,9 @@ struct ur_context_handle_t_ {
     return ptr;
   }
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount RefCount;
 
 private:
   std::mutex alloc_mutex;
   std::set<const void *> allocations;
-  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/native_cpu/event.cpp

@@ -28,7 +28,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,
   case UR_EVENT_INFO_COMMAND_TYPE:
     return ReturnValue(hEvent->getCommandType());
   case UR_EVENT_INFO_REFERENCE_COUNT:
-    return ReturnValue(hEvent->getRefCount().getCount());
+    return ReturnValue(hEvent->RefCount.getCount());
   case UR_EVENT_INFO_COMMAND_EXECUTION_STATUS:
     return ReturnValue(hEvent->getExecutionStatus());
   case UR_EVENT_INFO_CONTEXT:
@@ -69,7 +69,7 @@ urEventWait(uint32_t numEvents, const ur_event_handle_t *phEventWaitList) {
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urEventRetain(ur_event_handle_t hEvent) {
-  hEvent->getRefCount().retain();
+  hEvent->RefCount.retain();
   return UR_RESULT_SUCCESS;
 }
 

unified-runtime/source/adapters/native_cpu/event.hpp

@@ -58,7 +58,7 @@ struct ur_event_handle_t_ {
 
   uint64_t get_end_timestamp() const { return timestamp_end; }
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount RefCount;
 
 private:
   ur_queue_handle_t queue;
@@ -70,5 +70,4 @@ struct ur_event_handle_t_ {
   std::packaged_task<void()> callback;
   uint64_t timestamp_start = 0;
   uint64_t timestamp_end = 0;
-  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/native_cpu/kernel.cpp

@@ -95,7 +95,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelGetInfo(ur_kernel_handle_t hKernel,
   case UR_KERNEL_INFO_FUNCTION_NAME:
     return ReturnValue(hKernel->_name.c_str());
   case UR_KERNEL_INFO_REFERENCE_COUNT:
-    return ReturnValue(uint32_t{hKernel->getRefCount().getCount()});
+    return ReturnValue(uint32_t{hKernel->RefCount.getCount()});
   case UR_KERNEL_INFO_ATTRIBUTES:
     return ReturnValue("");
   case UR_KERNEL_INFO_SPILL_MEM_SIZE:
@@ -194,7 +194,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelGetSubGroupInfo(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urKernelRetain(ur_kernel_handle_t hKernel) {
-  hKernel->getRefCount().retain();
+  hKernel->RefCount.retain();
   return UR_RESULT_SUCCESS;
 }
 

unified-runtime/source/adapters/native_cpu/kernel.hpp

@@ -190,11 +190,11 @@ struct ur_kernel_handle_t_ {
   void addPtrArg(void *Ptr, size_t Index) { Args.addPtrArg(Index, Ptr); }
 
   void addArgReference(ur_mem_handle_t Arg) {
-    Arg->getRefCount().getCount();
+    Arg->RefCount.getCount();
     ReferencedArgs.push_back(Arg);
   }
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount RefCount;
 
 private:
   void removeArgReferences() {
@@ -213,5 +213,4 @@ struct ur_kernel_handle_t_ {
   std::optional<native_cpu::WGSize_t> MaxWGSize = std::nullopt;
   std::optional<uint64_t> MaxLinearWGSize = std::nullopt;
   std::vector<ur_mem_handle_t> ReferencedArgs;
-  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/native_cpu/memory.hpp

@@ -44,11 +44,10 @@ struct ur_mem_handle_t_ : ur_object {
   char *_mem;
   bool _ownsMem;
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount RefCount;
 
 private:
   const bool IsImage;
-  ur::RefCount RefCount;
 };
 
 struct ur_buffer final : ur_mem_handle_t_ {

unified-runtime/source/adapters/native_cpu/program.cpp

@@ -171,7 +171,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramLinkExp(
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramRetain(ur_program_handle_t hProgram) {
-  hProgram->getRefCount().retain();
+  hProgram->RefCount.retain();
   return UR_RESULT_SUCCESS;
 }
 
@@ -205,7 +205,7 @@ urProgramGetInfo(ur_program_handle_t hProgram, ur_program_info_t propName,
 
   switch (propName) {
   case UR_PROGRAM_INFO_REFERENCE_COUNT:
-    return returnValue(hProgram->getRefCount().getCount());
+    return returnValue(hProgram->RefCount.getCount());
   case UR_PROGRAM_INFO_CONTEXT:
     return returnValue(nullptr);
   case UR_PROGRAM_INFO_NUM_DEVICES:

unified-runtime/source/adapters/native_cpu/program.hpp

@@ -41,9 +41,6 @@ struct ur_program_handle_t_ {
       KernelMaxWorkGroupSizeMD;
   std::unordered_map<std::string, uint64_t> KernelMaxLinearWorkGroupSizeMD;
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
-
-private:
   ur::RefCount RefCount;
 };
 

unified-runtime/source/adapters/native_cpu/queue.cpp

@@ -28,7 +28,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueGetInfo(ur_queue_handle_t hQueue,
   case UR_QUEUE_INFO_DEVICE:
     return ReturnValue(hQueue->getDevice());
   case UR_QUEUE_INFO_REFERENCE_COUNT:
-    return ReturnValue(hQueue->getRefCount().getCount());
+    return ReturnValue(hQueue->RefCount.getCount());
   case UR_QUEUE_INFO_EMPTY:
     return ReturnValue(hQueue->isEmpty());
   default:
@@ -48,7 +48,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreate(
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urQueueRetain(ur_queue_handle_t hQueue) {
-  hQueue->getRefCount().retain();
+  hQueue->RefCount.retain();
 
   return UR_RESULT_SUCCESS;
 }

unified-runtime/source/adapters/native_cpu/queue.hpp

@@ -46,7 +46,7 @@ struct ur_queue_handle_t_ {
       auto ev = *events.begin();
       // ur_event_handle_t_::wait removes itself from the events set in the
       // queue.
-      ev->getRefCount().retain();
+      ev->RefCount.retain();
       // Unlocking mutex for removeEvent and for event callbacks that may need
       // to acquire it.
       lock.unlock();
@@ -67,7 +67,7 @@ struct ur_queue_handle_t_ {
     return events.size() == 0;
   }
 
-  ur::RefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount RefCount;
 
 private:
   ur_device_handle_t device;
@@ -76,5 +76,4 @@ struct ur_queue_handle_t_ {
   const bool inOrder;
   const bool profilingEnabled;
   std::mutex mutex;
-  ur::RefCount RefCount;
 };