Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EXP Headers for ddi tables #216

Closed
wants to merge 1 commit into from
+13 −13
Closed

Fix EXP Headers for ddi tables #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/ze_ddi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,14 +1200,14 @@ typedef ze_result_t (ZE_APICALL *ze_pfnCommandListImmediateAppendCommandListsExp
/// @brief Table of CommandListExp functions pointers
typedef struct _ze_command_list_exp_dditable_t
{
ze_pfnCommandListGetNextCommandIdWithKernelsExp_t pfnGetNextCommandIdWithKernelsExp;
ze_pfnCommandListUpdateMutableCommandsExp_t pfnUpdateMutableCommandsExp;
ze_pfnCommandListUpdateMutableCommandSignalEventExp_t pfnUpdateMutableCommandSignalEventExp;
ze_pfnCommandListUpdateMutableCommandKernelsExp_t pfnUpdateMutableCommandKernelsExp;
ze_pfnCommandListCreateCloneExp_t pfnCreateCloneExp;
ze_pfnCommandListImmediateAppendCommandListsExp_t pfnImmediateAppendCommandListsExp;
ze_pfnCommandListGetNextCommandIdExp_t pfnGetNextCommandIdExp;
ze_pfnCommandListUpdateMutableCommandsExp_t pfnUpdateMutableCommandsExp;
ze_pfnCommandListUpdateMutableCommandSignalEventExp_t pfnUpdateMutableCommandSignalEventExp;
ze_pfnCommandListUpdateMutableCommandWaitEventsExp_t pfnUpdateMutableCommandWaitEventsExp;
ze_pfnCommandListImmediateAppendCommandListsExp_t pfnImmediateAppendCommandListsExp;
ze_pfnCommandListGetNextCommandIdWithKernelsExp_t pfnGetNextCommandIdWithKernelsExp;
ze_pfnCommandListUpdateMutableCommandKernelsExp_t pfnUpdateMutableCommandKernelsExp;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thisn is not the same ordering i get with update to spec

} ze_command_list_exp_dditable_t;

///////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions include/zes_ddi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,14 +1922,14 @@ typedef ze_result_t (ZE_APICALL *zes_pfnVFManagementSetVFTelemetrySamplingInterv
/// @brief Table of VFManagementExp functions pointers
typedef struct _zes_vf_management_exp_dditable_t
{
zes_pfnVFManagementGetVFCapabilitiesExp_t pfnGetVFCapabilitiesExp;
zes_pfnVFManagementGetVFMemoryUtilizationExp2_t pfnGetVFMemoryUtilizationExp2;
zes_pfnVFManagementGetVFEngineUtilizationExp2_t pfnGetVFEngineUtilizationExp2;
zes_pfnVFManagementGetVFPropertiesExp_t pfnGetVFPropertiesExp;
zes_pfnVFManagementGetVFMemoryUtilizationExp_t pfnGetVFMemoryUtilizationExp;
zes_pfnVFManagementGetVFEngineUtilizationExp_t pfnGetVFEngineUtilizationExp;
zes_pfnVFManagementSetVFTelemetryModeExp_t pfnSetVFTelemetryModeExp;
zes_pfnVFManagementSetVFTelemetrySamplingIntervalExp_t pfnSetVFTelemetrySamplingIntervalExp;
zes_pfnVFManagementGetVFCapabilitiesExp_t pfnGetVFCapabilitiesExp;
zes_pfnVFManagementGetVFMemoryUtilizationExp2_t pfnGetVFMemoryUtilizationExp2;
zes_pfnVFManagementGetVFEngineUtilizationExp2_t pfnGetVFEngineUtilizationExp2;
} zes_vf_management_exp_dditable_t;

///////////////////////////////////////////////////////////////////////////////
Expand Down
10 changes: 5 additions & 5 deletions include/zet_ddi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,9 +565,9 @@ typedef ze_result_t (ZE_APICALL *zet_pfnMetricDestroyExp_t)(
/// @brief Table of MetricExp functions pointers
typedef struct _zet_metric_exp_dditable_t
{
zet_pfnMetricCreateFromProgrammableExp2_t pfnCreateFromProgrammableExp2;
zet_pfnMetricCreateFromProgrammableExp_t pfnCreateFromProgrammableExp;
zet_pfnMetricDestroyExp_t pfnDestroyExp;
zet_pfnMetricCreateFromProgrammableExp2_t pfnCreateFromProgrammableExp2;
} zet_metric_exp_dditable_t;

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -737,11 +737,11 @@ typedef ze_result_t (ZE_APICALL *zet_pfnMetricGroupDestroyExp_t)(
/// @brief Table of MetricGroupExp functions pointers
typedef struct _zet_metric_group_exp_dditable_t
{
zet_pfnMetricGroupCreateExp_t pfnCreateExp;
zet_pfnMetricGroupCalculateMultipleMetricValuesExp_t pfnCalculateMultipleMetricValuesExp;
zet_pfnMetricGroupGetGlobalTimestampsExp_t pfnGetGlobalTimestampsExp;
zet_pfnMetricGroupGetExportDataExp_t pfnGetExportDataExp;
zet_pfnMetricGroupCalculateMetricExportDataExp_t pfnCalculateMetricExportDataExp;
zet_pfnMetricGroupCreateExp_t pfnCreateExp;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this go at the end of the struct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that would break backwards compatibility, the version from v1.9.3 had this symbol in this place. I am simply returning it to the right place.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based on testing with #217 this may not be necessary in this case.

zet_pfnMetricGroupAddMetricExp_t pfnAddMetricExp;
zet_pfnMetricGroupRemoveMetricExp_t pfnRemoveMetricExp;
zet_pfnMetricGroupCloseExp_t pfnCloseExp;
Expand Down Expand Up @@ -1148,10 +1148,7 @@ typedef ze_result_t (ZE_APICALL *zet_pfnGetDebugProcAddrTable_t)(
typedef struct _zet_dditable_t
{
zet_metric_programmable_exp_dditable_t MetricProgrammableExp;
zet_metric_tracer_exp_dditable_t MetricTracerExp;
zet_metric_decoder_exp_dditable_t MetricDecoderExp;
zet_device_dditable_t Device;
zet_device_exp_dditable_t DeviceExp;
zet_context_dditable_t Context;
zet_command_list_dditable_t CommandList;
zet_module_dditable_t Module;
Expand All @@ -1165,6 +1162,9 @@ typedef struct _zet_dditable_t
zet_metric_query_dditable_t MetricQuery;
zet_tracer_exp_dditable_t TracerExp;
zet_debug_dditable_t Debug;
zet_metric_tracer_exp_dditable_t MetricTracerExp;
zet_metric_decoder_exp_dditable_t MetricDecoderExp;
zet_device_exp_dditable_t DeviceExp;
} zet_dditable_t;

#if defined(__cplusplus)
Expand Down
Loading