Skip to content

Commit c46bdd5

Browse files
bmyatesbmyates
authored
Update loader headers to spec 1.11 with fixed ddi ordering (#217)
Signed-off-by: Brandon Yates <[email protected]>
1 parent 0f25fdc commit c46bdd5

File tree

9 files changed

+190
-190
lines changed

9 files changed

+190
-190
lines changed

‎include/ze.py

Lines changed: 34 additions & 34 deletions
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.1
7+
@version v1.11-r1.11.3
88
99
"""
1010
import platform
@@ -4783,74 +4783,74 @@ class _ze_command_list_dditable_t(Structure):
47834783
]
47844784

47854785
###############################################################################
4786-
## @brief Function-pointer for zeCommandListGetNextCommandIdWithKernelsExp
4786+
## @brief Function-pointer for zeCommandListCreateCloneExp
47874787
if __use_win_types:
4788-
_zeCommandListGetNextCommandIdWithKernelsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), c_ulong, POINTER(ze_kernel_handle_t), POINTER(c_ulonglong) )
4788+
_zeCommandListCreateCloneExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_command_list_handle_t) )
47894789
else:
4790-
_zeCommandListGetNextCommandIdWithKernelsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), c_ulong, POINTER(ze_kernel_handle_t), POINTER(c_ulonglong) )
4790+
_zeCommandListCreateCloneExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_command_list_handle_t) )
47914791

47924792
###############################################################################
4793-
## @brief Function-pointer for zeCommandListUpdateMutableCommandsExp
4793+
## @brief Function-pointer for zeCommandListGetNextCommandIdExp
47944794
if __use_win_types:
4795-
_zeCommandListUpdateMutableCommandsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_commands_exp_desc_t) )
4795+
_zeCommandListGetNextCommandIdExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), POINTER(c_ulonglong) )
47964796
else:
4797-
_zeCommandListUpdateMutableCommandsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_commands_exp_desc_t) )
4797+
_zeCommandListGetNextCommandIdExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), POINTER(c_ulonglong) )
47984798

47994799
###############################################################################
4800-
## @brief Function-pointer for zeCommandListUpdateMutableCommandSignalEventExp
4800+
## @brief Function-pointer for zeCommandListUpdateMutableCommandWaitEventsExp
48014801
if __use_win_types:
4802-
_zeCommandListUpdateMutableCommandSignalEventExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, ze_event_handle_t )
4802+
_zeCommandListUpdateMutableCommandWaitEventsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, c_ulong, POINTER(ze_event_handle_t) )
48034803
else:
4804-
_zeCommandListUpdateMutableCommandSignalEventExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, ze_event_handle_t )
4804+
_zeCommandListUpdateMutableCommandWaitEventsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, c_ulong, POINTER(ze_event_handle_t) )
48054805

48064806
###############################################################################
4807-
## @brief Function-pointer for zeCommandListUpdateMutableCommandKernelsExp
4807+
## @brief Function-pointer for zeCommandListImmediateAppendCommandListsExp
48084808
if __use_win_types:
4809-
_zeCommandListUpdateMutableCommandKernelsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(c_ulonglong), POINTER(ze_kernel_handle_t) )
4809+
_zeCommandListImmediateAppendCommandListsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(ze_command_list_handle_t), ze_event_handle_t, c_ulong, POINTER(ze_event_handle_t) )
48104810
else:
4811-
_zeCommandListUpdateMutableCommandKernelsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(c_ulonglong), POINTER(ze_kernel_handle_t) )
4811+
_zeCommandListImmediateAppendCommandListsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(ze_command_list_handle_t), ze_event_handle_t, c_ulong, POINTER(ze_event_handle_t) )
48124812

48134813
###############################################################################
4814-
## @brief Function-pointer for zeCommandListCreateCloneExp
4814+
## @brief Function-pointer for zeCommandListGetNextCommandIdWithKernelsExp
48154815
if __use_win_types:
4816-
_zeCommandListCreateCloneExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_command_list_handle_t) )
4816+
_zeCommandListGetNextCommandIdWithKernelsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), c_ulong, POINTER(ze_kernel_handle_t), POINTER(c_ulonglong) )
48174817
else:
4818-
_zeCommandListCreateCloneExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_command_list_handle_t) )
4818+
_zeCommandListGetNextCommandIdWithKernelsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), c_ulong, POINTER(ze_kernel_handle_t), POINTER(c_ulonglong) )
48194819

48204820
###############################################################################
4821-
## @brief Function-pointer for zeCommandListGetNextCommandIdExp
4821+
## @brief Function-pointer for zeCommandListUpdateMutableCommandsExp
48224822
if __use_win_types:
4823-
_zeCommandListGetNextCommandIdExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), POINTER(c_ulonglong) )
4823+
_zeCommandListUpdateMutableCommandsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_commands_exp_desc_t) )
48244824
else:
4825-
_zeCommandListGetNextCommandIdExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_command_id_exp_desc_t), POINTER(c_ulonglong) )
4825+
_zeCommandListUpdateMutableCommandsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, POINTER(ze_mutable_commands_exp_desc_t) )
48264826

48274827
###############################################################################
4828-
## @brief Function-pointer for zeCommandListUpdateMutableCommandWaitEventsExp
4828+
## @brief Function-pointer for zeCommandListUpdateMutableCommandSignalEventExp
48294829
if __use_win_types:
4830-
_zeCommandListUpdateMutableCommandWaitEventsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, c_ulong, POINTER(ze_event_handle_t) )
4830+
_zeCommandListUpdateMutableCommandSignalEventExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, ze_event_handle_t )
48314831
else:
4832-
_zeCommandListUpdateMutableCommandWaitEventsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, c_ulong, POINTER(ze_event_handle_t) )
4832+
_zeCommandListUpdateMutableCommandSignalEventExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulonglong, ze_event_handle_t )
48334833

48344834
###############################################################################
4835-
## @brief Function-pointer for zeCommandListImmediateAppendCommandListsExp
4835+
## @brief Function-pointer for zeCommandListUpdateMutableCommandKernelsExp
48364836
if __use_win_types:
4837-
_zeCommandListImmediateAppendCommandListsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(ze_command_list_handle_t), ze_event_handle_t, c_ulong, POINTER(ze_event_handle_t) )
4837+
_zeCommandListUpdateMutableCommandKernelsExp_t = WINFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(c_ulonglong), POINTER(ze_kernel_handle_t) )
48384838
else:
4839-
_zeCommandListImmediateAppendCommandListsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(ze_command_list_handle_t), ze_event_handle_t, c_ulong, POINTER(ze_event_handle_t) )
4839+
_zeCommandListUpdateMutableCommandKernelsExp_t = CFUNCTYPE( ze_result_t, ze_command_list_handle_t, c_ulong, POINTER(c_ulonglong), POINTER(ze_kernel_handle_t) )
48404840

48414841

48424842
###############################################################################
48434843
## @brief Table of CommandListExp functions pointers
48444844
class _ze_command_list_exp_dditable_t(Structure):
48454845
_fields_ = [
4846-
("pfnGetNextCommandIdWithKernelsExp", c_void_p), ## _zeCommandListGetNextCommandIdWithKernelsExp_t
4847-
("pfnUpdateMutableCommandsExp", c_void_p), ## _zeCommandListUpdateMutableCommandsExp_t
4848-
("pfnUpdateMutableCommandSignalEventExp", c_void_p), ## _zeCommandListUpdateMutableCommandSignalEventExp_t
4849-
("pfnUpdateMutableCommandKernelsExp", c_void_p), ## _zeCommandListUpdateMutableCommandKernelsExp_t
48504846
("pfnCreateCloneExp", c_void_p), ## _zeCommandListCreateCloneExp_t
48514847
("pfnGetNextCommandIdExp", c_void_p), ## _zeCommandListGetNextCommandIdExp_t
48524848
("pfnUpdateMutableCommandWaitEventsExp", c_void_p), ## _zeCommandListUpdateMutableCommandWaitEventsExp_t
4853-
("pfnImmediateAppendCommandListsExp", c_void_p) ## _zeCommandListImmediateAppendCommandListsExp_t
4849+
("pfnImmediateAppendCommandListsExp", c_void_p), ## _zeCommandListImmediateAppendCommandListsExp_t
4850+
("pfnGetNextCommandIdWithKernelsExp", c_void_p), ## _zeCommandListGetNextCommandIdWithKernelsExp_t
4851+
("pfnUpdateMutableCommandsExp", c_void_p), ## _zeCommandListUpdateMutableCommandsExp_t
4852+
("pfnUpdateMutableCommandSignalEventExp", c_void_p), ## _zeCommandListUpdateMutableCommandSignalEventExp_t
4853+
("pfnUpdateMutableCommandKernelsExp", c_void_p) ## _zeCommandListUpdateMutableCommandKernelsExp_t
48544854
]
48554855

48564856
###############################################################################
@@ -5939,14 +5939,14 @@ def __init__(self, version : ze_api_version_t):
59395939
self.__dditable.CommandListExp = _CommandListExp
59405940

59415941
# attach function interface to function address
5942-
self.zeCommandListGetNextCommandIdWithKernelsExp = _zeCommandListGetNextCommandIdWithKernelsExp_t(self.__dditable.CommandListExp.pfnGetNextCommandIdWithKernelsExp)
5943-
self.zeCommandListUpdateMutableCommandsExp = _zeCommandListUpdateMutableCommandsExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandsExp)
5944-
self.zeCommandListUpdateMutableCommandSignalEventExp = _zeCommandListUpdateMutableCommandSignalEventExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandSignalEventExp)
5945-
self.zeCommandListUpdateMutableCommandKernelsExp = _zeCommandListUpdateMutableCommandKernelsExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandKernelsExp)
59465942
self.zeCommandListCreateCloneExp = _zeCommandListCreateCloneExp_t(self.__dditable.CommandListExp.pfnCreateCloneExp)
59475943
self.zeCommandListGetNextCommandIdExp = _zeCommandListGetNextCommandIdExp_t(self.__dditable.CommandListExp.pfnGetNextCommandIdExp)
59485944
self.zeCommandListUpdateMutableCommandWaitEventsExp = _zeCommandListUpdateMutableCommandWaitEventsExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandWaitEventsExp)
59495945
self.zeCommandListImmediateAppendCommandListsExp = _zeCommandListImmediateAppendCommandListsExp_t(self.__dditable.CommandListExp.pfnImmediateAppendCommandListsExp)
5946+
self.zeCommandListGetNextCommandIdWithKernelsExp = _zeCommandListGetNextCommandIdWithKernelsExp_t(self.__dditable.CommandListExp.pfnGetNextCommandIdWithKernelsExp)
5947+
self.zeCommandListUpdateMutableCommandsExp = _zeCommandListUpdateMutableCommandsExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandsExp)
5948+
self.zeCommandListUpdateMutableCommandSignalEventExp = _zeCommandListUpdateMutableCommandSignalEventExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandSignalEventExp)
5949+
self.zeCommandListUpdateMutableCommandKernelsExp = _zeCommandListUpdateMutableCommandKernelsExp_t(self.__dditable.CommandListExp.pfnUpdateMutableCommandKernelsExp)
59505950

59515951
# call driver to get function pointers
59525952
_Image = _ze_image_dditable_t()

‎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.1
8+
* @version v1.11-r1.11.3
99
*
1010
*/
1111
#ifndef _ZE_API_H

‎include/ze_ddi.h

Lines changed: 38 additions & 38 deletions
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.1
8+
* @version v1.11-r1.11.3
99
*
1010
*/
1111
#ifndef _ZE_DDI_H
@@ -1128,86 +1128,86 @@ typedef ze_result_t (ZE_APICALL *ze_pfnGetCommandListProcAddrTable_t)(
11281128
);
11291129

11301130
///////////////////////////////////////////////////////////////////////////////
1131-
/// @brief Function-pointer for zeCommandListGetNextCommandIdWithKernelsExp
1132-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListGetNextCommandIdWithKernelsExp_t)(
1131+
/// @brief Function-pointer for zeCommandListCreateCloneExp
1132+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListCreateCloneExp_t)(
11331133
ze_command_list_handle_t,
1134-
const ze_mutable_command_id_exp_desc_t*,
1135-
uint32_t,
1136-
ze_kernel_handle_t*,
1137-
uint64_t*
1134+
ze_command_list_handle_t*
11381135
);
11391136

11401137
///////////////////////////////////////////////////////////////////////////////
1141-
/// @brief Function-pointer for zeCommandListUpdateMutableCommandsExp
1142-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandsExp_t)(
1138+
/// @brief Function-pointer for zeCommandListGetNextCommandIdExp
1139+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListGetNextCommandIdExp_t)(
11431140
ze_command_list_handle_t,
1144-
const ze_mutable_commands_exp_desc_t*
1141+
const ze_mutable_command_id_exp_desc_t*,
1142+
uint64_t*
11451143
);
11461144

11471145
///////////////////////////////////////////////////////////////////////////////
1148-
/// @brief Function-pointer for zeCommandListUpdateMutableCommandSignalEventExp
1149-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandSignalEventExp_t)(
1146+
/// @brief Function-pointer for zeCommandListUpdateMutableCommandWaitEventsExp
1147+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandWaitEventsExp_t)(
11501148
ze_command_list_handle_t,
11511149
uint64_t,
1152-
ze_event_handle_t
1150+
uint32_t,
1151+
ze_event_handle_t*
11531152
);
11541153

11551154
///////////////////////////////////////////////////////////////////////////////
1156-
/// @brief Function-pointer for zeCommandListUpdateMutableCommandKernelsExp
1157-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandKernelsExp_t)(
1155+
/// @brief Function-pointer for zeCommandListImmediateAppendCommandListsExp
1156+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListImmediateAppendCommandListsExp_t)(
11581157
ze_command_list_handle_t,
11591158
uint32_t,
1160-
uint64_t*,
1161-
ze_kernel_handle_t*
1159+
ze_command_list_handle_t*,
1160+
ze_event_handle_t,
1161+
uint32_t,
1162+
ze_event_handle_t*
11621163
);
11631164

11641165
///////////////////////////////////////////////////////////////////////////////
1165-
/// @brief Function-pointer for zeCommandListCreateCloneExp
1166-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListCreateCloneExp_t)(
1166+
/// @brief Function-pointer for zeCommandListGetNextCommandIdWithKernelsExp
1167+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListGetNextCommandIdWithKernelsExp_t)(
11671168
ze_command_list_handle_t,
1168-
ze_command_list_handle_t*
1169+
const ze_mutable_command_id_exp_desc_t*,
1170+
uint32_t,
1171+
ze_kernel_handle_t*,
1172+
uint64_t*
11691173
);
11701174

11711175
///////////////////////////////////////////////////////////////////////////////
1172-
/// @brief Function-pointer for zeCommandListGetNextCommandIdExp
1173-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListGetNextCommandIdExp_t)(
1176+
/// @brief Function-pointer for zeCommandListUpdateMutableCommandsExp
1177+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandsExp_t)(
11741178
ze_command_list_handle_t,
1175-
const ze_mutable_command_id_exp_desc_t*,
1176-
uint64_t*
1179+
const ze_mutable_commands_exp_desc_t*
11771180
);
11781181

11791182
///////////////////////////////////////////////////////////////////////////////
1180-
/// @brief Function-pointer for zeCommandListUpdateMutableCommandWaitEventsExp
1181-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandWaitEventsExp_t)(
1183+
/// @brief Function-pointer for zeCommandListUpdateMutableCommandSignalEventExp
1184+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandSignalEventExp_t)(
11821185
ze_command_list_handle_t,
11831186
uint64_t,
1184-
uint32_t,
1185-
ze_event_handle_t*
1187+
ze_event_handle_t
11861188
);
11871189

11881190
///////////////////////////////////////////////////////////////////////////////
1189-
/// @brief Function-pointer for zeCommandListImmediateAppendCommandListsExp
1190-
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListImmediateAppendCommandListsExp_t)(
1191+
/// @brief Function-pointer for zeCommandListUpdateMutableCommandKernelsExp
1192+
typedef ze_result_t (ZE_APICALL *ze_pfnCommandListUpdateMutableCommandKernelsExp_t)(
11911193
ze_command_list_handle_t,
11921194
uint32_t,
1193-
ze_command_list_handle_t*,
1194-
ze_event_handle_t,
1195-
uint32_t,
1196-
ze_event_handle_t*
1195+
uint64_t*,
1196+
ze_kernel_handle_t*
11971197
);
11981198

11991199
///////////////////////////////////////////////////////////////////////////////
12001200
/// @brief Table of CommandListExp functions pointers
12011201
typedef struct _ze_command_list_exp_dditable_t
12021202
{
1203-
ze_pfnCommandListGetNextCommandIdWithKernelsExp_t pfnGetNextCommandIdWithKernelsExp;
1204-
ze_pfnCommandListUpdateMutableCommandsExp_t pfnUpdateMutableCommandsExp;
1205-
ze_pfnCommandListUpdateMutableCommandSignalEventExp_t pfnUpdateMutableCommandSignalEventExp;
1206-
ze_pfnCommandListUpdateMutableCommandKernelsExp_t pfnUpdateMutableCommandKernelsExp;
12071203
ze_pfnCommandListCreateCloneExp_t pfnCreateCloneExp;
12081204
ze_pfnCommandListGetNextCommandIdExp_t pfnGetNextCommandIdExp;
12091205
ze_pfnCommandListUpdateMutableCommandWaitEventsExp_t pfnUpdateMutableCommandWaitEventsExp;
12101206
ze_pfnCommandListImmediateAppendCommandListsExp_t pfnImmediateAppendCommandListsExp;
1207+
ze_pfnCommandListGetNextCommandIdWithKernelsExp_t pfnGetNextCommandIdWithKernelsExp;
1208+
ze_pfnCommandListUpdateMutableCommandsExp_t pfnUpdateMutableCommandsExp;
1209+
ze_pfnCommandListUpdateMutableCommandSignalEventExp_t pfnUpdateMutableCommandSignalEventExp;
1210+
ze_pfnCommandListUpdateMutableCommandKernelsExp_t pfnUpdateMutableCommandKernelsExp;
12111211
} ze_command_list_exp_dditable_t;
12121212

12131213
///////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)