Add proper cleanup of DDI Driver Tables

Signed-off-by: Neil R. Spruit <[email protected]>

Author: nrspruit

scripts/templates/ldrddi.cpp.mako

@@ -183,6 +183,19 @@ namespace loader
     }
     %endif
     %endfor
+
+    ///////////////////////////////////////////////////////////////////////////////
+    /// @brief function for removing the ddi driver tables for ${n}
+    __${x}dlllocal void ${X}_APICALL
+    ${n}DestroyDDiDriverTables(${n}_dditable_driver_t* pDdiTable)
+    {
+        // Delete ddi tables
+%for tbl in th.get_pfntables(specs, meta, n, tags):
+        delete pDdiTable->${tbl['name']};
+%endfor
+        delete pDdiTable;
+    }
+
 } // namespace loader
 
 #if defined(__cplusplus)

scripts/templates/ldrddi.h.mako

@@ -32,6 +32,8 @@ namespace loader
 
     %endif
     %endfor
+    __${x}dlllocal void ${X}_APICALL
+    ${n}DestroyDDiDriverTables(${n}_dditable_driver_t* pDdiTable);
 }
 
 #if defined(__cplusplus)

scripts/templates/ldrddi_legacy.cpp.mako

@@ -314,13 +314,6 @@ extern "C" {
 %for tbl in th.get_pfntables(specs, meta, n, tags):
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief function for filling the legacy api pointers for ${tbl['name']} table
-///        with current process' addresses
-///
-/// @returns
-///     - ::${X}_RESULT_SUCCESS
-///     - ::${X}_RESULT_ERROR_UNINITIALIZED
-///     - ::${X}_RESULT_ERROR_INVALID_NULL_POINTER
-///     - ::${X}_RESULT_ERROR_UNSUPPORTED_VERSION
 __${x}dlllocal void ${X}_APICALL
 ${tbl['export']['name']}Legacy()
 {

source/loader/ze_ldrddi.cpp

@@ -4837,6 +4837,44 @@ namespace loader
         return result;
     }
 
+
+    ///////////////////////////////////////////////////////////////////////////////
+    /// @brief function for removing the ddi driver tables for ze
+    __zedlllocal void ZE_APICALL
+    zeDestroyDDiDriverTables(ze_dditable_driver_t* pDdiTable)
+    {
+        // Delete ddi tables
+        delete pDdiTable->Global;
+        delete pDdiTable->RTASBuilderExp;
+        delete pDdiTable->RTASParallelOperationExp;
+        delete pDdiTable->Driver;
+        delete pDdiTable->DriverExp;
+        delete pDdiTable->Device;
+        delete pDdiTable->DeviceExp;
+        delete pDdiTable->Context;
+        delete pDdiTable->CommandQueue;
+        delete pDdiTable->CommandList;
+        delete pDdiTable->CommandListExp;
+        delete pDdiTable->Event;
+        delete pDdiTable->EventExp;
+        delete pDdiTable->EventPool;
+        delete pDdiTable->Fence;
+        delete pDdiTable->Image;
+        delete pDdiTable->ImageExp;
+        delete pDdiTable->Kernel;
+        delete pDdiTable->KernelExp;
+        delete pDdiTable->Mem;
+        delete pDdiTable->MemExp;
+        delete pDdiTable->Module;
+        delete pDdiTable->ModuleBuildLog;
+        delete pDdiTable->PhysicalMem;
+        delete pDdiTable->Sampler;
+        delete pDdiTable->VirtualMem;
+        delete pDdiTable->FabricEdgeExp;
+        delete pDdiTable->FabricVertexExp;
+        delete pDdiTable;
+    }
+
 } // namespace loader
 
 #if defined(__cplusplus)

source/loader/ze_ldrddi.h

@@ -69,6 +69,8 @@ namespace loader
     using ze_rtas_parallel_operation_exp_object_t = object_t < ze_rtas_parallel_operation_exp_handle_t >;
     using ze_rtas_parallel_operation_exp_factory_t    = singleton_factory_t < ze_rtas_parallel_operation_exp_object_t, ze_rtas_parallel_operation_exp_handle_t >;
 
+    __zedlllocal void ZE_APICALL
+    zeDestroyDDiDriverTables(ze_dditable_driver_t* pDdiTable);
 }
 
 #if defined(__cplusplus)