Skip to content

Commit 38b7739

Browse files
nrspruitnrspruit
authored
Fixed EXP handling and removed invalid ddi table (#213)
Signed-off-by: Neil R. Spruit <[email protected]>
1 parent 0bfc92d commit 38b7739

File tree

19 files changed

+83
-273
lines changed

19 files changed

+83
-273
lines changed

‎include/ze.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
SPDX-License-Identifier: MIT
55
66
@file ze.py
7-
@version v1.11-r1.11.0
7+
@version v1.11-r1.11.1
88
99
"""
1010
import platform

‎include/ze_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file ze_api.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZE_API_H

‎include/ze_ddi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file ze_ddi.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZE_DDI_H

‎include/zes.py

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
SPDX-License-Identifier: MIT
55
66
@file zes.py
7-
@version v1.11-r1.11.0
7+
@version v1.11-r1.11.1
88
99
"""
1010
import platform
@@ -3833,6 +3833,13 @@ class _zes_diagnostics_dditable_t(Structure):
38333833
("pfnRunTests", c_void_p) ## _zesDiagnosticsRunTests_t
38343834
]
38353835

3836+
###############################################################################
3837+
## @brief Function-pointer for zesVFManagementGetVFCapabilitiesExp
3838+
if __use_win_types:
3839+
_zesVFManagementGetVFCapabilitiesExp_t = WINFUNCTYPE( ze_result_t, zes_vf_handle_t, POINTER(zes_vf_exp_capabilities_t) )
3840+
else:
3841+
_zesVFManagementGetVFCapabilitiesExp_t = CFUNCTYPE( ze_result_t, zes_vf_handle_t, POINTER(zes_vf_exp_capabilities_t) )
3842+
38363843
###############################################################################
38373844
## @brief Function-pointer for zesVFManagementGetVFMemoryUtilizationExp2
38383845
if __use_win_types:
@@ -3847,22 +3854,6 @@ class _zes_diagnostics_dditable_t(Structure):
38473854
else:
38483855
_zesVFManagementGetVFEngineUtilizationExp2_t = CFUNCTYPE( ze_result_t, zes_vf_handle_t, POINTER(c_ulong), POINTER(zes_vf_util_engine_exp2_t) )
38493856

3850-
3851-
###############################################################################
3852-
## @brief Table of VFManagement functions pointers
3853-
class _zes_vf_management_dditable_t(Structure):
3854-
_fields_ = [
3855-
("pfnGetVFMemoryUtilizationExp2", c_void_p), ## _zesVFManagementGetVFMemoryUtilizationExp2_t
3856-
("pfnGetVFEngineUtilizationExp2", c_void_p) ## _zesVFManagementGetVFEngineUtilizationExp2_t
3857-
]
3858-
3859-
###############################################################################
3860-
## @brief Function-pointer for zesVFManagementGetVFCapabilitiesExp
3861-
if __use_win_types:
3862-
_zesVFManagementGetVFCapabilitiesExp_t = WINFUNCTYPE( ze_result_t, zes_vf_handle_t, POINTER(zes_vf_exp_capabilities_t) )
3863-
else:
3864-
_zesVFManagementGetVFCapabilitiesExp_t = CFUNCTYPE( ze_result_t, zes_vf_handle_t, POINTER(zes_vf_exp_capabilities_t) )
3865-
38663857
###############################################################################
38673858
## @brief Function-pointer for zesVFManagementGetVFPropertiesExp
38683859
if __use_win_types:
@@ -3904,6 +3895,8 @@ class _zes_vf_management_dditable_t(Structure):
39043895
class _zes_vf_management_exp_dditable_t(Structure):
39053896
_fields_ = [
39063897
("pfnGetVFCapabilitiesExp", c_void_p), ## _zesVFManagementGetVFCapabilitiesExp_t
3898+
("pfnGetVFMemoryUtilizationExp2", c_void_p), ## _zesVFManagementGetVFMemoryUtilizationExp2_t
3899+
("pfnGetVFEngineUtilizationExp2", c_void_p), ## _zesVFManagementGetVFEngineUtilizationExp2_t
39073900
("pfnGetVFPropertiesExp", c_void_p), ## _zesVFManagementGetVFPropertiesExp_t
39083901
("pfnGetVFMemoryUtilizationExp", c_void_p), ## _zesVFManagementGetVFMemoryUtilizationExp_t
39093902
("pfnGetVFEngineUtilizationExp", c_void_p), ## _zesVFManagementGetVFEngineUtilizationExp_t
@@ -3937,7 +3930,6 @@ class _zes_dditable_t(Structure):
39373930
("Ras", _zes_ras_dditable_t),
39383931
("RasExp", _zes_ras_exp_dditable_t),
39393932
("Diagnostics", _zes_diagnostics_dditable_t),
3940-
("VFManagement", _zes_vf_management_dditable_t),
39413933
("VFManagementExp", _zes_vf_management_exp_dditable_t)
39423934
]
39433935

@@ -4301,17 +4293,6 @@ def __init__(self, version : ze_api_version_t):
43014293
self.zesDiagnosticsGetTests = _zesDiagnosticsGetTests_t(self.__dditable.Diagnostics.pfnGetTests)
43024294
self.zesDiagnosticsRunTests = _zesDiagnosticsRunTests_t(self.__dditable.Diagnostics.pfnRunTests)
43034295

4304-
# call driver to get function pointers
4305-
_VFManagement = _zes_vf_management_dditable_t()
4306-
r = ze_result_v(self.__dll.zesGetVFManagementProcAddrTable(version, byref(_VFManagement)))
4307-
if r != ze_result_v.SUCCESS:
4308-
raise Exception(r)
4309-
self.__dditable.VFManagement = _VFManagement
4310-
4311-
# attach function interface to function address
4312-
self.zesVFManagementGetVFMemoryUtilizationExp2 = _zesVFManagementGetVFMemoryUtilizationExp2_t(self.__dditable.VFManagement.pfnGetVFMemoryUtilizationExp2)
4313-
self.zesVFManagementGetVFEngineUtilizationExp2 = _zesVFManagementGetVFEngineUtilizationExp2_t(self.__dditable.VFManagement.pfnGetVFEngineUtilizationExp2)
4314-
43154296
# call driver to get function pointers
43164297
_VFManagementExp = _zes_vf_management_exp_dditable_t()
43174298
r = ze_result_v(self.__dll.zesGetVFManagementExpProcAddrTable(version, byref(_VFManagementExp)))
@@ -4321,6 +4302,8 @@ def __init__(self, version : ze_api_version_t):
43214302

43224303
# attach function interface to function address
43234304
self.zesVFManagementGetVFCapabilitiesExp = _zesVFManagementGetVFCapabilitiesExp_t(self.__dditable.VFManagementExp.pfnGetVFCapabilitiesExp)
4305+
self.zesVFManagementGetVFMemoryUtilizationExp2 = _zesVFManagementGetVFMemoryUtilizationExp2_t(self.__dditable.VFManagementExp.pfnGetVFMemoryUtilizationExp2)
4306+
self.zesVFManagementGetVFEngineUtilizationExp2 = _zesVFManagementGetVFEngineUtilizationExp2_t(self.__dditable.VFManagementExp.pfnGetVFEngineUtilizationExp2)
43244307
self.zesVFManagementGetVFPropertiesExp = _zesVFManagementGetVFPropertiesExp_t(self.__dditable.VFManagementExp.pfnGetVFPropertiesExp)
43254308
self.zesVFManagementGetVFMemoryUtilizationExp = _zesVFManagementGetVFMemoryUtilizationExp_t(self.__dditable.VFManagementExp.pfnGetVFMemoryUtilizationExp)
43264309
self.zesVFManagementGetVFEngineUtilizationExp = _zesVFManagementGetVFEngineUtilizationExp_t(self.__dditable.VFManagementExp.pfnGetVFEngineUtilizationExp)

‎include/zes_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file zes_api.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZES_API_H

‎include/zes_ddi.h

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file zes_ddi.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZES_DDI_H
@@ -1856,6 +1856,13 @@ typedef ze_result_t (ZE_APICALL *zes_pfnGetDiagnosticsProcAddrTable_t)(
18561856
zes_diagnostics_dditable_t*
18571857
);
18581858

1859+
///////////////////////////////////////////////////////////////////////////////
1860+
/// @brief Function-pointer for zesVFManagementGetVFCapabilitiesExp
1861+
typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementGetVFCapabilitiesExp_t)(
1862+
zes_vf_handle_t,
1863+
zes_vf_exp_capabilities_t*
1864+
);
1865+
18591866
///////////////////////////////////////////////////////////////////////////////
18601867
/// @brief Function-pointer for zesVFManagementGetVFMemoryUtilizationExp2
18611868
typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementGetVFMemoryUtilizationExp2_t)(
@@ -1872,43 +1879,6 @@ typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementGetVFEngineUtilizationExp2_t
18721879
zes_vf_util_engine_exp2_t*
18731880
);
18741881

1875-
///////////////////////////////////////////////////////////////////////////////
1876-
/// @brief Table of VFManagement functions pointers
1877-
typedef struct _zes_vf_management_dditable_t
1878-
{
1879-
zes_pfnVFManagementGetVFMemoryUtilizationExp2_t pfnGetVFMemoryUtilizationExp2;
1880-
zes_pfnVFManagementGetVFEngineUtilizationExp2_t pfnGetVFEngineUtilizationExp2;
1881-
} zes_vf_management_dditable_t;
1882-
1883-
///////////////////////////////////////////////////////////////////////////////
1884-
/// @brief Exported function for filling application's VFManagement table
1885-
/// with current process' addresses
1886-
///
1887-
/// @returns
1888-
/// - ::ZE_RESULT_SUCCESS
1889-
/// - ::ZE_RESULT_ERROR_UNINITIALIZED
1890-
/// - ::ZE_RESULT_ERROR_INVALID_NULL_POINTER
1891-
/// - ::ZE_RESULT_ERROR_UNSUPPORTED_VERSION
1892-
ZE_DLLEXPORT ze_result_t ZE_APICALL
1893-
zesGetVFManagementProcAddrTable(
1894-
ze_api_version_t version, ///< [in] API version requested
1895-
zes_vf_management_dditable_t* pDdiTable ///< [in,out] pointer to table of DDI function pointers
1896-
);
1897-
1898-
///////////////////////////////////////////////////////////////////////////////
1899-
/// @brief Function-pointer for zesGetVFManagementProcAddrTable
1900-
typedef ze_result_t (ZE_APICALL *zes_pfnGetVFManagementProcAddrTable_t)(
1901-
ze_api_version_t,
1902-
zes_vf_management_dditable_t*
1903-
);
1904-
1905-
///////////////////////////////////////////////////////////////////////////////
1906-
/// @brief Function-pointer for zesVFManagementGetVFCapabilitiesExp
1907-
typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementGetVFCapabilitiesExp_t)(
1908-
zes_vf_handle_t,
1909-
zes_vf_exp_capabilities_t*
1910-
);
1911-
19121882
///////////////////////////////////////////////////////////////////////////////
19131883
/// @brief Function-pointer for zesVFManagementGetVFPropertiesExp
19141884
typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementGetVFPropertiesExp_t)(
@@ -1953,6 +1923,8 @@ typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementSetVFTelemetrySamplingInterv
19531923
typedef struct _zes_vf_management_exp_dditable_t
19541924
{
19551925
zes_pfnVFManagementGetVFCapabilitiesExp_t pfnGetVFCapabilitiesExp;
1926+
zes_pfnVFManagementGetVFMemoryUtilizationExp2_t pfnGetVFMemoryUtilizationExp2;
1927+
zes_pfnVFManagementGetVFEngineUtilizationExp2_t pfnGetVFEngineUtilizationExp2;
19561928
zes_pfnVFManagementGetVFPropertiesExp_t pfnGetVFPropertiesExp;
19571929
zes_pfnVFManagementGetVFMemoryUtilizationExp_t pfnGetVFMemoryUtilizationExp;
19581930
zes_pfnVFManagementGetVFEngineUtilizationExp_t pfnGetVFEngineUtilizationExp;
@@ -2009,7 +1981,6 @@ typedef struct _zes_dditable_t
20091981
zes_ras_dditable_t Ras;
20101982
zes_ras_exp_dditable_t RasExp;
20111983
zes_diagnostics_dditable_t Diagnostics;
2012-
zes_vf_management_dditable_t VFManagement;
20131984
zes_vf_management_exp_dditable_t VFManagementExp;
20141985
} zes_dditable_t;
20151986

‎include/zet.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
SPDX-License-Identifier: MIT
55
66
@file zet.py
7-
@version v1.11-r1.11.0
7+
@version v1.11-r1.11.1
88
99
"""
1010
import platform
@@ -1220,23 +1220,22 @@ class _zet_kernel_dditable_t(Structure):
12201220
else:
12211221
_zetMetricGetProperties_t = CFUNCTYPE( ze_result_t, zet_metric_handle_t, POINTER(zet_metric_properties_t) )
12221222

1223-
###############################################################################
1224-
## @brief Function-pointer for zetMetricCreateFromProgrammableExp2
1225-
if __use_win_types:
1226-
_zetMetricCreateFromProgrammableExp2_t = WINFUNCTYPE( ze_result_t, zet_metric_programmable_exp_handle_t, c_ulong, POINTER(zet_metric_programmable_param_value_exp_t), c_char_p, c_char_p, POINTER(c_ulong), POINTER(zet_metric_handle_t) )
1227-
else:
1228-
_zetMetricCreateFromProgrammableExp2_t = CFUNCTYPE( ze_result_t, zet_metric_programmable_exp_handle_t, c_ulong, POINTER(zet_metric_programmable_param_value_exp_t), c_char_p, c_char_p, POINTER(c_ulong), POINTER(zet_metric_handle_t) )
1229-
12301223

12311224
###############################################################################
12321225
## @brief Table of Metric functions pointers
12331226
class _zet_metric_dditable_t(Structure):
12341227
_fields_ = [
12351228
("pfnGet", c_void_p), ## _zetMetricGet_t
1236-
("pfnGetProperties", c_void_p), ## _zetMetricGetProperties_t
1237-
("pfnCreateFromProgrammableExp2", c_void_p) ## _zetMetricCreateFromProgrammableExp2_t
1229+
("pfnGetProperties", c_void_p) ## _zetMetricGetProperties_t
12381230
]
12391231

1232+
###############################################################################
1233+
## @brief Function-pointer for zetMetricCreateFromProgrammableExp2
1234+
if __use_win_types:
1235+
_zetMetricCreateFromProgrammableExp2_t = WINFUNCTYPE( ze_result_t, zet_metric_programmable_exp_handle_t, c_ulong, POINTER(zet_metric_programmable_param_value_exp_t), c_char_p, c_char_p, POINTER(c_ulong), POINTER(zet_metric_handle_t) )
1236+
else:
1237+
_zetMetricCreateFromProgrammableExp2_t = CFUNCTYPE( ze_result_t, zet_metric_programmable_exp_handle_t, c_ulong, POINTER(zet_metric_programmable_param_value_exp_t), c_char_p, c_char_p, POINTER(c_ulong), POINTER(zet_metric_handle_t) )
1238+
12401239
###############################################################################
12411240
## @brief Function-pointer for zetMetricCreateFromProgrammableExp
12421241
if __use_win_types:
@@ -1256,6 +1255,7 @@ class _zet_metric_dditable_t(Structure):
12561255
## @brief Table of MetricExp functions pointers
12571256
class _zet_metric_exp_dditable_t(Structure):
12581257
_fields_ = [
1258+
("pfnCreateFromProgrammableExp2", c_void_p), ## _zetMetricCreateFromProgrammableExp2_t
12591259
("pfnCreateFromProgrammableExp", c_void_p), ## _zetMetricCreateFromProgrammableExp_t
12601260
("pfnDestroyExp", c_void_p) ## _zetMetricDestroyExp_t
12611261
]
@@ -1763,7 +1763,6 @@ def __init__(self, version : ze_api_version_t):
17631763
# attach function interface to function address
17641764
self.zetMetricGet = _zetMetricGet_t(self.__dditable.Metric.pfnGet)
17651765
self.zetMetricGetProperties = _zetMetricGetProperties_t(self.__dditable.Metric.pfnGetProperties)
1766-
self.zetMetricCreateFromProgrammableExp2 = _zetMetricCreateFromProgrammableExp2_t(self.__dditable.Metric.pfnCreateFromProgrammableExp2)
17671766

17681767
# call driver to get function pointers
17691768
_MetricExp = _zet_metric_exp_dditable_t()
@@ -1773,6 +1772,7 @@ def __init__(self, version : ze_api_version_t):
17731772
self.__dditable.MetricExp = _MetricExp
17741773

17751774
# attach function interface to function address
1775+
self.zetMetricCreateFromProgrammableExp2 = _zetMetricCreateFromProgrammableExp2_t(self.__dditable.MetricExp.pfnCreateFromProgrammableExp2)
17761776
self.zetMetricCreateFromProgrammableExp = _zetMetricCreateFromProgrammableExp_t(self.__dditable.MetricExp.pfnCreateFromProgrammableExp)
17771777
self.zetMetricDestroyExp = _zetMetricDestroyExp_t(self.__dditable.MetricExp.pfnDestroyExp)
17781778

‎include/zet_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file zet_api.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZET_API_H

‎include/zet_ddi.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: MIT
66
*
77
* @file zet_ddi.h
8-
* @version v1.11-r1.11.0
8+
* @version v1.11-r1.11.1
99
*
1010
*/
1111
#ifndef _ZET_DDI_H
@@ -501,25 +501,12 @@ typedef ze_result_t (ZE_APICALL *zet_pfnMetricGetProperties_t)(
501501
zet_metric_properties_t*
502502
);
503503

504-
///////////////////////////////////////////////////////////////////////////////
505-
/// @brief Function-pointer for zetMetricCreateFromProgrammableExp2
506-
typedef ze_result_t (ZE_APICALL *zet_pfnMetricCreateFromProgrammableExp2_t)(
507-
zet_metric_programmable_exp_handle_t,
508-
uint32_t,
509-
zet_metric_programmable_param_value_exp_t*,
510-
const char*,
511-
const char*,
512-
uint32_t*,
513-
zet_metric_handle_t*
514-
);
515-
516504
///////////////////////////////////////////////////////////////////////////////
517505
/// @brief Table of Metric functions pointers
518506
typedef struct _zet_metric_dditable_t
519507
{
520508
zet_pfnMetricGet_t pfnGet;
521509
zet_pfnMetricGetProperties_t pfnGetProperties;
522-
zet_pfnMetricCreateFromProgrammableExp2_t pfnCreateFromProgrammableExp2;
523510
} zet_metric_dditable_t;
524511

525512
///////////////////////////////////////////////////////////////////////////////
@@ -544,6 +531,18 @@ typedef ze_result_t (ZE_APICALL *zet_pfnGetMetricProcAddrTable_t)(
544531
zet_metric_dditable_t*
545532
);
546533

534+
///////////////////////////////////////////////////////////////////////////////
535+
/// @brief Function-pointer for zetMetricCreateFromProgrammableExp2
536+
typedef ze_result_t (ZE_APICALL *zet_pfnMetricCreateFromProgrammableExp2_t)(
537+
zet_metric_programmable_exp_handle_t,
538+
uint32_t,
539+
zet_metric_programmable_param_value_exp_t*,
540+
const char*,
541+
const char*,
542+
uint32_t*,
543+
zet_metric_handle_t*
544+
);
545+
547546
///////////////////////////////////////////////////////////////////////////////
548547
/// @brief Function-pointer for zetMetricCreateFromProgrammableExp
549548
typedef ze_result_t (ZE_APICALL *zet_pfnMetricCreateFromProgrammableExp_t)(
@@ -566,6 +565,7 @@ typedef ze_result_t (ZE_APICALL *zet_pfnMetricDestroyExp_t)(
566565
/// @brief Table of MetricExp functions pointers
567566
typedef struct _zet_metric_exp_dditable_t
568567
{
568+
zet_pfnMetricCreateFromProgrammableExp2_t pfnCreateFromProgrammableExp2;
569569
zet_pfnMetricCreateFromProgrammableExp_t pfnCreateFromProgrammableExp;
570570
zet_pfnMetricDestroyExp_t pfnDestroyExp;
571571
} zet_metric_exp_dditable_t;

‎scripts/templates/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def is_class(obj):
3939
@staticmethod
4040
def is_experimental(obj):
4141
try:
42-
return True if re.search("Exp$", obj['name']) else False
42+
return True if re.search("Exp[0-9]*$", obj['name']) else False
4343
except:
4444
return False
4545

0 commit comments

Comments
 (0)