intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-09 06:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feature: support for Metric Scopes"

Browse Source 
This reverts commit e92ac1c8ab.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-07-17 03:53:47 +02:00
committed by Compute-Runtime-Automation
parent fcc2038def
commit 4c929fcc84
21 changed files with 13 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
level_zero/tools/test/unit_tests/sources/metrics/mock_metric_source.h
View File

@@ -57,11 +57,6 @@ class MockMetricSource : public L0::MetricSource {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
bool canDisable() override { return false; }
void initMetricScopes(MetricDeviceContext &metricDeviceContext) override {
if (!metricDeviceContext.isComputeMetricScopesInitialized()) {
initComputeMetricScopes(metricDeviceContext);
}
};
~MockMetricSource() override = default;
};
@@ -194,23 +189,6 @@ class MockMetricDeviceContext : public MetricDeviceContext {
void setMockMetricSource(MockMetricSource *metricSource) {
metricSources[MetricSource::metricSourceTypeOa] = std::unique_ptr<MockMetricSource>(metricSource);
}
void setMockMetricSourceAtIndex(uint32_t index, MockMetricSource *metricSource) {
metricSources[index] = std::unique_ptr<MockMetricSource>(metricSource);
}
void setMultiDeviceCapable(bool capable) {
multiDeviceCapable = capable;
}
};
class MockMetricScope : public MetricScopeImp {
public:
~MockMetricScope() override = default;
MockMetricScope(zet_intel_metric_scope_properties_exp_t &properties)
: MetricScopeImp(properties) {}
ze_result_t getProperties(zet_intel_metric_scope_properties_exp_t *pProperties) override {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
};
} // namespace ult

95
level_zero/tools/test/unit_tests/sources/metrics/test_metric.cpp
View File

@@ -283,100 +283,5 @@ TEST_F(MetricRuntimeFixture, WhenRunTimeEnableIsDoneAndNoSourcesAreAvailableThen
deviceImp->metricContext.reset();
}
using MetricScopesFixture = Test<DeviceFixture>;
TEST_F(MetricScopesFixture, WhenGettingMetricScopeForSingleDeviceTheyAreCorrectlyEnumerated) {
auto mockDeviceContext = new MockMetricDeviceContext(*device);
mockDeviceContext->clearAllSources();
auto metricSource = new MockMetricSource();
metricSource->isAvailableReturn = true;
mockDeviceContext->setMockMetricSource(metricSource);
auto deviceImp = static_cast<DeviceImp *>(device);
deviceImp->metricContext.reset(mockDeviceContext);
uint32_t metricScopesCount = 0;
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricScopesGetExp(context->toHandle(),
device->toHandle(),
&metricScopesCount,
nullptr));
EXPECT_EQ(metricScopesCount, 1u);
std::vector<zet_intel_metric_scope_exp_handle_t> metricScopes(metricScopesCount);
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricScopesGetExp(context->toHandle(),
device->toHandle(),
&metricScopesCount,
metricScopes.data()));
EXPECT_EQ(metricScopesCount, 1u);
EXPECT_EQ(metricScopes.size(), 1u);
}
TEST_F(MetricScopesFixture, WhenMultipleSourcesAreAvailableComputeMetricScopesAreEnumeratedOnlyOnce) {
auto mockDeviceContext = new MockMetricDeviceContext(*device);
mockDeviceContext->clearAllSources();
auto metricSource = new MockMetricSource();
metricSource->isAvailableReturn = true;
mockDeviceContext->setMockMetricSource(metricSource);
auto metricSource2 = new MockMetricSource();
metricSource2->isAvailableReturn = true;
mockDeviceContext->setMockMetricSourceAtIndex(100, metricSource2);
auto deviceImp = static_cast<DeviceImp *>(device);
deviceImp->metricContext.reset(mockDeviceContext);
uint32_t metricScopesCount = 0;
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricScopesGetExp(context->toHandle(),
device->toHandle(),
&metricScopesCount,
nullptr));
EXPECT_EQ(metricScopesCount, 1u);
}
TEST_F(MetricScopesFixture, GettingMetricsScopesPropertiesReturnsExpectedValues) {
auto mockDeviceContext = new MockMetricDeviceContext(*device);
mockDeviceContext->clearAllSources();
auto metricSource = new MockMetricSource();
metricSource->isAvailableReturn = true;
mockDeviceContext->setMockMetricSource(metricSource);
auto deviceImp = static_cast<DeviceImp *>(device);
deviceImp->metricContext.reset(mockDeviceContext);
uint32_t metricScopesCount = 1;
zet_intel_metric_scope_exp_handle_t metricScope;
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricScopesGetExp(context->toHandle(),
device->toHandle(),
&metricScopesCount,
&metricScope));
EXPECT_EQ(metricScopesCount, 1u);
zet_intel_metric_scope_properties_exp_t scopeProperties{};
scopeProperties.stype = ZET_STRUCTURE_TYPE_INTEL_METRIC_SCOPE_PROPERTIES_EXP;
scopeProperties.pNext = nullptr;
EXPECT_EQ(ZE_RESULT_SUCCESS, zetIntelMetricScopeGetPropertiesExp(metricScope,
&scopeProperties));
EXPECT_EQ(scopeProperties.iD, 0u);
EXPECT_STREQ(scopeProperties.name, "COMPUTE_TILE_0");
EXPECT_STREQ(scopeProperties.description, "Metrics results for tile 0");
}
TEST_F(MetricScopesFixture, MetricScopeObjectToAndFromHandleBaseClassWorkAsExpected) {
zet_intel_metric_scope_properties_exp_t scopeProperties{};
scopeProperties.stype = ZET_STRUCTURE_TYPE_INTEL_METRIC_SCOPE_PROPERTIES_EXP;
scopeProperties.pNext = nullptr;
MockMetricScope mockMetricScope(scopeProperties);
auto hMockScope = mockMetricScope.toHandle();
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, zetIntelMetricScopeGetPropertiesExp(hMockScope,
&scopeProperties));
auto mockScope = MetricScope::fromHandle(hMockScope);
EXPECT_NE(nullptr, mockScope);
}
} // namespace ult
} // namespace L0

15
level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp
View File

@@ -1332,20 +1332,5 @@ HWTEST2_F(MetricIpSamplingEnumerationTest, GivenEnumerationIsSuccessfulWhenUnsup
}
}
HWTEST2_F(MetricIpSamplingEnumerationTest, GivenValidIpSamplingSourceComputeMetricScopesAreEnumeratedOnce, EustallSupportedPlatforms) {
MetricDeviceContext &metricsDevContext = testDevices[0]->getMetricDeviceContext();
EXPECT_EQ(ZE_RESULT_SUCCESS, metricsDevContext.enableMetricApi());
metricsDevContext.setComputeMetricScopeInitialized();
auto &metricSource = metricsDevContext.getMetricSource<IpSamplingMetricSourceImp>();
EXPECT_EQ(metricSource.isAvailable(), true);
uint32_t metricScopesCount = 0;
metricsDevContext.metricScopesGet(context->toHandle(), &metricScopesCount, nullptr);
EXPECT_EQ(metricScopesCount, 0u);
}
} // namespace ult
} // namespace L0

14
level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp
View File

@@ -104,20 +104,6 @@ TEST_F(MetricEnumerationTest, givenTTypedValueWhenCopyValueIsCalledReturnsFilled
}
}
TEST_F(MetricEnumerationTest, GivenValidOASourceComputeMetricScopesAreEnumeratedOnce) {
MetricDeviceContext &metricsDevContext = device->getMetricDeviceContext();
EXPECT_EQ(ZE_RESULT_SUCCESS, metricsDevContext.enableMetricApi());
metricsDevContext.setComputeMetricScopeInitialized();
auto &metricSource = metricsDevContext.getMetricSource<OaMetricSourceImp>();
EXPECT_EQ(metricSource.isAvailable(), true);
uint32_t metricScopesCount = 0;
metricsDevContext.metricScopesGet(context->toHandle(), &metricScopesCount, nullptr);
EXPECT_EQ(metricScopesCount, 0u);
}
using MetricEnumerationMultiDeviceTest = Test<MetricMultiDeviceFixture>;
TEST_F(MetricEnumerationMultiDeviceTest, givenRootDeviceWhenLoadDependenciesIsCalledThenOpenMetricsSubDeviceWillBeCalled) {