Move command buffer cleanup to destructor

Author: Xewar313

scripts/templates/queue_api.hpp.mako

@@ -36,9 +36,6 @@ struct ur_queue_handle_t_ {
     %endfor
 
     virtual ur_result_t
-    enqueueNativeCommandExp(ur_exp_enqueue_native_command_function_t, void *,
-                            uint32_t, const ur_mem_handle_t *,
-                            const ur_exp_enqueue_native_command_properties_t *,
-                            uint32_t, const ur_event_handle_t *,
-                            ur_event_handle_t *) = 0;
+    enqueueCommandBuffer(ze_command_list_handle_t, ur_event_handle_t *, 
+    uint32_t, const ur_event_handle_t *) = 0;
 };

source/adapters/level_zero/v2/command_buffer.cpp

@@ -53,15 +53,15 @@ ur_exp_command_buffer_handle_t_::ur_exp_command_buffer_handle_t_(
   UR_CALL_THROWS(ur::level_zero::urDeviceRetain(device));
 }
 
-void ur_exp_command_buffer_handle_t_::cleanupCommandBufferResources() {
+ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
   // Release the memory allocated to the Context stored in the command_buffer
-  UR_CALL_THROWS(ur::level_zero::urContextRelease(context));
+  ur::level_zero::urContextRelease(context);
 
   // Release the device
-  UR_CALL_THROWS(ur::level_zero::urDeviceRelease(device));
+  ur::level_zero::urDeviceRelease(device);
 
   for (auto &associatedKernel : kernelsList) {
-    UR_CALL_THROWS(ur::level_zero::urKernelRelease(associatedKernel));
+    ur::level_zero::urKernelRelease(associatedKernel);
   }
 }
 
@@ -140,12 +140,10 @@ urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
     if (!hCommandBuffer->RefCount.decrementAndTest())
       return UR_RESULT_SUCCESS;
 
-    hCommandBuffer->cleanupCommandBufferResources();
-  } catch (...) {
     delete hCommandBuffer;
+  } catch (...) {
     return exceptionToResult(std::current_exception());
   }
-  delete hCommandBuffer;
   return UR_RESULT_SUCCESS;
 }
 

source/adapters/level_zero/v2/command_buffer.hpp

@@ -31,15 +31,13 @@ struct ur_exp_command_buffer_handle_t_ : public _ur_object {
                                   ur_device_handle_t device,
                                   ze_command_list_handle_t commandList,
                                   const ur_exp_command_buffer_desc_t *desc);
+  ~ur_exp_command_buffer_handle_t_();
   ur_event_handle_t getSignalEvent(ur_event_handle_t *hUserEvent,
                                    ur_command_t commandType);
 
   std::pair<ze_event_handle_t *, uint32_t>
   getWaitListView(const ur_event_handle_t *phWaitEvents,
                   uint32_t numWaitEvents);
-  // Releases the resources associated with the command-buffer before the
-  // command-buffer object is destroyed.
-  void cleanupCommandBufferResources();
 
   // UR context associated with this command-buffer
   ur_context_handle_t context;