From 108c4ded66ee9bcd225358e723fe9173c15171d3 Mon Sep 17 00:00:00 2001 From: Brandon Yates Date: Wed, 18 May 2022 13:59:14 +0000 Subject: [PATCH] Add missing stypes and fix some topology api param names Signed-off-by: Brandon Yates --- CHANGELOG.md | 4 ++++ include/layers/zel_tracing_register_cb.h | 6 +++--- include/ze.py | 6 ++++-- include/ze_api.h | 18 ++++++++++-------- include/ze_ddi.h | 2 +- include/zes.py | 6 +++++- include/zes_api.h | 6 +++++- include/zes_ddi.h | 2 +- include/zet.py | 2 +- include/zet_api.h | 2 +- include/zet_ddi.h | 2 +- source/drivers/null/ze_nullddi.cpp | 14 +++++++------- source/layers/tracing/ze_trcddi.cpp | 22 +++++++++++----------- source/layers/validation/ze_valddi.cpp | 16 ++++++++-------- source/lib/ze_libapi.cpp | 16 ++++++++-------- source/loader/ze_ldrddi.cpp | 22 +++++++++++----------- 16 files changed, 81 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f51660af..206c3454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Level zero loader changelog +## v1.8.1 +*Add missing sTypes +*Fix argument names in some exp APIs + ## v1.8.0 * Add Support for L0 Spec v1.4 which includes * Core Fabric Topology API diff --git a/include/layers/zel_tracing_register_cb.h b/include/layers/zel_tracing_register_cb.h index d59e02d3..38b351ea 100644 --- a/include/layers/zel_tracing_register_cb.h +++ b/include/layers/zel_tracing_register_cb.h @@ -169,8 +169,8 @@ typedef void (ZE_APICALL *ze_pfnDevicePciGetPropertiesExtCb_t)( typedef struct _ze_device_get_fabric_vertex_exp_params_t { - ze_device_handle_t* phVertex; - ze_fabric_vertex_handle_t** ppVertex; + ze_device_handle_t* phDevice; + ze_fabric_vertex_handle_t** pphVertex; } ze_device_get_fabric_vertex_exp_params_t; @@ -671,7 +671,7 @@ typedef void (ZE_APICALL *ze_pfnFabricVertexGetPropertiesExpCb_t)( typedef struct _ze_fabric_vertex_get_device_exp_params_t { ze_fabric_vertex_handle_t* phVertex; - ze_device_handle_t** ppDevice; + ze_device_handle_t** pphDevice; } ze_fabric_vertex_get_device_exp_params_t; diff --git a/include/ze.py b/include/ze.py index 55a6005a..068fc995 100644 --- a/include/ze.py +++ b/include/ze.py @@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT @file ze.py - @version v1.4-r1.4.0 + @version v1.4-r1.4.1 """ import platform @@ -280,7 +280,9 @@ class ze_structure_type_v(IntEnum): IMAGE_MEMORY_EXP_PROPERTIES = 0x00020007 ## ::ze_image_memory_properties_exp_t POWER_SAVING_HINT_EXP_DESC = 0x00020008 ## ::ze_context_power_saving_hint_exp_desc_t COPY_BANDWIDTH_EXP_PROPERTIES = 0x00020009 ## ::ze_copy_bandwidth_exp_properties_t - DEVICE_P2P_BANDWIDTH_EXP_PROPERTIES = 0x00020010## ::ze_device_p2p_bandwidth_exp_properties_t + DEVICE_P2P_BANDWIDTH_EXP_PROPERTIES = 0x0002000A## ::ze_device_p2p_bandwidth_exp_properties_t + FABRIC_VERTEX_EXP_PROPERTIES = 0x0002000B ## ::ze_fabric_vertex_exp_properties_t + FABRIC_EDGE_EXP_PROPERTIES = 0x0002000C ## ::ze_fabric_edge_exp_properties_t class ze_structure_type_t(c_int): def __str__(self): diff --git a/include/ze_api.h b/include/ze_api.h index 59dd64d2..81e26d7b 100644 --- a/include/ze_api.h +++ b/include/ze_api.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file ze_api.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZE_API_H @@ -309,7 +309,9 @@ typedef enum _ze_structure_type_t ZE_STRUCTURE_TYPE_IMAGE_MEMORY_EXP_PROPERTIES = 0x00020007, ///< ::ze_image_memory_properties_exp_t ZE_STRUCTURE_TYPE_POWER_SAVING_HINT_EXP_DESC = 0x00020008, ///< ::ze_context_power_saving_hint_exp_desc_t ZE_STRUCTURE_TYPE_COPY_BANDWIDTH_EXP_PROPERTIES = 0x00020009, ///< ::ze_copy_bandwidth_exp_properties_t - ZE_STRUCTURE_TYPE_DEVICE_P2P_BANDWIDTH_EXP_PROPERTIES = 0x00020010, ///< ::ze_device_p2p_bandwidth_exp_properties_t + ZE_STRUCTURE_TYPE_DEVICE_P2P_BANDWIDTH_EXP_PROPERTIES = 0x0002000A, ///< ::ze_device_p2p_bandwidth_exp_properties_t + ZE_STRUCTURE_TYPE_FABRIC_VERTEX_EXP_PROPERTIES = 0x0002000B,///< ::ze_fabric_vertex_exp_properties_t + ZE_STRUCTURE_TYPE_FABRIC_EDGE_EXP_PROPERTIES = 0x0002000C, ///< ::ze_fabric_edge_exp_properties_t ZE_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff } ze_structure_type_t; @@ -7866,7 +7868,7 @@ zeFabricVertexGetPropertiesExp( /// - ::ZE_RESULT_ERROR_INVALID_NULL_HANDLE /// + `nullptr == hVertex` /// - ::ZE_RESULT_ERROR_INVALID_NULL_POINTER -/// + `nullptr == pDevice` +/// + `nullptr == phDevice` /// - ::ZE_RESULT_EXP_ERROR_VERTEX_IS_NOT_DEVICE /// + Provided fabric vertex handle does not correspond to a device or subdevice. /// - ::ZE_RESULT_EXP_ERROR_REMOTE_DEVICE @@ -7874,7 +7876,7 @@ zeFabricVertexGetPropertiesExp( ZE_APIEXPORT ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ); /////////////////////////////////////////////////////////////////////////////// @@ -7889,15 +7891,15 @@ zeFabricVertexGetDeviceExp( /// - ::ZE_RESULT_ERROR_UNINITIALIZED /// - ::ZE_RESULT_ERROR_DEVICE_LOST /// - ::ZE_RESULT_ERROR_INVALID_NULL_HANDLE -/// + `nullptr == hVertex` +/// + `nullptr == hDevice` /// - ::ZE_RESULT_ERROR_INVALID_NULL_POINTER -/// + `nullptr == pVertex` +/// + `nullptr == phVertex` /// - ::ZE_RESULT_EXP_ERROR_DEVICE_IS_NOT_VERTEX /// + Provided device handle does not correspond to a fabric vertex. ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ); /////////////////////////////////////////////////////////////////////////////// diff --git a/include/ze_ddi.h b/include/ze_ddi.h index efbc1ef5..957c323b 100644 --- a/include/ze_ddi.h +++ b/include/ze_ddi.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file ze_ddi.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZE_DDI_H diff --git a/include/zes.py b/include/zes.py index 57cb5df2..a19a0ef4 100644 --- a/include/zes.py +++ b/include/zes.py @@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT @file zes.py - @version v1.4-r1.4.0 + @version v1.4-r1.4.1 """ import platform @@ -138,6 +138,10 @@ class zes_structure_type_v(IntEnum): RAS_STATE = 0x22 ## ::zes_ras_state_t TEMP_CONFIG = 0x23 ## ::zes_temp_config_t PCI_BAR_PROPERTIES_1_2 = 0x24 ## ::zes_pci_bar_properties_1_2_t + DEVICE_ECC_DESC = 0x25 ## ::zes_device_ecc_desc_t + DEVICE_ECC_PROPERTIES = 0x26 ## ::zes_device_ecc_properties_t + POWER_LIMIT_EXT_DESC = 0x27 ## ::zes_power_limit_ext_desc_t + POWER_EXT_PROPERTIES = 0x28 ## ::zes_power_ext_properties_t class zes_structure_type_t(c_int): def __str__(self): diff --git a/include/zes_api.h b/include/zes_api.h index da31bec6..7e3cdea5 100644 --- a/include/zes_api.h +++ b/include/zes_api.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file zes_api.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZES_API_H @@ -133,6 +133,10 @@ typedef enum _zes_structure_type_t ZES_STRUCTURE_TYPE_RAS_STATE = 0x22, ///< ::zes_ras_state_t ZES_STRUCTURE_TYPE_TEMP_CONFIG = 0x23, ///< ::zes_temp_config_t ZES_STRUCTURE_TYPE_PCI_BAR_PROPERTIES_1_2 = 0x24, ///< ::zes_pci_bar_properties_1_2_t + ZES_STRUCTURE_TYPE_DEVICE_ECC_DESC = 0x25, ///< ::zes_device_ecc_desc_t + ZES_STRUCTURE_TYPE_DEVICE_ECC_PROPERTIES = 0x26,///< ::zes_device_ecc_properties_t + ZES_STRUCTURE_TYPE_POWER_LIMIT_EXT_DESC = 0x27, ///< ::zes_power_limit_ext_desc_t + ZES_STRUCTURE_TYPE_POWER_EXT_PROPERTIES = 0x28, ///< ::zes_power_ext_properties_t ZES_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff } zes_structure_type_t; diff --git a/include/zes_ddi.h b/include/zes_ddi.h index 7f583414..2e9e58b3 100644 --- a/include/zes_ddi.h +++ b/include/zes_ddi.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file zes_ddi.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZES_DDI_H diff --git a/include/zet.py b/include/zet.py index 3a33235e..49fe2cbe 100644 --- a/include/zet.py +++ b/include/zet.py @@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT @file zet.py - @version v1.4-r1.4.0 + @version v1.4-r1.4.1 """ import platform diff --git a/include/zet_api.h b/include/zet_api.h index f8c2222c..291969ab 100644 --- a/include/zet_api.h +++ b/include/zet_api.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file zet_api.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZET_API_H diff --git a/include/zet_ddi.h b/include/zet_ddi.h index 3a57a3a7..2edf78e4 100644 --- a/include/zet_ddi.h +++ b/include/zet_ddi.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT * * @file zet_ddi.h - * @version v1.4-r1.4.0 + * @version v1.4-r1.4.1 * */ #ifndef _ZET_DDI_H diff --git a/source/drivers/null/ze_nullddi.cpp b/source/drivers/null/ze_nullddi.cpp index 33d14bf1..b3ddf5ad 100644 --- a/source/drivers/null/ze_nullddi.cpp +++ b/source/drivers/null/ze_nullddi.cpp @@ -3796,7 +3796,7 @@ namespace driver __zedlllocal ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ) { ze_result_t result = ZE_RESULT_SUCCESS; @@ -3805,12 +3805,12 @@ namespace driver auto pfnGetDeviceExp = context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp; if( nullptr != pfnGetDeviceExp ) { - result = pfnGetDeviceExp( hVertex, pDevice ); + result = pfnGetDeviceExp( hVertex, phDevice ); } else { // generic implementation - *pDevice = reinterpret_cast( context.get() ); + *phDevice = reinterpret_cast( context.get() ); } @@ -3821,8 +3821,8 @@ namespace driver /// @brief Intercept function for zeDeviceGetFabricVertexExp __zedlllocal ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ) { ze_result_t result = ZE_RESULT_SUCCESS; @@ -3831,12 +3831,12 @@ namespace driver auto pfnGetFabricVertexExp = context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp; if( nullptr != pfnGetFabricVertexExp ) { - result = pfnGetFabricVertexExp( hVertex, pVertex ); + result = pfnGetFabricVertexExp( hDevice, phVertex ); } else { // generic implementation - *pVertex = reinterpret_cast( context.get() ); + *phVertex = reinterpret_cast( context.get() ); } diff --git a/source/layers/tracing/ze_trcddi.cpp b/source/layers/tracing/ze_trcddi.cpp index 5c5efe7e..abbf7199 100644 --- a/source/layers/tracing/ze_trcddi.cpp +++ b/source/layers/tracing/ze_trcddi.cpp @@ -5645,7 +5645,7 @@ namespace tracing_layer __zedlllocal ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ) { auto pfnGetDeviceExp = context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp; @@ -5653,12 +5653,12 @@ namespace tracing_layer if( nullptr == pfnGetDeviceExp) return ZE_RESULT_ERROR_UNINITIALIZED; - ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp, hVertex, pDevice); + ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp, hVertex, phDevice); // capture parameters ze_fabric_vertex_get_device_exp_params_t tracerParams = { &hVertex, - &pDevice + &phDevice }; tracing_layer::APITracerCallbackDataImp apiCallbackData; @@ -5672,15 +5672,15 @@ namespace tracing_layer apiCallbackData.prologCallbacks, apiCallbackData.epilogCallbacks, *tracerParams.phVertex, - *tracerParams.ppDevice); + *tracerParams.pphDevice); } /////////////////////////////////////////////////////////////////////////////// /// @brief Intercept function for zeDeviceGetFabricVertexExp __zedlllocal ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ) { auto pfnGetFabricVertexExp = context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp; @@ -5688,12 +5688,12 @@ namespace tracing_layer if( nullptr == pfnGetFabricVertexExp) return ZE_RESULT_ERROR_UNINITIALIZED; - ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp, hVertex, pVertex); + ZE_HANDLE_TRACER_RECURSION(context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp, hDevice, phVertex); // capture parameters ze_device_get_fabric_vertex_exp_params_t tracerParams = { - &hVertex, - &pVertex + &hDevice, + &phVertex }; tracing_layer::APITracerCallbackDataImp apiCallbackData; @@ -5706,8 +5706,8 @@ namespace tracing_layer apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, apiCallbackData.epilogCallbacks, - *tracerParams.phVertex, - *tracerParams.ppVertex); + *tracerParams.phDevice, + *tracerParams.pphVertex); } /////////////////////////////////////////////////////////////////////////////// diff --git a/source/layers/validation/ze_valddi.cpp b/source/layers/validation/ze_valddi.cpp index 6a727bda..f18f0e41 100644 --- a/source/layers/validation/ze_valddi.cpp +++ b/source/layers/validation/ze_valddi.cpp @@ -4359,7 +4359,7 @@ namespace validation_layer __zedlllocal ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ) { auto pfnGetDeviceExp = context.zeDdiTable.FabricVertexExp.pfnGetDeviceExp; @@ -4372,20 +4372,20 @@ namespace validation_layer if( nullptr == hVertex ) return ZE_RESULT_ERROR_INVALID_NULL_HANDLE; - if( nullptr == pDevice ) + if( nullptr == phDevice ) return ZE_RESULT_ERROR_INVALID_NULL_POINTER; } - return pfnGetDeviceExp( hVertex, pDevice ); + return pfnGetDeviceExp( hVertex, phDevice ); } /////////////////////////////////////////////////////////////////////////////// /// @brief Intercept function for zeDeviceGetFabricVertexExp __zedlllocal ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ) { auto pfnGetFabricVertexExp = context.zeDdiTable.DeviceExp.pfnGetFabricVertexExp; @@ -4395,15 +4395,15 @@ namespace validation_layer if( context.enableParameterValidation ) { - if( nullptr == hVertex ) + if( nullptr == hDevice ) return ZE_RESULT_ERROR_INVALID_NULL_HANDLE; - if( nullptr == pVertex ) + if( nullptr == phVertex ) return ZE_RESULT_ERROR_INVALID_NULL_POINTER; } - return pfnGetFabricVertexExp( hVertex, pVertex ); + return pfnGetFabricVertexExp( hDevice, phVertex ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/source/lib/ze_libapi.cpp b/source/lib/ze_libapi.cpp index 62c78bfc..9bbf9b96 100644 --- a/source/lib/ze_libapi.cpp +++ b/source/lib/ze_libapi.cpp @@ -5437,7 +5437,7 @@ zeFabricVertexGetPropertiesExp( /// - ::ZE_RESULT_ERROR_INVALID_NULL_HANDLE /// + `nullptr == hVertex` /// - ::ZE_RESULT_ERROR_INVALID_NULL_POINTER -/// + `nullptr == pDevice` +/// + `nullptr == phDevice` /// - ::ZE_RESULT_EXP_ERROR_VERTEX_IS_NOT_DEVICE /// + Provided fabric vertex handle does not correspond to a device or subdevice. /// - ::ZE_RESULT_EXP_ERROR_REMOTE_DEVICE @@ -5445,14 +5445,14 @@ zeFabricVertexGetPropertiesExp( ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ) { auto pfnGetDeviceExp = ze_lib::context->zeDdiTable.FabricVertexExp.pfnGetDeviceExp; if( nullptr == pfnGetDeviceExp ) return ZE_RESULT_ERROR_UNINITIALIZED; - return pfnGetDeviceExp( hVertex, pDevice ); + return pfnGetDeviceExp( hVertex, phDevice ); } /////////////////////////////////////////////////////////////////////////////// @@ -5467,22 +5467,22 @@ zeFabricVertexGetDeviceExp( /// - ::ZE_RESULT_ERROR_UNINITIALIZED /// - ::ZE_RESULT_ERROR_DEVICE_LOST /// - ::ZE_RESULT_ERROR_INVALID_NULL_HANDLE -/// + `nullptr == hVertex` +/// + `nullptr == hDevice` /// - ::ZE_RESULT_ERROR_INVALID_NULL_POINTER -/// + `nullptr == pVertex` +/// + `nullptr == phVertex` /// - ::ZE_RESULT_EXP_ERROR_DEVICE_IS_NOT_VERTEX /// + Provided device handle does not correspond to a fabric vertex. ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ) { auto pfnGetFabricVertexExp = ze_lib::context->zeDdiTable.DeviceExp.pfnGetFabricVertexExp; if( nullptr == pfnGetFabricVertexExp ) return ZE_RESULT_ERROR_UNINITIALIZED; - return pfnGetFabricVertexExp( hVertex, pVertex ); + return pfnGetFabricVertexExp( hDevice, phVertex ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/source/loader/ze_ldrddi.cpp b/source/loader/ze_ldrddi.cpp index 3bd28a8f..5e4ea71c 100644 --- a/source/loader/ze_ldrddi.cpp +++ b/source/loader/ze_ldrddi.cpp @@ -4653,7 +4653,7 @@ namespace loader __zedlllocal ze_result_t ZE_APICALL zeFabricVertexGetDeviceExp( ze_fabric_vertex_handle_t hVertex, ///< [in] handle of the fabric vertex - ze_device_handle_t* pDevice ///< [out] device handle corresponding to fabric vertex + ze_device_handle_t* phDevice ///< [out] device handle corresponding to fabric vertex ) { ze_result_t result = ZE_RESULT_SUCCESS; @@ -4668,7 +4668,7 @@ namespace loader hVertex = reinterpret_cast( hVertex )->handle; // forward to device-driver - result = pfnGetDeviceExp( hVertex, pDevice ); + result = pfnGetDeviceExp( hVertex, phDevice ); if( ZE_RESULT_SUCCESS != result ) return result; @@ -4676,8 +4676,8 @@ namespace loader try { // convert driver handle to loader handle - *pDevice = reinterpret_cast( - ze_device_factory.getInstance( *pDevice, dditable ) ); + *phDevice = reinterpret_cast( + ze_device_factory.getInstance( *phDevice, dditable ) ); } catch( std::bad_alloc& ) { @@ -4691,23 +4691,23 @@ namespace loader /// @brief Intercept function for zeDeviceGetFabricVertexExp __zedlllocal ze_result_t ZE_APICALL zeDeviceGetFabricVertexExp( - ze_device_handle_t hVertex, ///< [in] handle of the device - ze_fabric_vertex_handle_t* pVertex ///< [out] fabric vertex handle corresponding to device + ze_device_handle_t hDevice, ///< [in] handle of the device + ze_fabric_vertex_handle_t* phVertex ///< [out] fabric vertex handle corresponding to device ) { ze_result_t result = ZE_RESULT_SUCCESS; // extract driver's function pointer table - auto dditable = reinterpret_cast( hVertex )->dditable; + auto dditable = reinterpret_cast( hDevice )->dditable; auto pfnGetFabricVertexExp = dditable->ze.DeviceExp.pfnGetFabricVertexExp; if( nullptr == pfnGetFabricVertexExp ) return ZE_RESULT_ERROR_UNINITIALIZED; // convert loader handle to driver handle - hVertex = reinterpret_cast( hVertex )->handle; + hDevice = reinterpret_cast( hDevice )->handle; // forward to device-driver - result = pfnGetFabricVertexExp( hVertex, pVertex ); + result = pfnGetFabricVertexExp( hDevice, phVertex ); if( ZE_RESULT_SUCCESS != result ) return result; @@ -4715,8 +4715,8 @@ namespace loader try { // convert driver handle to loader handle - *pVertex = reinterpret_cast( - ze_fabric_vertex_factory.getInstance( *pVertex, dditable ) ); + *phVertex = reinterpret_cast( + ze_fabric_vertex_factory.getInstance( *phVertex, dditable ) ); } catch( std::bad_alloc& ) {