From 770a6676a4ac0b53aa862385c56c97a99c715417 Mon Sep 17 00:00:00 2001 From: Mayank Raghuwanshi Date: Wed, 2 Jun 2021 20:10:46 +0530 Subject: [PATCH] Remove handles for retrieving min temperature values Signed-off-by: Mayank Raghuwanshi --- .../temperature/linux/os_temperature_imp.cpp | 24 +------------------ .../source/sysman/temperature/temperature.cpp | 2 -- .../linux/mock_sysfs_temperature.h | 2 -- .../linux/test_zes_temperature.cpp | 2 +- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp index 1a177c721b..478f31e6db 100644 --- a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp +++ b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp @@ -90,10 +90,6 @@ ze_result_t LinuxTemperatureImp::getGlobalMaxTemperature(double *pTemperature) { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; } -ze_result_t LinuxTemperatureImp::getGlobalMinTemperature(double *pTemperature) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; -} - ze_result_t LinuxTemperatureImp::getGpuMaxTemperatureNoSubDevice(double *pTemperature) { uint32_t computeTemperature = 0; std::string key("COMPUTE_TEMPERATURES"); @@ -115,10 +111,6 @@ ze_result_t LinuxTemperatureImp::getGpuMaxTemperature(double *pTemperature) { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; } -ze_result_t LinuxTemperatureImp::getGpuMinTemperature(double *pTemperature) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; -} - ze_result_t LinuxTemperatureImp::getMemoryMaxTemperature(double *pTemperature) { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; } @@ -144,18 +136,6 @@ ze_result_t LinuxTemperatureImp::getSensorTemperature(double *pTemperature) { return result; } break; - case ZES_TEMP_SENSORS_GLOBAL_MIN: - result = getGlobalMinTemperature(pTemperature); - if (result != ZE_RESULT_SUCCESS) { - return result; - } - break; - case ZES_TEMP_SENSORS_GPU_MIN: - result = getGpuMinTemperature(pTemperature); - if (result != ZE_RESULT_SUCCESS) { - return result; - } - break; default: *pTemperature = 0; result = ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; @@ -167,12 +147,10 @@ ze_result_t LinuxTemperatureImp::getSensorTemperature(double *pTemperature) { bool LinuxTemperatureImp::isTempModuleSupported() { if (!isSubdevice) { - if ((type == ZES_TEMP_SENSORS_MEMORY) || (type == ZES_TEMP_SENSORS_GLOBAL_MIN) || - (type == ZES_TEMP_SENSORS_GPU_MIN)) { + if (type == ZES_TEMP_SENSORS_MEMORY) { return false; } } - return (pPmt != nullptr); } diff --git a/level_zero/tools/source/sysman/temperature/temperature.cpp b/level_zero/tools/source/sysman/temperature/temperature.cpp index e53532b268..7a052aed07 100644 --- a/level_zero/tools/source/sysman/temperature/temperature.cpp +++ b/level_zero/tools/source/sysman/temperature/temperature.cpp @@ -29,9 +29,7 @@ void TemperatureHandleContext::createHandle(const ze_device_handle_t &deviceHand void TemperatureHandleContext::init(std::vector &deviceHandles) { for (const auto &deviceHandle : deviceHandles) { createHandle(deviceHandle, ZES_TEMP_SENSORS_GLOBAL); - createHandle(deviceHandle, ZES_TEMP_SENSORS_GLOBAL_MIN); createHandle(deviceHandle, ZES_TEMP_SENSORS_GPU); - createHandle(deviceHandle, ZES_TEMP_SENSORS_GPU_MIN); createHandle(deviceHandle, ZES_TEMP_SENSORS_MEMORY); } } diff --git a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h index 8d9ab611cc..257a90c24a 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h @@ -24,9 +24,7 @@ constexpr uint16_t memory0MaxTempIndex = 0; constexpr uint16_t memory1MaxTempIndex = 8; constexpr uint16_t memory2MaxTempIndex = 300; constexpr uint16_t memory3MaxTempIndex = 308; -constexpr uint8_t subDeviceMinTempIndex = 12; constexpr uint8_t subDeviceMaxTempIndex = 16; -constexpr uint8_t gtMinTempIndex = 20; constexpr uint8_t gtMaxTempIndex = 24; constexpr uint8_t tempArrForNoSubDevices[19] = {0x12, 0x23, 0x43, 0xde, 0xa3, 0xce, 0x23, 0x11, 0x45, 0x32, 0x67, 0x47, 0xac, 0x21, 0x03, 0x90, 0, 0, 0}; diff --git a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/test_zes_temperature.cpp b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/test_zes_temperature.cpp index 13a9f8a5ee..08de99702d 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/test_zes_temperature.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/test_zes_temperature.cpp @@ -11,7 +11,7 @@ namespace L0 { namespace ult { std::string rootPciPathOfGpuDevice = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0"; -constexpr uint32_t handleComponentCountForSubDevices = 10u; +constexpr uint32_t handleComponentCountForSubDevices = 6u; constexpr uint32_t handleComponentCountForNoSubDevices = 2u; constexpr uint32_t invalidMaxTemperature = 125; constexpr uint32_t invalidMinTemperature = 10;