create compat header for 1.10 abi breakage

Signed-off-by: Neil R. Spruit <[email protected]>
oneapi-src · Sep 13, 2024 · b9b7660 · b9b7660
1 parent e8975fe
commit b9b7660
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/source/lib/CMakeLists.txt b/source/lib/CMakeLists.txt
@@ -13,6 +13,7 @@ target_sources(${TARGET_LOADER_NAME}
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.h
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_tracing_register_cb_libapi.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ze_loader_compat.h
 )
 
 

diff --git a/source/lib/ze_lib.h b/source/lib/ze_lib.h
@@ -20,6 +20,7 @@
 #include <vector>
 #include <mutex>
 #include <atomic>
+#include "ze_loader_compat.h"
 
 namespace ze_lib
 {
@@ -44,17 +45,17 @@ namespace ze_lib
         std::atomic<ze_dditable_t *>  zeDdiTable = {nullptr};
 
         ze_result_t zetDdiTableInit();
-        std::atomic<zet_dditable_t *> zetDdiTable = {nullptr};
+        std::atomic<zet_dditable_compat_t *> zetDdiTable = {nullptr};
 
         ze_result_t zesDdiTableInit();
-        std::atomic<zes_dditable_t *> zesDdiTable = {nullptr};
+        std::atomic<zes_dditable_compat_t *> zesDdiTable = {nullptr};
 
         ze_result_t zelTracingDdiTableInit();
         zel_tracing_dditable_t  zelTracingDdiTable = {};
         std::atomic<ze_dditable_t *> pTracingZeDdiTable = {nullptr};
         ze_dditable_t initialzeDdiTable;
-        zet_dditable_t initialzetDdiTable;
-        zes_dditable_t initialzesDdiTable;
+        zet_dditable_compat_t initialzetDdiTable;
+        zes_dditable_compat_t initialzesDdiTable;
         std::atomic_uint32_t tracingLayerEnableCounter{0};
 
         HMODULE tracing_lib = nullptr;

diff --git a/source/lib/zes_libddi.cpp b/source/lib/zes_libddi.cpp
@@ -208,7 +208,7 @@ namespace ze_lib
 
         if( ZE_RESULT_SUCCESS == result )
         {
-            result = zesGetDeviceExpProcAddrTable( ZE_API_VERSION_CURRENT, &initialzesDdiTable.DeviceExp );
+            result = zesGetDeviceExpProcAddrTable( ZE_API_VERSION_CURRENT, reinterpret_cast<zes_device_exp_dditable_t *>(&initialzesDdiTable.DeviceExp) );
         }
 
         if( ZE_RESULT_SUCCESS == result )
@@ -313,7 +313,7 @@ namespace ze_lib
 
         if( ZE_RESULT_SUCCESS == result )
         {
-            result = zesGetVFManagementExpProcAddrTable( ZE_API_VERSION_CURRENT, &initialzesDdiTable.VFManagementExp );
+            result = zesGetVFManagementExpProcAddrTable( ZE_API_VERSION_CURRENT, reinterpret_cast<zes_vf_management_exp_dditable_t *>(&initialzesDdiTable.VFManagementExp) );
         }
 
         return result;

diff --git a/source/lib/zet_libddi.cpp b/source/lib/zet_libddi.cpp
@@ -221,7 +221,7 @@ namespace ze_lib
 
         if( ZE_RESULT_SUCCESS == result )
         {
-            result = zetGetMetricGroupExpProcAddrTable( ZE_API_VERSION_CURRENT, &initialzetDdiTable.MetricGroupExp );
+            result = zetGetMetricGroupExpProcAddrTable( ZE_API_VERSION_CURRENT, reinterpret_cast< zet_metric_group_exp_dditable_t *>(&initialzetDdiTable.MetricGroupExp) );
         }
 
         if( ZE_RESULT_SUCCESS == result )

diff --git a/source/loader/ze_object.h b/source/loader/ze_object.h
@@ -9,13 +9,14 @@
  */
 #pragma once
 #include "ze_singleton.h"
+#include "../lib/ze_loader_compat.h"
 
 //////////////////////////////////////////////////////////////////////////
 struct dditable_t
 {
     ze_dditable_t   ze;
-    zet_dditable_t  zet;
-    zes_dditable_t  zes;
+    zet_dditable_compat_t  zet;
+    zes_dditable_compat_t  zes;
 };
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/source/loader/zes_ldrddi.cpp b/source/loader/zes_ldrddi.cpp
@@ -4570,7 +4570,7 @@ zesGetDeviceExpProcAddrTable(
             GET_FUNCTION_PTR( drv.handle, "zesGetDeviceExpProcAddrTable") );
         if(!getTable) 
             continue; 
-        result = getTable( version, &drv.dditable.zes.DeviceExp);
+        result = getTable( version, reinterpret_cast<zes_device_exp_dditable_t*>(&drv.dditable.zes.DeviceExp));
     }
 
 
@@ -4585,7 +4585,7 @@ zesGetDeviceExpProcAddrTable(
         else
         {
             // return pointers directly to driver's DDIs
-            *pDdiTable = loader::context->sysmanInstanceDrivers->front().dditable.zes.DeviceExp;
+            pDdiTable = reinterpret_cast<zes_device_exp_dditable_t*>(&loader::context->sysmanInstanceDrivers->front().dditable.zes.DeviceExp);
         }
     }
 
@@ -6214,7 +6214,7 @@ zesGetVFManagementExpProcAddrTable(
             GET_FUNCTION_PTR( drv.handle, "zesGetVFManagementExpProcAddrTable") );
         if(!getTable) 
             continue; 
-        result = getTable( version, &drv.dditable.zes.VFManagementExp);
+        result = getTable( version, reinterpret_cast<zes_vf_management_exp_dditable_t*>(&drv.dditable.zes.VFManagementExp));
     }
 
 
@@ -6230,7 +6230,7 @@ zesGetVFManagementExpProcAddrTable(
         else
         {
             // return pointers directly to driver's DDIs
-            *pDdiTable = loader::context->sysmanInstanceDrivers->front().dditable.zes.VFManagementExp;
+            pDdiTable = reinterpret_cast<zes_vf_management_exp_dditable_t*>(&loader::context->sysmanInstanceDrivers->front().dditable.zes.VFManagementExp);
         }
     }
 

diff --git a/source/loader/zet_ldrddi.cpp b/source/loader/zet_ldrddi.cpp
@@ -3206,7 +3206,7 @@ zetGetMetricGroupExpProcAddrTable(
             GET_FUNCTION_PTR( drv.handle, "zetGetMetricGroupExpProcAddrTable") );
         if(!getTable) 
             continue; 
-        result = getTable( version, &drv.dditable.zet.MetricGroupExp);
+        result = getTable( version, reinterpret_cast<zet_metric_group_exp_dditable_t*>(&drv.dditable.zet.MetricGroupExp));
     }
 
 
@@ -3227,7 +3227,7 @@ zetGetMetricGroupExpProcAddrTable(
         else
         {
             // return pointers directly to driver's DDIs
-            *pDdiTable = loader::context->zeDrivers.front().dditable.zet.MetricGroupExp;
+            pDdiTable = reinterpret_cast<zet_metric_group_exp_dditable_t*>(&loader::context->zeDrivers.front().dditable.zet.MetricGroupExp);
         }
     }