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

refactor: remove unused code

Browse Source 
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2023-07-18 13:52:42 +00:00
committed by Compute-Runtime-Automation
parent 3652aeb059
commit faa8907344
12 changed files with 22 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/sysman/source/linux/pmt/sysman_pmt.cpp
View File

@@ -127,7 +127,7 @@ ze_result_t PlatformMonitoringTech::init(FsAccess *pFsAccess, const std::string
std::string telemNode = telem + std::to_string(rootDeviceTelemNodeIndex);
// For XE_HP_SDV and PVC single tile devices, telemetry info is retrieved from
// tile's telem node rather from root device telem node.
if ((isSubdevice) || ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV))) {
if ((isSubdevice) || (productFamily == IGFX_PVC)) {
uint32_t telemNodeIndex = 0;
// If rootDeviceTelemNode is telem1, then rootDeviceTelemNodeIndex = 1
// And thus for subdevice0 --> telem node will be telem2,

7
level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.cpp
View File

@@ -160,10 +160,7 @@ ze_result_t LinuxMemoryImp::readMcChannelCounters(uint64_t &readCounters, uint64
void LinuxMemoryImp::getHbmFrequency(PRODUCT_FAMILY productFamily, unsigned short stepping, uint64_t &hbmFrequency) {
hbmFrequency = 0;
if (productFamily == IGFX_XE_HP_SDV) {
// For IGFX_XE_HP HBM frequency would be 2.8 GT/s = 2.8 * 1000 * 1000 * 1000 T/s = 2800000000 T/s
hbmFrequency = 2.8 * gigaUnitTransferToUnitTransfer;
} else if (productFamily == IGFX_PVC) {
if (productFamily == IGFX_PVC) {
if (stepping >= REVISION_B) {
const std::string hbmRP0FreqFile = pDrm->getIoctlHelper()->getFileForMaxMemoryFrequencyOfSubDevice(subdeviceId);
uint64_t hbmFreqValue = 0;
@@ -317,4 +314,4 @@ std::unique_ptr<OsMemory> OsMemory::create(OsSysman *pOsSysman, ze_bool_t onSubd
}
} // namespace Sysman
} // namespace L0
} // namespace L0

6
level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.cpp
View File

@@ -195,7 +195,7 @@ ze_result_t LinuxPowerImp::getLimitsExt(uint32_t *pCount, zes_power_limit_ext_de
pSustained[count].source = ZES_POWER_SOURCE_ANY;
pSustained[count].level = ZES_POWER_LEVEL_PEAK;
pSustained[count].interval = 0; // Hardcode to 100 micro seconds i.e 0.1 milli seconds
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
pSustained[count].limit = static_cast<int32_t>(val);
pSustained[count].limitUnit = ZES_LIMIT_UNIT_CURRENT;
} else {
@@ -227,7 +227,7 @@ ze_result_t LinuxPowerImp::setLimitsExt(uint32_t *pCount, zes_power_limit_ext_de
return getErrorCode(result);
}
} else if (pSustained[i].level == ZES_POWER_LEVEL_PEAK) {
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
val = pSustained[i].limit;
} else {
val = pSustained[i].limit * milliFactor; // Convert milliwatts to microwatts
@@ -315,7 +315,7 @@ LinuxPowerImp::LinuxPowerImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_
pPmt = pLinuxSysmanImp->getPlatformMonitoringTechAccess(subdeviceId);
pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
productFamily = pLinuxSysmanImp->getProductFamily();
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
criticalPowerLimit = "curr1_crit";
} else {
criticalPowerLimit = "power1_crit";

10
level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.cpp
View File

@@ -98,7 +98,7 @@ ze_result_t LinuxTemperatureImp::getGlobalMaxTemperatureNoSubDevice(double *pTem
ze_result_t LinuxTemperatureImp::getGlobalMaxTemperature(double *pTemperature) {
// For XE_HP_SDV and PVC single tile devices, telemetry info is retrieved from
// tile's telem node rather from root device telem node.
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
return getGlobalMaxTemperatureNoSubDevice(pTemperature);
}
uint32_t globalMaxTemperature = 0;
@@ -143,7 +143,7 @@ ze_result_t LinuxTemperatureImp::getGpuMaxTemperatureNoSubDevice(double *pTemper
}
ze_result_t LinuxTemperatureImp::getGpuMaxTemperature(double *pTemperature) {
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
return getGpuMaxTemperatureNoSubDevice(pTemperature);
}
uint32_t gpuMaxTemperature = 0;
@@ -160,9 +160,7 @@ ze_result_t LinuxTemperatureImp::getGpuMaxTemperature(double *pTemperature) {
ze_result_t LinuxTemperatureImp::getMemoryMaxTemperature(double *pTemperature) {
ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
uint32_t numHbmModules = 0u;
if (productFamily == IGFX_XE_HP_SDV) {
numHbmModules = 2u;
} else if (productFamily == IGFX_PVC) {
if (productFamily == IGFX_PVC) {
numHbmModules = 4u;
} else {
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s() returning UNSUPPORTED_FEATURE \n", __FUNCTION__);
@@ -217,7 +215,7 @@ ze_result_t LinuxTemperatureImp::getSensorTemperature(double *pTemperature) {
}
bool LinuxTemperatureImp::isTempModuleSupported() {
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
if (type == ZES_TEMP_SENSORS_MEMORY) {
return false;
}

11
level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
View File

@@ -584,15 +584,6 @@ TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIs
delete pLinuxMemoryImp;
}
TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIsXE_HP_SDVThenHbmFrequencyShouldBeNotZero) {
PublicLinuxMemoryImp *pLinuxMemoryImp = new PublicLinuxMemoryImp(pOsSysman, true, 1);
uint64_t hbmFrequency = 0;
pLinuxMemoryImp->getHbmFrequency(IGFX_XE_HP_SDV, REVISION_A0, hbmFrequency);
uint64_t expectedHbmFrequency = 2.8 * gigaUnitTransferToUnitTransfer;
EXPECT_EQ(hbmFrequency, expectedHbmFrequency);
delete pLinuxMemoryImp;
}
TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIsUnsupportedThenHbmFrequencyShouldBeZero) {
PublicLinuxMemoryImp *pLinuxMemoryImp = new PublicLinuxMemoryImp(pOsSysman, true, 1);
uint64_t hbmFrequency = 0;
@@ -826,4 +817,4 @@ TEST_F(SysmanMultiDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysma
} // namespace ult
} // namespace Sysman
} // namespace L0
} // namespace L0

2
level_zero/tools/source/sysman/linux/pmt/pmt.cpp
View File

@@ -130,7 +130,7 @@ ze_result_t PlatformMonitoringTech::init(FsAccess *pFsAccess, const std::string
std::string telemNode = telem + std::to_string(rootDeviceTelemNodeIndex);
// For XE_HP_SDV and PVC single tile devices, telemetry info is retrieved from
// tile's telem node rather from root device telem node.
if ((isSubdevice) || ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV))) {
if ((isSubdevice) || (productFamily == IGFX_PVC)) {
uint32_t telemNodeIndex = 0;
// If rootDeviceTelemNode is telem1, then rootDeviceTelemNodeIndex = 1
// And thus for subdevice0 --> telem node will be telem2,

7
level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
View File

@@ -156,10 +156,7 @@ ze_result_t LinuxMemoryImp::readMcChannelCounters(uint64_t &readCounters, uint64
void LinuxMemoryImp::getHbmFrequency(PRODUCT_FAMILY productFamily, unsigned short stepping, uint64_t &hbmFrequency) {
hbmFrequency = 0;
if (productFamily == IGFX_XE_HP_SDV) {
// For IGFX_XE_HP HBM frequency would be 2.8 GT/s = 2.8 * 1000 * 1000 * 1000 T/s = 2800000000 T/s
hbmFrequency = 2.8 * gigaUnitTransferToUnitTransfer;
} else if (productFamily == IGFX_PVC) {
if (productFamily == IGFX_PVC) {
if (stepping >= REVISION_B) {
const std::string hbmRP0FreqFile = pDrm->getIoctlHelper()->getFileForMaxMemoryFrequencyOfSubDevice(subdeviceId);
uint64_t hbmFreqValue = 0;
@@ -473,4 +470,4 @@ std::unique_ptr<OsMemory> OsMemory::create(OsSysman *pOsSysman, ze_bool_t onSubd
return pLinuxMemoryImp;
}
} // namespace L0
} // namespace L0

6
level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.cpp
View File

@@ -194,7 +194,7 @@ ze_result_t LinuxPowerImp::getLimitsExt(uint32_t *pCount, zes_power_limit_ext_de
pSustained[count].source = ZES_POWER_SOURCE_ANY;
pSustained[count].level = ZES_POWER_LEVEL_PEAK;
pSustained[count].interval = 0; // Hardcode to 100 micro seconds i.e 0.1 milli seconds
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
pSustained[count].limit = static_cast<int32_t>(val);
pSustained[count].limitUnit = ZES_LIMIT_UNIT_CURRENT;
} else {
@@ -226,7 +226,7 @@ ze_result_t LinuxPowerImp::setLimitsExt(uint32_t *pCount, zes_power_limit_ext_de
return getErrorCode(result);
}
} else if (pSustained[i].level == ZES_POWER_LEVEL_PEAK) {
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
val = pSustained[i].limit;
} else {
val = pSustained[i].limit * milliFactor; // Convert milliwatts to microwatts
@@ -314,7 +314,7 @@ LinuxPowerImp::LinuxPowerImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_
pPmt = pLinuxSysmanImp->getPlatformMonitoringTechAccess(subdeviceId);
pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
productFamily = SysmanDeviceImp::getProductFamily(pLinuxSysmanImp->getDeviceHandle());
if ((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)) {
if (productFamily == IGFX_PVC) {
criticalPowerLimit = "curr1_crit";
} else {
criticalPowerLimit = "power1_crit";

10
level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp
View File

@@ -98,7 +98,7 @@ ze_result_t LinuxTemperatureImp::getGlobalMaxTemperatureNoSubDevice(double *pTem
ze_result_t LinuxTemperatureImp::getGlobalMaxTemperature(double *pTemperature) {
// For XE_HP_SDV and PVC single tile devices, telemetry info is retrieved from
// tile's telem node rather from root device telem node.
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
return getGlobalMaxTemperatureNoSubDevice(pTemperature);
}
uint32_t globalMaxTemperature = 0;
@@ -143,7 +143,7 @@ ze_result_t LinuxTemperatureImp::getGpuMaxTemperatureNoSubDevice(double *pTemper
}
ze_result_t LinuxTemperatureImp::getGpuMaxTemperature(double *pTemperature) {
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
return getGpuMaxTemperatureNoSubDevice(pTemperature);
}
uint32_t gpuMaxTemperature = 0;
@@ -160,9 +160,7 @@ ze_result_t LinuxTemperatureImp::getGpuMaxTemperature(double *pTemperature) {
ze_result_t LinuxTemperatureImp::getMemoryMaxTemperature(double *pTemperature) {
ze_result_t result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
uint32_t numHbmModules = 0u;
if (productFamily == IGFX_XE_HP_SDV) {
numHbmModules = 2u;
} else if (productFamily == IGFX_PVC) {
if (productFamily == IGFX_PVC) {
numHbmModules = 4u;
} else {
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s() returning UNSUPPORTED_FEATURE \n", __FUNCTION__);
@@ -217,7 +215,7 @@ ze_result_t LinuxTemperatureImp::getSensorTemperature(double *pTemperature) {
}
bool LinuxTemperatureImp::isTempModuleSupported() {
if ((!isSubdevice) && (!((productFamily == IGFX_PVC) || (productFamily == IGFX_XE_HP_SDV)))) {
if ((!isSubdevice) && (!(productFamily == IGFX_PVC))) {
if (type == ZES_TEMP_SENSORS_MEMORY) {
return false;
}

9
level_zero/tools/test/unit_tests/sources/sysman/memory/linux/test_sysman_memory_prelim.cpp
View File

@@ -981,15 +981,6 @@ TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIs
delete pLinuxMemoryImp;
}
TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIsXE_HP_SDVThenHbmFrequencyShouldBeNotZero) {
PublicLinuxMemoryImp *pLinuxMemoryImp = new PublicLinuxMemoryImp(pOsSysman, true, 1);
uint64_t hbmFrequency = 0;
pLinuxMemoryImp->getHbmFrequency(IGFX_XE_HP_SDV, REVISION_A0, hbmFrequency);
uint64_t expectedHbmFrequency = 2.8 * gigaUnitTransferToUnitTransfer;
EXPECT_EQ(hbmFrequency, expectedHbmFrequency);
delete pLinuxMemoryImp;
}
TEST_F(SysmanDeviceMemoryFixture, GivenCallinggetHbmFrequencyWhenProductFamilyIsUnsupportedThenHbmFrequencyShouldBeZero) {
PublicLinuxMemoryImp *pLinuxMemoryImp = new PublicLinuxMemoryImp(pOsSysman, true, 1);
uint64_t hbmFrequency = 0;

18
opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
View File

@@ -176,24 +176,6 @@ void MulticontextAubFixture::overridePlatformConfigForAllEnginesSupport(Hardware
auto compilerProductHelper = CompilerProductHelper::create(localHwInfo.platform.eProductFamily);
if (localHwInfo.platform.eRenderCoreFamily == IGFX_XE_HP_CORE) {
#ifdef SUPPORT_XE_HP_SDV
if (localHwInfo.platform.eProductFamily == IGFX_XE_HP_SDV) {
setupCalled = true;
XehpSdvHwConfig::setupHardwareInfo(&localHwInfo, true, *compilerProductHelper);
// Mock values
localHwInfo.gtSystemInfo.SliceCount = 8;
localHwInfo.gtSystemInfo.SubSliceCount = 32;
localHwInfo.gtSystemInfo.EUCount = 512;
localHwInfo.gtSystemInfo.CCSInfo.IsValid = true;
localHwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
localHwInfo.gtSystemInfo.CCSInfo.Instances.CCSEnableMask = 0b1111;
}
#endif
}
if (localHwInfo.platform.eRenderCoreFamily == IGFX_XE_HPG_CORE) {
#ifdef SUPPORT_DG2
if (localHwInfo.platform.eProductFamily == IGFX_DG2) {

14
opencl/test/unit_test/xe_hp_core/gfx_core_helper_tests_xe_hp_core.cpp
View File

@@ -119,19 +119,7 @@ XE_HP_CORE_TEST_F(GfxCoreHelperTestXE_HP_CORE, givenRevisionEnumAndPlatformFamil
for (auto stepping : steppings) {
hardwareInfo.platform.usRevId = productHelper.getHwRevIdFromStepping(stepping, hardwareInfo);
if (hardwareInfo.platform.eProductFamily == IGFX_XE_HP_SDV) {
if (stepping == REVISION_A0) {
EXPECT_TRUE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_B, hardwareInfo, productHelper));
EXPECT_TRUE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_A1, hardwareInfo, productHelper));
EXPECT_FALSE(GfxCoreHelper::isWorkaroundRequired(REVISION_B, REVISION_A0, hardwareInfo, productHelper));
} else if (stepping == REVISION_A1) {
EXPECT_FALSE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_A1, hardwareInfo, productHelper));
} else if (stepping == REVISION_C || stepping == REVISION_D) { // undefined
EXPECT_FALSE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_D, hardwareInfo, productHelper));
}
} else {
EXPECT_FALSE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_D, hardwareInfo, productHelper));
}
EXPECT_FALSE(GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_D, hardwareInfo, productHelper));
}
}