Add decrementAndTest back in to fix logic in checks.

Author: martygrant

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

@@ -848,7 +848,7 @@ urCommandBufferRetainExp(ur_exp_command_buffer_handle_t CommandBuffer) {
 
 ur_result_t
 urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t CommandBuffer) {
-  if (!CommandBuffer->decrementRefCount() == 0)
+  if (!CommandBuffer->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   UR_CALL(waitForOngoingExecution(CommandBuffer));

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

@@ -251,7 +251,7 @@ ur_device_handle_t ur_context_handle_t_::getRootDevice() const {
 // from the list of tracked contexts.
 ur_result_t ContextReleaseHelper(ur_context_handle_t Context) {
 
-  if (!Context->decrementRefCount() == 0)
+  if (!Context->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (IndirectAccessTrackingEnabled) {

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

@@ -1651,7 +1651,7 @@ ur_result_t urDeviceRetain(ur_device_handle_t Device) {
 ur_result_t urDeviceRelease(ur_device_handle_t Device) {
   // Root devices are destroyed during the piTearDown process.
   if (Device->isSubDevice()) {
-    if (Device->decrementRefCount() == 0) {
+    if (Device->decrementAndTest()) {
       delete Device;
     }
   }

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

@@ -1088,7 +1088,7 @@ ur_event_handle_t_::~ur_event_handle_t_() {
 
 ur_result_t urEventReleaseInternal(ur_event_handle_t Event,
                                    bool *isEventDeleted) {
-  if (!Event->decrementRefCount() == 0)
+  if (!Event->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (Event->OriginAllocEvent) {

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

@@ -946,7 +946,7 @@ ur_result_t urKernelRetain(
 ur_result_t urKernelRelease(
     /// [in] handle for the Kernel to release
     ur_kernel_handle_t Kernel) {
-  if (!Kernel->decrementRefCount() == 0)
+  if (!Kernel->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   auto KernelProgram = Kernel->Program;

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

@@ -1642,7 +1642,7 @@ ur_result_t urMemRetain(
 ur_result_t urMemRelease(
     /// [in] handle of the memory object to release
     ur_mem_handle_t Mem) {
-  if (!Mem->decrementRefCount() == 0)
+  if (!Mem->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (Mem->isImage()) {

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

@@ -47,7 +47,7 @@ ur_result_t urPhysicalMemRetain(ur_physical_mem_handle_t hPhysicalMem) {
 }
 
 ur_result_t urPhysicalMemRelease(ur_physical_mem_handle_t hPhysicalMem) {
-  if (!hPhysicalMem->decrementRefCount() == 0)
+  if (!hPhysicalMem->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (checkL0LoaderTeardown()) {

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

@@ -565,7 +565,7 @@ ur_result_t urProgramRetain(
 ur_result_t urProgramRelease(
     /// [in] handle for the Program to release
     ur_program_handle_t Program) {
-  if (!Program->decrementRefCount() == 0)
+  if (!Program->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   delete Program;
@@ -1115,7 +1115,7 @@ void ur_program_handle_t_::ur_release_program_resources(bool deletion) {
   // must be destroyed before the Module can be destroyed.  So, be sure
   // to destroy build log before destroying the module.
   if (!deletion) {
-    if (!decrementRefCount() == 0) {
+    if (!decrementAndTest()) {
       return;
     }
   }

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

@@ -612,7 +612,7 @@ ur_result_t urQueueRelease(
       // internal reference count. When the External Reference count == 0, then
       // cleanup of the queue begins and the final decrement of the internal
       // reference count is completed.
-      static_cast<void>(Queue->decrementRefCount() == 0);
+      static_cast<void>(Queue->decrementAndTest());
       return UR_RESULT_SUCCESS;
     }
 
@@ -1588,7 +1588,7 @@ void ur_queue_handle_t_::clearEndTimeRecordings() {
 }
 
 ur_result_t urQueueReleaseInternal(ur_queue_handle_t Queue) {
-  if (!Queue->decrementRefCount() == 0)
+  if (!Queue->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   for (auto &Cache : Queue->EventCaches) {

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

@@ -131,7 +131,7 @@ ur_result_t urSamplerRetain(
 ur_result_t urSamplerRelease(
     /// [in] handle of the sampler object to release
     ur_sampler_handle_t Sampler) {
-  if (!Sampler->decrementRefCount() == 0)
+  if (!Sampler->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (checkL0LoaderTeardown()) {

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

@@ -530,7 +530,7 @@ urUSMPoolRetain(ur_usm_pool_handle_t Pool) {
 ur_result_t
 /// [in] pointer to USM memory pool
 urUSMPoolRelease(ur_usm_pool_handle_t Pool) {
-  if (Pool->decrementRefCount() == 0) {
+  if (Pool->decrementAndTest()) {
     std::scoped_lock<ur_shared_mutex> ContextLock(Pool->Context->Mutex);
     Pool->Context->UsmPoolHandles.remove(Pool);
     delete Pool;
@@ -1250,7 +1250,7 @@ ur_result_t ZeMemFreeHelper(ur_context_handle_t Context, void *Ptr) {
     if (It == std::end(Context->MemAllocs)) {
       die("All memory allocations must be tracked!");
     }
-    if (!It->second.decrementRefCount() == 0) {
+    if (!It->second.decrementAndTest()) {
       // Memory can't be deallocated yet.
       return UR_RESULT_SUCCESS;
     }
@@ -1297,7 +1297,7 @@ ur_result_t USMFreeHelper(ur_context_handle_t Context, void *Ptr,
     if (It == std::end(Context->MemAllocs)) {
       die("All memory allocations must be tracked!");
     }
-    if (!It->second.decrementRefCount() == 0) {
+    if (!It->second.decrementAndTest()) {
       // Memory can't be deallocated yet.
       return UR_RESULT_SUCCESS;
     }

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

@@ -266,7 +266,7 @@ urCommandBufferRetainExp(ur_exp_command_buffer_handle_t hCommandBuffer) try {
 
 ur_result_t
 urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) try {
-  if (!hCommandBuffer->decrementRefCount() == 0)
+  if (!hCommandBuffer->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (auto executionEvent = hCommandBuffer->getExecutionEventUnlocked()) {

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

@@ -85,7 +85,7 @@ ur_result_t ur_context_handle_t_::retain() {
 }
 
 ur_result_t ur_context_handle_t_::release() {
-  if (!decrementRefCount() == 0)
+  if (!decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   delete this;

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

@@ -165,7 +165,7 @@ ur_result_t ur_event_handle_t_::retain() {
 }
 
 ur_result_t ur_event_handle_t_::release() {
-  if (!decrementRefCount() == 0)
+  if (!decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   if (event_pool) {

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

@@ -97,7 +97,7 @@ ur_kernel_handle_t_::ur_kernel_handle_t_(
 }
 
 ur_result_t ur_kernel_handle_t_::release() {
-  if (!decrementRefCount() == 0)
+  if (!decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   // manually release kernels to allow errors to be propagated

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

@@ -691,7 +691,7 @@ ur_result_t urMemRetain(ur_mem_handle_t hMem) try {
 }
 
 ur_result_t urMemRelease(ur_mem_handle_t hMem) try {
-  if (!hMem->getObject()->decrementRefCount() == 0)
+  if (!hMem->getObject()->decrementAndTest())
     return UR_RESULT_SUCCESS;
 
   delete hMem;

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

@@ -57,7 +57,7 @@ struct ur_queue_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter> {
   ur_result_t queueRelease() {
     return std::visit(
         [queueHandle = this](auto &q) {
-          if (!q.decrementRefCount() == 0)
+          if (!q.decrementAndTest())
             return UR_RESULT_SUCCESS;
           delete queueHandle;
           return UR_RESULT_SUCCESS;

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

@@ -343,7 +343,7 @@ urUSMPoolRetain(ur_usm_pool_handle_t hPool) try {
 ur_result_t
 /// [in] pointer to USM memory pool
 urUSMPoolRelease(ur_usm_pool_handle_t hPool) try {
-  if (hPool->decrementRefCount() == 0) {
+  if (hPool->decrementAndTest()) {
     hPool->getContextHandle()->removeUsmPool(hPool);
     delete hPool;
   }

unified-runtime/source/ur/ur.hpp

@@ -232,6 +232,7 @@ template <typename getddi> struct handle_base {
   uint32_t getRefCount() const noexcept { return Count.load(); }
   uint32_t incrementRefCount() { return ++Count; }
   uint32_t decrementRefCount() { return --Count; }
+  bool decrementAndTest() { return --Count == 0; }
   void resetRefCount() { Count = 1; }
 
 private: