AI/rocm-systems
2
0
انشعاب 0
کد مسائل تقاضاهای واکشی Actions Packages پروژه‌ها انتشارها دانشنامه فعالیت

Remove duplicate temperature function

فهرست منبع 
The amdsmi_dev_get_temp_metric() will cover both function:
amdsmi_get_temperature_measure() using AMDSMI_TEMP_CURRENT
and
amdsmi_get_temperature_limit() using AMDSMI_TEMP_CRITICAL
Remove those two function.

It also merge the amdsmi_get_power_limit() into
amdsmi_get_power_measure()

Change-Id: I40d4afeb2ec0ac7b64832729f36adfaae120c990


[ROCm/amdsmi commit: ec48312c61]
This commit is contained in:
Bill(Shuzhou) Liu
2023-01-10 08:48:59 -06:00
والد 3a7a71058f
کامیت ca06111d12
8فایلهای تغییر یافته به همراه42 افزوده شده و 451 حذف شده
دانلود پرونده وصله دانلود فایل تغییرات diff Expand all files Collapse all files
projects/amdsmi/src/amd_smi/amd_smi.cc
+7 -132
مشاهده پرونده
@@ -1467,29 +1467,6 @@ amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t
amdsmi_get_power_limit(amdsmi_device_handle device_handle, amdsmi_power_limit_t *power) {
AMDSMI_CHECK_INIT();
if (power == nullptr) {
return AMDSMI_STATUS_INVAL;
}
amd::smi::AMDSmiGPUDevice* gpu_device = nullptr;
amdsmi_status_t r = get_gpu_device_from_handle(device_handle, &gpu_device);
if (r != AMDSMI_STATUS_SUCCESS)
return r;
amdsmi_status_t status;
int power_limit;
status = smi_amdgpu_get_power_cap(gpu_device, &power_limit);
if (status != AMDSMI_STATUS_SUCCESS) {
return status;
}
power->limit = (uint16_t)(power_limit);
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t
amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info) {
AMDSMI_CHECK_INIT();
@@ -1545,115 +1522,6 @@ amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t c
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t
amdsmi_get_temperature_limit(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_limit_t *temp) {
AMDSMI_CHECK_INIT();
if (temp == nullptr || temp_type > TEMPERATURE_TYPE__MAX) {
return AMDSMI_STATUS_INVAL;
}
amd::smi::AMDSmiGPUDevice* gpu_device = nullptr;
amdsmi_status_t r = get_gpu_device_from_handle(device_handle, &gpu_device);
if (r != AMDSMI_STATUS_SUCCESS)
return r;
amdsmi_status_t status;
std::string name;
std::string path;
switch (temp_type) {
case TEMPERATURE_TYPE_EDGE:
name = "edge";
break;
case TEMPERATURE_TYPE_JUNCTION:
name = "junction";
break;
case TEMPERATURE_TYPE_VRAM:
name = "mem";
break;
default:
return AMDSMI_STATUS_INVAL;
}
status = smi_amdgpu_find_hwmon_dir(gpu_device, &path);
if (status != AMDSMI_STATUS_SUCCESS) {
return status;
}
SMIGPUDEVICE_MUTEX(gpu_device->get_mutex())
for (int count = 1; ; count++) {
std::string local_path = path + "/temp" +
std::to_string(count);
std::string local_temp = local_path + "_label";
char f_name[10];
std::ifstream file(local_temp.c_str(), std::ifstream::in);
if (!file.is_open()) {
printf("Failed to open file: %s \n", local_temp.c_str());
return AMDSMI_STATUS_API_FAILED;
}
file.getline(f_name, 10);
if (!strstr(name.c_str(), f_name)) {
int readTemp = 0;
local_temp = local_path + "_crit";
std::ifstream file2(local_temp.c_str(), std::ifstream::in);
if (!file2.is_open()) {
printf("Failed to open file: %s \n", local_temp.c_str());
return AMDSMI_STATUS_API_FAILED;
}
file2.getline(f_name, 10);
if (!sscanf(f_name, "%d", &readTemp)) {
return AMDSMI_STATUS_API_FAILED;
}
temp->limit = (uint16_t)(readTemp / 1000);
break;
}
file.close();
}
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t
amdsmi_get_temperature_measure(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_t *info) {
AMDSMI_CHECK_INIT();
if (info == nullptr || temp_type > TEMPERATURE_TYPE__MAX) {
return AMDSMI_STATUS_INVAL;
}
amdsmi_gpu_metrics_t metrics;
amd::smi::AMDSmiGPUDevice* gpu_device = nullptr;
amdsmi_status_t r = get_gpu_device_from_handle(device_handle, &gpu_device);
if (r != AMDSMI_STATUS_SUCCESS)
return r;
amdsmi_status_t status;
status = amdsmi_dev_get_gpu_metrics_info(device_handle, &metrics);
if (status != AMDSMI_STATUS_SUCCESS) {
return status;
}
switch (temp_type) {
case TEMPERATURE_TYPE_EDGE:
info->cur_temp = metrics.temperature_edge;
break;
case TEMPERATURE_TYPE_JUNCTION:
info->cur_temp = metrics.temperature_hotspot;
break;
case TEMPERATURE_TYPE_VRAM:
info->cur_temp = metrics.temperature_mem;
break;
case TEMPERATURE_TYPE_PLX:
info->cur_temp = metrics.temperature_vrsoc;
break;
default:
return AMDSMI_STATUS_INVAL;
}
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t
amdsmi_get_ras_block_features_enabled(amdsmi_device_handle device_handle, amdsmi_gpu_block block, amdsmi_ras_err_state_t *state) {
AMDSMI_CHECK_INIT();
@@ -1833,6 +1701,13 @@ amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measur
return status;
}
int power_limit = 0;
status = smi_amdgpu_get_power_cap(gpu_device, &power_limit);
if (status != AMDSMI_STATUS_SUCCESS) {
return status;
}
info->power_limit = power_limit;
info->voltage_gfx = voltage_read;
info->average_socket_power = metrics.average_socket_power;