Refactor common.hpp

Author: Xewar313

source/adapters/level_zero/v2/common.hpp

@@ -16,16 +16,26 @@
 #include "../common.hpp"
 #include "logger/ur_logger.hpp"
 namespace {
-const char *desturctorNames[] = {"zeKernelDestroy", "zeEventDestroy",
-                                 "zeEventPoolDestroy", "zeContextDestroy",
-                                 "zeCommandListDestroy"};
-}
+#define DECLARE_DESTROY_FUNCTION(name)                                         \
+  template <typename ZeHandleT> ze_result_t name##_wrapped(ZeHandleT handle) { \
+    return ZE_CALL_NOCHECK_NAME(name, (handle), #name);                        \
+  }
+
+#define HANDLE_WRAPPER_TYPE(handle, destroy)                                   \
+  ze_handle_wrapper<handle, destroy##_wrapped<handle>>
+
+DECLARE_DESTROY_FUNCTION(zeKernelDestroy);
+DECLARE_DESTROY_FUNCTION(zeEventDestroy);
+DECLARE_DESTROY_FUNCTION(zeEventPoolDestroy);
+DECLARE_DESTROY_FUNCTION(zeContextDestroy);
+DECLARE_DESTROY_FUNCTION(zeCommandListDestroy);
+} // namespace
 
 namespace v2 {
 
 namespace raii {
 
-template <typename ZeHandleT, ze_result_t (*destroy)(ZeHandleT), size_t nameId>
+template <typename ZeHandleT, ze_result_t (*destroy)(ZeHandleT)>
 struct ze_handle_wrapper {
   ze_handle_wrapper(bool ownZeHandle = true)
       : handle(nullptr), ownZeHandle(ownZeHandle) {}
@@ -70,8 +80,7 @@ struct ze_handle_wrapper {
     }
 
     if (ownZeHandle) {
-      auto zeResult =
-          ZE_CALL_NOCHECK_NAME(destroy, (handle), desturctorNames[nameId]);
+      auto zeResult = destroy(handle);
       // Gracefully handle the case that L0 was already unloaded.
       if (zeResult && zeResult != ZE_RESULT_ERROR_UNINITIALIZED)
         throw ze2urResult(zeResult);
@@ -95,20 +104,20 @@ struct ze_handle_wrapper {
   bool ownZeHandle;
 };
 
-using ze_kernel_handle_t =
-    ze_handle_wrapper<::ze_kernel_handle_t, zeKernelDestroy, 0>;
+using ze_kernel_handle_t = HANDLE_WRAPPER_TYPE(::ze_kernel_handle_t,
+                                               zeKernelDestroy);
 
-using ze_event_handle_t =
-    ze_handle_wrapper<::ze_event_handle_t, zeEventDestroy, 1>;
+using ze_event_handle_t = HANDLE_WRAPPER_TYPE(::ze_event_handle_t,
+                                              zeEventDestroy);
 
-using ze_event_pool_handle_t =
-    ze_handle_wrapper<::ze_event_pool_handle_t, zeEventPoolDestroy, 2>;
+using ze_event_pool_handle_t = HANDLE_WRAPPER_TYPE(::ze_event_pool_handle_t,
+                                                   zeEventPoolDestroy);
 
-using ze_context_handle_t =
-    ze_handle_wrapper<::ze_context_handle_t, zeContextDestroy, 3>;
+using ze_context_handle_t = HANDLE_WRAPPER_TYPE(::ze_context_handle_t,
+                                                zeContextDestroy);
 
-using ze_command_list_handle_t =
-    ze_handle_wrapper<::ze_command_list_handle_t, zeCommandListDestroy, 4>;
+using ze_command_list_handle_t = HANDLE_WRAPPER_TYPE(::ze_command_list_handle_t,
+                                                     zeCommandListDestroy);
 
 } // namespace raii
 } // namespace v2