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

ULT fix for pmt handle

Browse Source 
Fixed failing ULTs  for the  pmt object created in map were not deleted

Related-To: LOCI-2835

Signed-off-by: Ayush Pandey <ayush.pandey@intel.com>
This commit is contained in:
Ayush Pandey
2022-01-12 23:45:17 +00:00
committed by Compute-Runtime-Automation
parent fbbcc27742
commit 5f8913f291
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/tools/test/unit_tests/sources/sysman/linux/pmt/test_pmt.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 Intel Corporation * Copyright (C) 2021-2022 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@@ -60,6 +60,7 @@ class ZesPmtFixtureMultiDevice : public SysmanMultiDeviceFixture {
SysmanMultiDeviceFixture::TearDown(); SysmanMultiDeviceFixture::TearDown();
for (auto &subDeviceIdToPmtEntry : mapOfSubDeviceIdToPmtObject) { for (auto &subDeviceIdToPmtEntry : mapOfSubDeviceIdToPmtObject) {
delete subDeviceIdToPmtEntry.second; delete subDeviceIdToPmtEntry.second;
subDeviceIdToPmtEntry.second = nullptr;
} }
} }
}; };
@@ -270,6 +271,7 @@ TEST_F(ZesPmtFixtureMultiDevice, GivenBaseOffsetReadFailWhenDoingPMTInitThenPMTm
TEST_F(ZesPmtFixtureMultiDevice, GivenNoPMTHandleInmapOfSubDeviceIdToPmtObjectWhenCallingreleasePmtObjectThenMapWouldGetEmpty) { TEST_F(ZesPmtFixtureMultiDevice, GivenNoPMTHandleInmapOfSubDeviceIdToPmtObjectWhenCallingreleasePmtObjectThenMapWouldGetEmpty) {
auto mapOriginal = pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject; auto mapOriginal = pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject;
pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject.clear();
for (const auto &deviceHandle : deviceHandles) { for (const auto &deviceHandle : deviceHandles) {
ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES};
Device::fromHandle(deviceHandle)->getProperties(&deviceProperties); Device::fromHandle(deviceHandle)->getProperties(&deviceProperties);
@@ -318,6 +320,7 @@ class ZesPmtFixtureNoSubDevice : public SysmanDeviceFixture {
SysmanDeviceFixture::TearDown(); SysmanDeviceFixture::TearDown();
for (auto &subDeviceIdToPmtEntry : mapOfSubDeviceIdToPmtObject) { for (auto &subDeviceIdToPmtEntry : mapOfSubDeviceIdToPmtObject) {
delete subDeviceIdToPmtEntry.second; delete subDeviceIdToPmtEntry.second;
subDeviceIdToPmtEntry.second = nullptr;
} }
} }
}; };

9
level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020-2021 Intel Corporation * Copyright (C) 2020-2022 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@@ -418,6 +418,7 @@ class SysmanDevicePowerMultiDeviceFixture : public SysmanMultiDeviceFixture {
FsAccess *pFsAccessOriginal = nullptr; FsAccess *pFsAccessOriginal = nullptr;
OsPower *pOsPowerOriginal = nullptr; OsPower *pOsPowerOriginal = nullptr;
std::vector<ze_device_handle_t> deviceHandles; std::vector<ze_device_handle_t> deviceHandles;
std::map<uint32_t, L0::PlatformMonitoringTech *> mapOriginal;
void SetUp() override { void SetUp() override {
if (!sysmanUltsEnable) { if (!sysmanUltsEnable) {
GTEST_SKIP(); GTEST_SKIP();
@@ -451,6 +452,8 @@ class SysmanDevicePowerMultiDeviceFixture : public SysmanMultiDeviceFixture {
deviceHandles.resize(subDeviceCount, nullptr); deviceHandles.resize(subDeviceCount, nullptr);
Device::fromHandle(device->toHandle())->getSubDevices(&subDeviceCount, deviceHandles.data()); Device::fromHandle(device->toHandle())->getSubDevices(&subDeviceCount, deviceHandles.data());
} }
mapOriginal = pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject;
pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject.clear();
for (auto &deviceHandle : deviceHandles) { for (auto &deviceHandle : deviceHandles) {
ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES};
@@ -468,9 +471,13 @@ class SysmanDevicePowerMultiDeviceFixture : public SysmanMultiDeviceFixture {
if (!sysmanUltsEnable) { if (!sysmanUltsEnable) {
GTEST_SKIP(); GTEST_SKIP();
} }
for (const auto &pmtMapElement : pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject) {
delete pmtMapElement.second;
}
SysmanMultiDeviceFixture::TearDown(); SysmanMultiDeviceFixture::TearDown();
pLinuxSysmanImp->pFsAccess = pFsAccessOriginal; pLinuxSysmanImp->pFsAccess = pFsAccessOriginal;
pLinuxSysmanImp->pSysfsAccess = pSysfsAccessOld; pLinuxSysmanImp->pSysfsAccess = pSysfsAccessOld;
pLinuxSysmanImp->mapOfSubDeviceIdToPmtObject = mapOriginal;
} }
std::vector<zes_pwr_handle_t> getPowerHandles(uint32_t count) { std::vector<zes_pwr_handle_t> getPowerHandles(uint32_t count) {