intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-22 10:17:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add flexibility to disable root device metrics"

Browse Source 
Reverted the change which disabled metrics collection for multi-device

Related-To: LOCI-2580

Signed-off-by: Joshua Santosh Ranjan <joshua.santosh.ranjan@intel.com>
This commit is contained in:
Joshua Santosh Ranjan
2021-09-30 08:38:05 +00:00
committed by Compute-Runtime-Automation
parent da982b41be
commit 4cb7c1014a
4 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
level_zero/tools/source/metrics/metric.cpp
View File

@@ -48,8 +48,6 @@ struct MetricContextImp : public MetricContext {
~MetricContextImp() override; ~MetricContextImp() override;
bool loadDependencies() override; bool loadDependencies() override;
void setMetricCollectionEnabled(bool enable) override;
bool getMetricCollectionEnabled() override;
bool isInitialized() override; bool isInitialized() override;
void setInitializationState(const ze_result_t state) override; void setInitializationState(const ze_result_t state) override;
Device &getDevice() override; Device &getDevice() override;
@@ -79,7 +77,6 @@ struct MetricContextImp : public MetricContext {
MetricStreamer *pMetricStreamer = nullptr; MetricStreamer *pMetricStreamer = nullptr;
uint32_t subDeviceIndex = 0; uint32_t subDeviceIndex = 0;
bool useCompute = false; bool useCompute = false;
bool metricCollectionIsEnabled = true;
}; };
MetricContextImp::MetricContextImp(Device &deviceInput) MetricContextImp::MetricContextImp(Device &deviceInput)
@@ -120,14 +117,6 @@ bool MetricContextImp::loadDependencies() {
return result; return result;
} }
void MetricContextImp::setMetricCollectionEnabled(bool enable) {
metricCollectionIsEnabled = enable;
}
bool MetricContextImp::getMetricCollectionEnabled() {
return metricCollectionIsEnabled;
}
bool MetricContextImp::isInitialized() { bool MetricContextImp::isInitialized() {
return initializationState == ZE_RESULT_SUCCESS; return initializationState == ZE_RESULT_SUCCESS;
} }
@@ -212,10 +201,7 @@ ze_result_t MetricContext::enableMetricApi() {
// Initialize root device. // Initialize root device.
auto rootDevice = L0::Device::fromHandle(rootDeviceHandle); auto rootDevice = L0::Device::fromHandle(rootDeviceHandle);
auto &rootMetricContext = rootDevice->getMetricContext(); failed |= !rootDevice->getMetricContext().loadDependencies();
failed |= !rootMetricContext.loadDependencies();
rootMetricContext.setMetricCollectionEnabled(!rootDevice->isMultiDeviceCapable());
// Sub devices count. // Sub devices count.
uint32_t subDeviceCount = 0; uint32_t subDeviceCount = 0;

2
level_zero/tools/source/metrics/metric.h
View File

@@ -33,8 +33,6 @@ struct MetricContext {
static std::unique_ptr<MetricContext> create(struct Device &device); static std::unique_ptr<MetricContext> create(struct Device &device);
static bool isMetricApiAvailable(); static bool isMetricApiAvailable();
virtual bool loadDependencies() = 0; virtual bool loadDependencies() = 0;
virtual void setMetricCollectionEnabled(bool enable) = 0;
virtual bool getMetricCollectionEnabled() = 0;
virtual bool isInitialized() = 0; virtual bool isInitialized() = 0;
virtual void setInitializationState(const ze_result_t state) = 0; virtual void setInitializationState(const ze_result_t state) = 0;
virtual Device &getDevice() = 0; virtual Device &getDevice() = 0;

10
level_zero/tools/source/metrics/metric_enumeration_imp.cpp
View File

@@ -67,13 +67,9 @@ bool MetricEnumeration::isInitialized() {
ze_result_t MetricEnumeration::initialize() { ze_result_t MetricEnumeration::initialize() {
if (initializationState == ZE_RESULT_ERROR_UNINITIALIZED) { if (initializationState == ZE_RESULT_ERROR_UNINITIALIZED) {
if (!this->metricContext.getMetricCollectionEnabled()) { if (hMetricsDiscovery &&
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", openMetricsDiscovery() == ZE_RESULT_SUCCESS &&
"metrics collection is disabled on the root device\n"); cacheMetricInformation() == ZE_RESULT_SUCCESS) {
initializationState = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
} else if (hMetricsDiscovery &&
openMetricsDiscovery() == ZE_RESULT_SUCCESS &&
cacheMetricInformation() == ZE_RESULT_SUCCESS) {
initializationState = ZE_RESULT_SUCCESS; initializationState = ZE_RESULT_SUCCESS;
} else { } else {
initializationState = ZE_RESULT_ERROR_UNKNOWN; initializationState = ZE_RESULT_ERROR_UNKNOWN;

13
level_zero/tools/test/unit_tests/sources/metrics/test_metric_enumeration_1.cpp
View File

@@ -2657,19 +2657,6 @@ TEST_F(MetricEnumerationTest, givenSubDeviceWhenLoadDependenciesIsCalledThenOpen
EXPECT_EQ(mockMetricEnumeration->baseIsInitialized(), false); EXPECT_EQ(mockMetricEnumeration->baseIsInitialized(), false);
} }
TEST_F(MetricEnumerationTest, givenMetricContextWhenEnablingOrDisablingCollectionThenExpectProperFlagSet) {
auto &metricContext = device->getMetricContext();
metricContext.setMetricCollectionEnabled(true);
EXPECT_EQ(metricContext.getMetricCollectionEnabled(), true);
metricContext.setMetricCollectionEnabled(false);
EXPECT_EQ(metricContext.getMetricCollectionEnabled(), false);
uint32_t metricGroupCount = 0;
EXPECT_EQ(zetMetricGroupGet(device->toHandle(), &metricGroupCount, nullptr), ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
EXPECT_EQ(metricGroupCount, 0u);
}
class MetricEnumerationTestMetricTypes : public MetricEnumerationTest, class MetricEnumerationTestMetricTypes : public MetricEnumerationTest,
public ::testing::WithParamInterface<MetricsDiscovery::TMetricType> { public ::testing::WithParamInterface<MetricsDiscovery::TMetricType> {
public: public: