diff --git a/level_zero/api/driver_experimental/public/zex_metric.cpp b/level_zero/api/driver_experimental/public/zex_metric.cpp index 4d5272bb62..e6e08f1740 100644 --- a/level_zero/api/driver_experimental/public/zex_metric.cpp +++ b/level_zero/api/driver_experimental/public/zex_metric.cpp @@ -80,9 +80,9 @@ ze_result_t ZE_APICALL zetIntelMetricTracerDecodeExp(zet_intel_metric_decoder_ex ze_result_t ZE_APICALL zetIntelMetricCalculateOperationCreateExp(zet_context_handle_t hContext, zet_device_handle_t hDevice, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, zet_metric_handle_t *phExcludedMetrics, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) { - return L0::metricCalculateOperationCreate(hContext, hDevice, pCalculateDesc, pCount, phExcludedMetrics, phCalculateOperation); + return L0::metricCalculateOperationCreate(hContext, hDevice, pCalculateDesc, pExcludedMetricCount, phExcludedMetrics, phCalculateOperation); } ze_result_t ZE_APICALL zetIntelMetricCalculateOperationDestroyExp(zet_intel_metric_calculate_operation_exp_handle_t hCalculateOperation) { @@ -209,10 +209,10 @@ ze_result_t ZE_APICALL zetIntelMetricCalculateOperationCreateExp( zet_context_handle_t hContext, zet_device_handle_t hDevice, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) { - return L0::zetIntelMetricCalculateOperationCreateExp(hContext, hDevice, pCalculateDesc, pCount, phExcludedMetrics, phCalculateOperation); + return L0::zetIntelMetricCalculateOperationCreateExp(hContext, hDevice, pCalculateDesc, pExcludedMetricCount, phExcludedMetrics, phCalculateOperation); } ze_result_t ZE_APICALL zetIntelMetricCalculateOperationDestroyExp( diff --git a/level_zero/include/level_zero/zet_intel_gpu_metric.h b/level_zero/include/level_zero/zet_intel_gpu_metric.h index 92381f8324..5a0a1721d4 100644 --- a/level_zero/include/level_zero/zet_intel_gpu_metric.h +++ b/level_zero/include/level_zero/zet_intel_gpu_metric.h @@ -281,7 +281,7 @@ zetIntelMetricCalculateOperationCreateExp( zet_device_handle_t hDevice, ///< [in] handle of the device zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, ///< [in] pointer to structure with filters and operations to perform ///< at calculation time. - uint32_t *pCount, ///< [out] pointer to number of excluded metrics. These are metrics in the + uint32_t *pExcludedMetricCount, ///< [out] pointer to number of excluded metrics. These are metrics in the ///< input list in pcalculateDesc that do not allow calculation zet_metric_handle_t *phExcludedMetrics, ///< [in,out] [range(0, *pCount)] array of handles of excluded metrics ///< from the phCalculateOperation handle. diff --git a/level_zero/tools/source/metrics/metric.cpp b/level_zero/tools/source/metrics/metric.cpp index 51e0dae7f1..9856d8e15d 100644 --- a/level_zero/tools/source/metrics/metric.cpp +++ b/level_zero/tools/source/metrics/metric.cpp @@ -546,7 +546,7 @@ bool MetricDeviceContext::areMetricsFromSameSource(uint32_t count, zet_metric_ha ze_result_t MetricDeviceContext::calcOperationCreate(zet_context_handle_t hContext, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) { @@ -598,7 +598,7 @@ ze_result_t MetricDeviceContext::calcOperationCreate(zet_context_handle_t hConte } MetricSource &metricSource = (metricGroupImp) ? metricGroupImp->getMetricSource() : metricImp->getMetricSource(); // NOLINT(clang-analyzer-core.CallAndMessage) - return metricSource.calcOperationCreate(*this, pCalculateDesc, pCount, phExcludedMetrics, phCalculateOperation); + return metricSource.calcOperationCreate(*this, pCalculateDesc, pExcludedMetricCount, phExcludedMetrics, phCalculateOperation); } ze_result_t MultiDeviceMetricImp::getProperties(zet_metric_properties_t *pProperties) { @@ -916,12 +916,12 @@ ze_result_t metricCalculateOperationCreate( zet_context_handle_t hContext, zet_device_handle_t hDevice, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) { DeviceImp *deviceImp = static_cast(L0::Device::fromHandle(hDevice)); - return deviceImp->getMetricDeviceContext().calcOperationCreate(hContext, pCalculateDesc, pCount, phExcludedMetrics, phCalculateOperation); + return deviceImp->getMetricDeviceContext().calcOperationCreate(hContext, pCalculateDesc, pExcludedMetricCount, phExcludedMetrics, phCalculateOperation); } ze_result_t metricCalculateOperationDestroy( diff --git a/level_zero/tools/source/metrics/metric.h b/level_zero/tools/source/metrics/metric.h index 7d49310e7f..8b6afa588a 100644 --- a/level_zero/tools/source/metrics/metric.h +++ b/level_zero/tools/source/metrics/metric.h @@ -169,7 +169,7 @@ class MetricDeviceContext { zet_metric_group_handle_t *phMetricGroups); ze_result_t calcOperationCreate(zet_context_handle_t hContext, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation); bool areMetricGroupsFromSameDeviceHierarchy(uint32_t count, zet_metric_group_handle_t *phMetricGroups); diff --git a/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp b/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp index cb211f2c99..f0c8a23329 100644 --- a/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp +++ b/level_zero/tools/source/metrics/metric_ip_sampling_source.cpp @@ -247,13 +247,13 @@ ze_result_t IpSamplingMetricSourceImp::handleMetricGroupExtendedProperties(zet_m ze_result_t IpSamplingMetricSourceImp::calcOperationCreate(MetricDeviceContext &metricDeviceContext, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) { ze_result_t status = ZE_RESULT_ERROR_UNKNOWN; // All metrics in Ip sampling allow calculation - *pCount = 0; + *pExcludedMetricCount = 0; bool isMultiDevice = (metricDeviceContext.isImplicitScalingCapable()) ? true : false; status = IpSamplingMetricCalcOpImp::create(*this, pCalculateDesc, isMultiDevice, phCalculateOperation); diff --git a/level_zero/tools/source/metrics/metric_ip_sampling_source.h b/level_zero/tools/source/metrics/metric_ip_sampling_source.h index 280e6a13d3..838fa14dbe 100644 --- a/level_zero/tools/source/metrics/metric_ip_sampling_source.h +++ b/level_zero/tools/source/metrics/metric_ip_sampling_source.h @@ -59,7 +59,7 @@ class IpSamplingMetricSourceImp : public MetricSource { } ze_result_t calcOperationCreate(MetricDeviceContext &metricDeviceContext, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) override; diff --git a/level_zero/tools/source/metrics/metric_oa_source.h b/level_zero/tools/source/metrics/metric_oa_source.h index d540c6732b..58526a3605 100644 --- a/level_zero/tools/source/metrics/metric_oa_source.h +++ b/level_zero/tools/source/metrics/metric_oa_source.h @@ -66,7 +66,7 @@ class OaMetricSourceImp : public MetricSource { zet_metric_group_handle_t *pMetricGroupHandle); ze_result_t calcOperationCreate(MetricDeviceContext &metricDeviceContext, zet_intel_metric_calculate_exp_desc_t *pCalculateDesc, - uint32_t *pCount, + uint32_t *pExcludedMetricCount, zet_metric_handle_t *phExcludedMetrics, zet_intel_metric_calculate_operation_exp_handle_t *phCalculateOperation) override { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;