feature: remove calcOp multi set calc API

Resolves: NEO-15690

Signed-off-by: Matias Cabral <matias.a.cabral@intel.com>
This commit is contained in:
Matias Cabral
2025-08-07 21:02:03 +00:00
committed by Compute-Runtime-Automation
parent c5b66d50e2
commit 91f25ef990
8 changed files with 2 additions and 79 deletions

View File

@@ -108,14 +108,6 @@ ze_result_t ZE_APICALL zetIntelMetricCalculateValuesExp(const size_t rawDataSize
return L0::metricCalculateValues(rawDataSize, pOffset, pRawData, hCalculationOperation, pTotalMetricReportsCount, pMetricResults);
}
ze_result_t ZE_APICALL zetIntelMetricCalculateMultipleValuesExp(const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation,
uint32_t *pSetCount, uint32_t *pMetricsReportCountPerSet,
uint32_t *pTotalMetricReportCount, zet_intel_metric_result_exp_t *pMetricResults) {
return metricCalculateMultipleValues(rawDataSize, offset, pRawData, hCalculationOperation,
pSetCount, pMetricsReportCountPerSet, pTotalMetricReportCount, pMetricResults);
}
ze_result_t ZE_APICALL zetIntelMetricDecodeCalculateMultipleValuesExp(zet_intel_metric_decoder_exp_handle_t hMetricDecoder,
const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation,
@@ -253,14 +245,6 @@ ze_result_t ZE_APICALL zetIntelMetricCalculateValuesExp(const size_t rawDataSize
pTotalMetricReportsCount, pMetricResults);
}
ze_result_t ZE_APICALL zetIntelMetricCalculateMultipleValuesExp(const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation,
uint32_t *pSetCount, uint32_t *pMetricsReportCountPerSet,
uint32_t *pTotalMetricReportCount, zet_intel_metric_result_exp_t *pMetricResults) {
return L0::zetIntelMetricCalculateMultipleValuesExp(rawDataSize, offset, pRawData, hCalculationOperation, pSetCount,
pMetricsReportCountPerSet, pTotalMetricReportCount, pMetricResults);
}
ze_result_t ZE_APICALL zetIntelMetricDecodeCalculateMultipleValuesExp(zet_metric_decoder_exp_handle_t hMetricDecoder, const size_t rawDataSize,
size_t *offset, const uint8_t *pRawData, zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation,
uint32_t *pSetCount, uint32_t *pMetricReportCountPerSet, uint32_t *pTotalMetricReportCount,

View File

@@ -122,7 +122,6 @@ void *ExtensionFunctionAddressHelper::getExtensionFunctionAddress(const std::str
RETURN_FUNC_PTR_IF_EXIST(zetIntelMetricCalculationOperationGetExcludedMetricsExp);
RETURN_FUNC_PTR_IF_EXIST(zetIntelMetricCalculationOperationGetReportFormatExp);
RETURN_FUNC_PTR_IF_EXIST(zetIntelMetricDecodeCalculateMultipleValuesExp);
RETURN_FUNC_PTR_IF_EXIST(zetIntelMetricCalculateMultipleValuesExp);
RETURN_FUNC_PTR_IF_EXIST(zetIntelMetricCalculateValuesExp);
// Graphs

View File

@@ -413,34 +413,6 @@ zetIntelMetricDecodeToBinaryBufferExp(
///< value with the actual number of bytes decoded.
uint8_t *pDecodedBuffer); ///< [in,out][optional] binary buffer containing decoded raw data.
ze_result_t ZE_APICALL
zetIntelMetricCalculateMultipleValuesExp(
const size_t rawDataSize, ///< [in] size in bytes of raw data buffer.
size_t *offset, ///< [in,out] On input, the offset from the beginning of pRawData. On output,
///< the number raw bytes processed
const uint8_t *pRawData, ///< [in,out][range(0, *rawDataSize)] buffer containing tracer
///< data in raw format
zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation, ///< [in] Calculation operation handle
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 calculated. If count is greater than the number available in the raw
///< data buffer, then the driver shall update the value with the actual number
///< of metric sets to be calculated. There is a 1:1 relationship between the
///< number of sets and the number sub-devices metrics results that can be
///< calculated from the provided data.
uint32_t *pMetricReportCountPerSet, ///< [in,out][optional][range(0, *pSetCount)] buffer of metric reports counts
///< per metric set, one value per set
uint32_t *pTotalMetricReportCount, ///< [in,out] [optional] pointer to the total number of metric reports calculated,
///< for all metric sets. If count is zero, then the driver shall update the value
///< with the total number of metric reports to be calculated. If count is greater
///< than zero but less than the total number of reports available in the raw data,
///< then only that number of reports will be calculated. If count is greater than
///< the number of reports available in the raw data buffer, then the driver shall
///< update the value with the actual number of metric reports calculated. If set
///< to null, then driver will only update the value of pSetCount
zet_intel_metric_result_exp_t *pMetricResults); ///< [in,out][optional][range(0, *pTotalMetricResultsCount)] buffer of calculated
///< metrics results.
ze_result_t ZE_APICALL
zetIntelMetricCalculateValuesExp(
const size_t rawDataSize, ///< [in] size in bytes of raw data buffer.

View File

@@ -1078,18 +1078,6 @@ ze_result_t metricCalculateValues(
return MetricCalcOp::fromHandle(hCalculationOperation)->metricCalculateValues(rawDataSize, pOffset, pRawData, pTotalMetricReportsCount, pMetricResults);
}
ze_result_t metricCalculateMultipleValues(
const size_t rawDataSize,
size_t *offset,
const uint8_t *pRawData,
zet_intel_metric_calculation_operation_exp_handle_t hCalculationOperation,
uint32_t *pSetCount,
uint32_t *pMetricsReportCountPerSet,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) {
return MetricCalcOp::fromHandle(hCalculationOperation)->metricCalculateMultipleValues(rawDataSize, offset, pRawData, pSetCount, pMetricsReportCountPerSet, pTotalMetricReportCount, pMetricResults);
}
ze_result_t metricsEnable(zet_device_handle_t hDevice) {
auto isFailed = false;

View File

@@ -472,10 +472,6 @@ struct MetricCalcOp : _zet_intel_metric_calculation_operation_exp_handle_t {
virtual ze_result_t destroy() = 0;
virtual ze_result_t getReportFormat(uint32_t *pCount, zet_metric_handle_t *phMetrics) = 0;
virtual ze_result_t getExcludedMetrics(uint32_t *pCount, zet_metric_handle_t *phMetrics) = 0;
virtual ze_result_t metricCalculateMultipleValues(const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
uint32_t *pSetCount, uint32_t *pMetricsReportCountPerSet,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) = 0;
virtual ze_result_t metricCalculateValues(const size_t rawDataSize, size_t *pOffset, const uint8_t *pRawData,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) = 0;

View File

@@ -61,12 +61,7 @@ struct IpSamplingMetricCalcOpImp : public MetricCalcOpImp {
bool isMultiDevice,
zet_intel_metric_calculation_operation_exp_handle_t *phCalculationOperation);
ze_result_t destroy() override;
ze_result_t metricCalculateMultipleValues(const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
uint32_t *pSetCount, uint32_t *pMetricsReportCountPerSet,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) override {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
ze_result_t metricCalculateValues(const size_t rawDataSize, size_t *pOffset, const uint8_t *pRawData,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) override;

View File

@@ -168,12 +168,7 @@ class MockMetricCalcOp : public MetricCalcOpImp {
ze_result_t destroy() override {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
};
ze_result_t metricCalculateMultipleValues(const size_t rawDataSize, size_t *offset, const uint8_t *pRawData,
uint32_t *pSetCount, uint32_t *pMetricReportCountPerSet,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) override {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
};
ze_result_t metricCalculateValues(const size_t rawDataSize, size_t *pOffset, const uint8_t *pRawData,
uint32_t *pTotalMetricReportCount,
zet_intel_metric_result_exp_t *pMetricResults) override {

View File

@@ -1128,12 +1128,6 @@ HWTEST2_F(MetricIpSamplingCalcOpMultiDevTest, GivenIpSamplingCalcOpCallingMetric
reinterpret_cast<uint8_t *>(rawDataVector.data()), hCalculationOperation,
&totalMetricReportCount, nullptr));
uint32_t setCount = 0;
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, zetIntelMetricCalculateMultipleValuesExp(rawDataVectorSize, &offset,
reinterpret_cast<uint8_t *>(rawDataVector.data()),
hCalculationOperation, &setCount, nullptr,
nullptr, nullptr));
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricCalculationOperationDestroyExp(hCalculationOperation));
}