Address feedback: rename URRefCount to RefCount and put inside ur namespace. Add a constructor for the class with a default value and remove use of reset() inside the Adapter constructor, using the RefCount constructor to set default value instead.

Author: martygrant

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

@@ -296,13 +296,11 @@ Behavior Summary:
   SysMan initialization is skipped.
 */
 ur_adapter_handle_t_::ur_adapter_handle_t_()
-    : handle_base(), logger(logger::get_logger("level_zero")) {
+    : handle_base(), logger(logger::get_logger("level_zero")), RefCount(0) {
   ZeInitDriversResult = ZE_RESULT_ERROR_UNINITIALIZED;
   ZeInitResult = ZE_RESULT_ERROR_UNINITIALIZED;
   ZesResult = ZE_RESULT_ERROR_UNINITIALIZED;
 
-  RefCount.reset(0);
-
 #ifdef UR_STATIC_LEVEL_ZERO
   // Given static linking of the L0 Loader, we must delay the loader's
   // destruction of its context until after the UR Adapter is destroyed.

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

@@ -45,10 +45,10 @@ struct ur_adapter_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter> {
   logger::Logger &logger;
   HMODULE processHandle = nullptr;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 extern ur_adapter_handle_t_ *GlobalAdapter;

unified-runtime/source/adapters/level_zero/command_buffer.hpp

@@ -151,8 +151,8 @@ struct ur_exp_command_buffer_handle_t_ : public ur_object {
   std::vector<std::unique_ptr<ur_exp_command_buffer_command_handle_t_>>
       CommandHandles;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

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

@@ -259,10 +259,10 @@ struct MemAllocRecord : ur_object {
   // Zero runtime.
   ur_context_handle_t Context;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 extern usm::DisjointPoolAllConfigs DisjointPoolConfigInstance;

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

@@ -359,7 +359,7 @@ struct ur_context_handle_t_ : ur_object {
   // Get handle to the L0 context
   ze_context_handle_t getZeHandle() const;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   enum EventFlags {
@@ -408,7 +408,7 @@ struct ur_context_handle_t_ : ur_object {
     return &EventCaches[index];
   }
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 // Helper function to release the context, a caller must lock the platform-level

unified-runtime/source/adapters/level_zero/device.hpp

@@ -244,10 +244,10 @@ struct ur_device_handle_t_ : ur_object {
   // unique ephemeral identifer of the device in the adapter
   std::optional<DeviceId> Id;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 inline std::vector<ur_device_handle_t>

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

@@ -264,10 +264,10 @@ struct ur_event_handle_t_ : ur_object {
   // on async free to indicate when the allocation can be used again.
   ur_event_handle_t OriginAllocEvent = nullptr;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 // Helper function to implement zeHostSynchronize.

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

@@ -109,10 +109,10 @@ struct ur_kernel_handle_t_ : ur_object {
   ZeCache<ZeStruct<ze_kernel_properties_t>> ZeKernelProperties;
   ZeCache<std::string> ZeKernelName;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 ur_result_t getZeKernel(ze_device_handle_t hDevice, ur_kernel_handle_t hKernel,

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

@@ -91,7 +91,7 @@ struct ur_mem_handle_t_ : ur_object {
   // Method to get type of the derived object (image or buffer)
   bool isImage() const { return mem_type == mem_type_t::image; }
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 protected:
   ur_mem_handle_t_(mem_type_t type, ur_context_handle_t Context)
@@ -106,7 +106,7 @@ struct ur_mem_handle_t_ : ur_object {
   ~ur_mem_handle_t_() {};
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 struct ur_buffer final : ur_mem_handle_t_ {

unified-runtime/source/adapters/level_zero/physical_mem.hpp

@@ -23,8 +23,8 @@ struct ur_physical_mem_handle_t_ : ur_object {
   // Keeps the PI context of this memory handle.
   ur_context_handle_t Context;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

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

@@ -227,7 +227,7 @@ struct ur_program_handle_t_ : ur_object {
   // UR_PROGRAM_INFO_BINARY_SIZES.
   const std::vector<ur_device_handle_t> AssociatedDevices;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   struct DeviceData {
@@ -268,5 +268,5 @@ struct ur_program_handle_t_ : ur_object {
   // TODO: Currently interoparability UR API does not support multiple devices.
   ze_module_handle_t InteropZeModule = nullptr;
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

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

@@ -694,10 +694,10 @@ struct ur_queue_handle_t_ : ur_object {
   // Pointer to the unified handle.
   ur_queue_handle_t_ *UnifiedHandle;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 // This helper function creates a ur_event_handle_t and associate a

unified-runtime/source/adapters/level_zero/sampler.hpp

@@ -20,10 +20,10 @@ struct ur_sampler_handle_t_ : ur_object {
 
   ZeStruct<ze_sampler_desc_t> ZeSamplerDesc;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 // Construct ZE sampler desc from UR sampler desc.

unified-runtime/source/adapters/level_zero/usm.hpp

@@ -54,13 +54,13 @@ struct ur_usm_pool_handle_t_ : ur_object {
 
   ur_context_handle_t Context;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   UsmPool *getPool(const usm::pool_descriptor &Desc);
   usm::pool_manager<usm::pool_descriptor, UsmPool> PoolManager;
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };
 
 // Exception type to pass allocation errors

unified-runtime/source/adapters/level_zero/v2/command_buffer.hpp

@@ -65,7 +65,7 @@ struct ur_exp_command_buffer_handle_t_ : public ur_object {
   ur_event_handle_t
   createEventIfRequested(ur_exp_command_buffer_sync_point_t *retSyncPoint);
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   // Stores all sync points that are created by the command buffer.
@@ -91,5 +91,5 @@ struct ur_exp_command_buffer_handle_t_ : public ur_object {
 
   v2::raii::cache_borrowed_event_pool eventPool;
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/level_zero/v2/context.hpp

@@ -65,7 +65,7 @@ struct ur_context_handle_t_ : ur_object {
   // For that the Device or its root devices need to be in the context.
   bool isValidDevice(ur_device_handle_t Device) const;
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   const v2::raii::ze_context_handle_t hContext;
@@ -85,5 +85,5 @@ struct ur_context_handle_t_ : ur_object {
   ur_usm_pool_handle_t_ asyncPool;
   std::list<ur_usm_pool_handle_t> usmPoolHandles;
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/level_zero/v2/event.hpp

@@ -113,13 +113,13 @@ struct ur_event_handle_t_ : ur_object {
   uint64_t getEventStartTimestmap() const;
   uint64_t getEventEndTimestamp();
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   ur_event_handle_t_(ur_context_handle_t hContext, event_variant hZeEvent,
                      v2::event_flags_t flags, v2::event_pool *pool);
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 
 protected:
   ur_context_handle_t hContext;

unified-runtime/source/adapters/level_zero/v2/kernel.hpp

@@ -92,7 +92,7 @@ struct ur_kernel_handle_t_ : ur_object {
                                    ze_command_list_handle_t cmdList,
                                    wait_list_view &waitListView);
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   // Keep the program of the kernel.
@@ -120,5 +120,5 @@ struct ur_kernel_handle_t_ : ur_object {
   // pointer to any non-null kernel in deviceKernels
   ur_single_device_kernel_t *nonEmptyKernel;
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/level_zero/v2/memory.hpp

@@ -282,7 +282,7 @@ struct ur_mem_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter> {
 
   bool isImage() const { return std::holds_alternative<ur_mem_image_t>(mem); }
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   template <typename T, typename... Args>
@@ -296,5 +296,5 @@ struct ur_mem_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter> {
       mem;
 
 private:
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.hpp

@@ -33,7 +33,7 @@ struct ur_queue_immediate_in_order_t : ur_object, ur_queue_t_ {
   lockable<ur_command_list_manager> commandListManager;
   ur_queue_flags_t flags;
   v2::raii::cache_borrowed_event_pool eventPool;
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 
 public:
   ur_queue_immediate_in_order_t(ur_context_handle_t, ur_device_handle_t,
@@ -454,7 +454,7 @@ struct ur_queue_immediate_in_order_t : ur_object, ur_queue_t_ {
         createEventIfRequested(eventPool.get(), phEvent, this));
   }
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 };
 
 } // namespace v2

unified-runtime/source/adapters/level_zero/v2/usm.hpp

@@ -50,13 +50,13 @@ struct ur_usm_pool_handle_t_ : ur_object {
   void cleanupPools();
   void cleanupPoolsForQueue(void *hQueue);
 
-  URRefCount &getRefCount() noexcept { return RefCount; }
+  ur::RefCount &getRefCount() noexcept { return RefCount; }
 
 private:
   ur_context_handle_t hContext;
   usm::pool_manager<usm::pool_descriptor, UsmPool> poolManager;
 
   UsmPool *getPool(const usm::pool_descriptor &desc);
 
-  URRefCount RefCount;
+  ur::RefCount RefCount;
 };

unified-runtime/source/common/ur_ref_count.hpp

@@ -14,16 +14,24 @@
 #include <atomic>
 #include <cstdint>
 
-class URRefCount {
+namespace ur {
+
+class RefCount {
 public:
+  RefCount(uint32_t count = 1) : Count(count) {}
+  RefCount(const RefCount &) = delete;
+  RefCount &operator=(const RefCount &) = delete;
+
   uint32_t getCount() const noexcept { return Count.load(); }
   uint32_t increment() { return ++Count; }
   uint32_t decrement() { return --Count; }
   bool decrementAndTest() { return --Count == 0; }
   void reset(uint32_t value = 1) { Count = value; }
 
 private:
-  std::atomic_uint32_t Count{1};
+  std::atomic_uint32_t Count;
 };
 
+} // namespace ur
+
 #endif // URREFCOUNT_HPP