Skip to content

Commit

Permalink
Updated 1.12 with master spec fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Neil R. Spruit <[email protected]>
  • Loading branch information
nrspruit committed Dec 17, 2024
1 parent 8beb535 commit f4739f6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions source/drivers/null/zet_nullddi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ namespace driver
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -1764,7 +1764,7 @@ namespace driver
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ namespace validation_layer
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -1337,7 +1337,7 @@ namespace validation_layer
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ namespace validation_layer
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -1100,7 +1100,7 @@ namespace validation_layer
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down
4 changes: 2 additions & 2 deletions source/layers/validation/zet_valddi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2180,7 +2180,7 @@ namespace validation_layer
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -2801,7 +2801,7 @@ namespace validation_layer
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down
18 changes: 10 additions & 8 deletions source/lib/zet_libapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@ zetMetricTracerDecodeExp(
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -2698,7 +2698,7 @@ zetDeviceCreateMetricGroupsFromMetricsExp(
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down Expand Up @@ -2735,7 +2735,7 @@ zetDeviceCreateMetricGroupsFromMetricsExp(
///
/// @details
/// - This API is deprecated. Please use
/// ::zetCreateMetricGroupsFromMetricsExp()
/// ::zetDeviceCreateMetricGroupsFromMetricsExp
///
/// @returns
/// - ::ZE_RESULT_SUCCESS
Expand Down Expand Up @@ -2780,7 +2780,7 @@ zetMetricGroupCreateExp(

///////////////////////////////////////////////////////////////////////////////
/// @brief Add a metric handle to the metric group handle created using
/// ::zetMetricGroupCreateExp.
/// ::zetDeviceCreateMetricGroupsFromMetricsExp.
///
/// @details
/// - Reasons for failing to add the metric could be queried using
Expand Down Expand Up @@ -2836,7 +2836,7 @@ zetMetricGroupAddMetricExp(

///////////////////////////////////////////////////////////////////////////////
/// @brief Remove a metric from the metric group handle created using
/// ::zetMetricGroupCreateExp.
/// ::zetDeviceCreateMetricGroupsFromMetricsExp.
///
/// @details
/// - Remove an already added metric handle from the metric group.
Expand Down Expand Up @@ -2877,8 +2877,9 @@ zetMetricGroupRemoveMetricExp(
}

///////////////////////////////////////////////////////////////////////////////
/// @brief Closes a created metric group using ::zetMetricGroupCreateExp, so that
/// it can be activated.
/// @brief Closes a created metric group using
/// ::zetDeviceCreateMetricGroupsFromMetricsExp, so that it can be
/// activated.
///
/// @details
/// - Finalizes the ::zetMetricGroupAddMetricExp and
Expand Down Expand Up @@ -2927,7 +2928,8 @@ zetMetricGroupCloseExp(
}

///////////////////////////////////////////////////////////////////////////////
/// @brief Destroy a metric group created using ::zetMetricGroupCreateExp.
/// @brief Destroy a metric group created using
/// ::zetDeviceCreateMetricGroupsFromMetricsExp.
///
/// @details
/// - Metric handles created using ::zetMetricCreateFromProgrammableExp2 and
Expand Down
4 changes: 2 additions & 2 deletions source/loader/zet_ldrddi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1606,7 +1606,7 @@ namespace loader
zet_metric_handle_t* phMetrics, ///< [in] [range(0, metricsCount)] array of handles of decodable metrics in
///< the decoder for which the hMetricDecoder handle was
///< provided. Metrics handles are expected to be for decodable metrics,
///< see ::zetMetricDecoderGetDecodableMetrics()
///< see ::zetMetricDecoderGetDecodableMetricsExp()
uint32_t* pSetCount, ///< [in,out] pointer to number of metric sets. If count is zero, then the
///< driver shall update the value with the total
///< number of metric sets to be decoded. If count is greater than the
Expand Down Expand Up @@ -2063,7 +2063,7 @@ namespace loader
zet_metric_handle_t * phMetrics, ///< [in] metric handles to be added to the metric groups.
const char * pMetricGroupNamePrefix, ///< [in] prefix to the name created for the metric groups. Must point to a
///< null-terminated character array no longer than
///< ZEX_MAX_METRIC_GROUP_NAME_PREFIX.
///< ::ZET_MAX_METRIC_GROUP_NAME_PREFIX_EXP.
const char * pDescription, ///< [in] pointer to description of the metric groups. Must point to a
///< null-terminated character array no longer than
///< ::ZET_MAX_METRIC_GROUP_DESCRIPTION.
Expand Down

0 comments on commit f4739f6

Please sign in to comment.