Adding current voltage feature & gtest.
Signed-off-by: Divya Shikre <DivyaUday.Shikre@amd.com> Change-Id: Ic555a3af265e603419e2875d1989a366abc82596
Tá an tiomantas seo le fáil i:
Divya Shikre tiomanta
1 tuismitheoir
8e6f7c798d
tiomantas
2805ed16a4
11 comhad athraithe
+486
-7
Níor tháinig aon chomhaid le do chuardach
@@ -1987,6 +1987,7 @@ rsmi_dev_temp_metric_get(uint32_t dv_ind, uint32_t sensor_type,
|
||||
uint32_t sensor_index =
|
||||
m->getTempSensorIndex(static_cast<rsmi_temperature_type_t>(sensor_type));
|
||||
|
||||
|
||||
CHK_API_SUPPORT_ONLY(temperature, metric, sensor_index)
|
||||
|
||||
ret = get_dev_mon_value(mon_type, dv_ind, sensor_index, temperature);
|
||||
@@ -1995,6 +1996,62 @@ rsmi_dev_temp_metric_get(uint32_t dv_ind, uint32_t sensor_type,
|
||||
CATCH
|
||||
}
|
||||
|
||||
rsmi_status_t
|
||||
rsmi_dev_volt_metric_get(uint32_t dv_ind, rsmi_voltage_type_t sensor_type,
|
||||
rsmi_voltage_metric_t metric, int64_t *voltage) {
|
||||
TRY
|
||||
|
||||
rsmi_status_t ret;
|
||||
amd::smi::MonitorTypes mon_type;
|
||||
|
||||
switch (metric) {
|
||||
case RSMI_VOLT_CURRENT:
|
||||
mon_type = amd::smi::kMonVolt;
|
||||
break;
|
||||
case RSMI_VOLT_MIN:
|
||||
mon_type = amd::smi::kMonVoltMin;
|
||||
break;
|
||||
case RSMI_VOLT_MIN_CRIT:
|
||||
mon_type = amd::smi::kMonVoltMinCrit;
|
||||
break;
|
||||
case RSMI_VOLT_MAX:
|
||||
mon_type = amd::smi::kMonVoltMax;
|
||||
break;
|
||||
case RSMI_VOLT_MAX_CRIT:
|
||||
mon_type = amd::smi::kMonVoltMaxCrit;
|
||||
break;
|
||||
case RSMI_VOLT_AVERAGE:
|
||||
mon_type = amd::smi::kMonVoltAverage;
|
||||
break;
|
||||
case RSMI_VOLT_LOWEST:
|
||||
mon_type = amd::smi::kMonVoltLowest;
|
||||
break;
|
||||
case RSMI_VOLT_HIGHEST:
|
||||
mon_type = amd::smi::kMonVoltHighest;
|
||||
break;
|
||||
default:
|
||||
mon_type = amd::smi::kMonInvalid;
|
||||
}
|
||||
|
||||
DEVICE_MUTEX
|
||||
|
||||
GET_DEV_FROM_INDX
|
||||
|
||||
assert(dev->monitor() != nullptr);
|
||||
std::shared_ptr<amd::smi::Monitor> m = dev->monitor();
|
||||
|
||||
// getVoltSensorIndex will throw an out of range exception if sensor_type is
|
||||
// not found
|
||||
uint32_t sensor_index =
|
||||
m->getVoltSensorIndex(sensor_type);
|
||||
CHK_API_SUPPORT_ONLY(voltage, metric, sensor_index)
|
||||
|
||||
ret = get_dev_mon_value(mon_type, dv_ind, sensor_index, voltage);
|
||||
|
||||
return ret;
|
||||
CATCH
|
||||
}
|
||||
|
||||
rsmi_status_t
|
||||
rsmi_dev_fan_speed_get(uint32_t dv_ind, uint32_t sensor_ind, int64_t *speed) {
|
||||
TRY
|
||||
|
||||
@@ -508,7 +508,8 @@ uint32_t RocmSMI::DiscoverAMDMonitors(void) {
|
||||
if (amd_monitor_types_.find(mon_type) != amd_monitor_types_.end()) {
|
||||
std::shared_ptr<Monitor> m =
|
||||
std::shared_ptr<Monitor>(new Monitor(mon_name, &env_vars_));
|
||||
m->setSensorLabelMap();
|
||||
m->setTempSensorLabelMap();
|
||||
m->setVoltSensorLabelMap();
|
||||
monitors_.push_back(m);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,11 +91,23 @@ static const char *kMonTempOffsetName = "temp#_offset";
|
||||
static const char *kMonTempLowestName = "temp#_lowest";
|
||||
static const char *kMonTempHighestName = "temp#_highest";
|
||||
static const char *kMonTempLabelName = "temp#_label";
|
||||
static const char *kMonVoltFName = "in#_input";
|
||||
static const char *kMonVoltMinName = "in#_min";
|
||||
static const char *kMonVoltMinCritName = "in#_lcrit";
|
||||
static const char *kMonVoltMaxName = "in#_max";
|
||||
static const char *kMonVoltMaxCritName = "in#_crit";
|
||||
static const char *kMonVoltAverageName = "in#_average";
|
||||
static const char *kMonVoltLowestName = "in#_lowest";
|
||||
static const char *kMonVoltHighestName = "in#_highest";
|
||||
static const char *kMonVoltLabelName = "in#_label";
|
||||
|
||||
static const char *kTempSensorTypeMemoryName = "mem";
|
||||
static const char *kTempSensorTypeJunctionName = "junction";
|
||||
static const char *kTempSensorTypeEdgeName = "edge";
|
||||
|
||||
static const char *kTempSensorTypeVddgfxName = "vddgfx";
|
||||
|
||||
|
||||
static const std::map<std::string, rsmi_temperature_type_t>
|
||||
kTempSensorNameMap = {
|
||||
{kTempSensorTypeMemoryName, RSMI_TEMP_TYPE_MEMORY},
|
||||
@@ -103,6 +115,11 @@ static const std::map<std::string, rsmi_temperature_type_t>
|
||||
{kTempSensorTypeEdgeName, RSMI_TEMP_TYPE_EDGE},
|
||||
};
|
||||
|
||||
static const std::map<std::string, rsmi_voltage_type_t>
|
||||
kVoltSensorNameMap = {
|
||||
{kTempSensorTypeVddgfxName, RSMI_VOLT_TYPE_VDDGFX},
|
||||
};
|
||||
|
||||
static const std::map<MonitorTypes, const char *> kMonitorNameMap = {
|
||||
{kMonName, kMonNameFName},
|
||||
{kMonTemp, kMonTempFName},
|
||||
@@ -128,6 +145,15 @@ static const std::map<MonitorTypes, const char *> kMonitorNameMap = {
|
||||
{kMonTempLowest, kMonTempLowestName},
|
||||
{kMonTempHighest, kMonTempHighestName},
|
||||
{kMonTempLabel, kMonTempLabelName},
|
||||
{kMonVolt, kMonVoltFName},
|
||||
{kMonVoltMin, kMonVoltMinName},
|
||||
{kMonVoltMinCrit, kMonVoltMinCritName},
|
||||
{kMonVoltMax, kMonVoltMaxName},
|
||||
{kMonVoltMaxCrit, kMonVoltMaxCritName},
|
||||
{kMonVoltAverage, kMonVoltAverageName},
|
||||
{kMonVoltLowest, kMonVoltLowestName},
|
||||
{kMonVoltHighest, kMonVoltHighestName},
|
||||
{kMonVoltLabel, kMonVoltLabelName},
|
||||
};
|
||||
|
||||
static std::map<MonitorTypes, uint64_t> kMonInfoVarTypeToRSMIVariant = {
|
||||
@@ -147,6 +173,15 @@ static std::map<MonitorTypes, uint64_t> kMonInfoVarTypeToRSMIVariant = {
|
||||
{kMonTempLowest, RSMI_TEMP_LOWEST},
|
||||
{kMonTempHighest, RSMI_TEMP_HIGHEST},
|
||||
{kMonInvalid, RSMI_DEFAULT_VARIANT},
|
||||
// rsmi_voltage_metric_t
|
||||
{kMonVolt, RSMI_VOLT_CURRENT},
|
||||
{kMonVoltMin, RSMI_VOLT_MIN},
|
||||
{kMonVoltMinCrit, RSMI_VOLT_MIN_CRIT},
|
||||
{kMonVoltMax, RSMI_VOLT_MAX},
|
||||
{kMonVoltMaxCrit, RSMI_VOLT_MAX_CRIT},
|
||||
{kMonVoltAverage, RSMI_VOLT_AVERAGE},
|
||||
{kMonVoltLowest, RSMI_VOLT_LOWEST},
|
||||
{kMonVoltHighest, RSMI_VOLT_HIGHEST},
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -221,6 +256,19 @@ static const std::map<const char *, monitor_depends_t> kMonFuncDependsMap = {
|
||||
.variants = {kMonInvalid},
|
||||
}
|
||||
},
|
||||
{"rsmi_dev_volt_metric_get", { .mandatory_depends =
|
||||
{kMonVoltLabelName},
|
||||
.variants = {kMonVolt,
|
||||
kMonVoltMin,
|
||||
kMonVoltMinCrit,
|
||||
kMonVoltMax,
|
||||
kMonVoltMaxCrit,
|
||||
kMonVoltAverage,
|
||||
kMonVoltLowest,
|
||||
kMonVoltHighest,
|
||||
},
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
Monitor::Monitor(std::string path, RocmSMI_env_vars const *e) :
|
||||
@@ -266,7 +314,7 @@ int Monitor::readMonitor(MonitorTypes type, uint32_t sensor_id,
|
||||
}
|
||||
|
||||
uint32_t
|
||||
Monitor::setSensorLabelMap(void) {
|
||||
Monitor::setTempSensorLabelMap(void) {
|
||||
std::string type_str;
|
||||
int ret;
|
||||
|
||||
@@ -291,7 +339,7 @@ Monitor::setSensorLabelMap(void) {
|
||||
return 0;
|
||||
};
|
||||
|
||||
for (uint32_t i = 1; i <= 3; ++i) {
|
||||
for (uint32_t i = 1; i <= RSMI_TEMP_TYPE_LAST + 1; ++i) {
|
||||
ret = add_temp_sensor_entry(i);
|
||||
if (ret) {
|
||||
return ret;
|
||||
@@ -300,6 +348,40 @@ Monitor::setSensorLabelMap(void) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
Monitor::setVoltSensorLabelMap(void) {
|
||||
std::string type_str;
|
||||
int ret;
|
||||
|
||||
if (volt_type_index_map_.size() > 0) {
|
||||
return 0; // We've already filled in the map
|
||||
}
|
||||
auto add_volt_sensor_entry = [&](uint32_t file_index) {
|
||||
ret = readMonitor(kMonVoltLabel, file_index, &type_str);
|
||||
rsmi_voltage_type_t t_type = kVoltSensorNameMap.at(type_str);
|
||||
// If readMonitor fails, there is no label file for the file_index.
|
||||
// In that case, map the type to file index 0, which is not supported
|
||||
// and will fail appropriately later when we check for support.
|
||||
if (ret) {
|
||||
volt_type_index_map_.insert({t_type, 0});
|
||||
index_volt_type_map_.insert({file_index, RSMI_VOLT_TYPE_INVALID});
|
||||
} else {
|
||||
volt_type_index_map_.insert({t_type, file_index});
|
||||
index_volt_type_map_.insert({file_index, t_type});
|
||||
}
|
||||
index_volt_type_map_.insert({file_index, t_type});
|
||||
return 0;
|
||||
};
|
||||
|
||||
for (uint32_t i = 0; i < RSMI_VOLT_TYPE_LAST + 1; ++i) {
|
||||
ret = add_volt_sensor_entry(i);
|
||||
if (ret) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_supported_sensors(std::string dir_path, std::string fn_reg_ex,
|
||||
std::vector<uint64_t> *sensors) {
|
||||
auto hwmon_dir = opendir(dir_path.c_str());
|
||||
@@ -365,6 +447,16 @@ Monitor::getTempSensorEnum(uint64_t ind) {
|
||||
return index_temp_type_map_.at(ind);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
Monitor::getVoltSensorIndex(rsmi_voltage_type_t type) {
|
||||
return volt_type_index_map_.at(type);
|
||||
}
|
||||
|
||||
rsmi_voltage_type_t
|
||||
Monitor::getVoltSensorEnum(uint64_t ind) {
|
||||
return index_volt_type_map_.at(ind);
|
||||
}
|
||||
|
||||
static std::vector<uint64_t> get_intersection(std::vector<uint64_t> *v1,
|
||||
std::vector<uint64_t> *v2) {
|
||||
assert(v1 != nullptr);
|
||||
@@ -387,6 +479,7 @@ static std::vector<uint64_t> get_intersection(std::vector<uint64_t> *v1,
|
||||
typedef enum {
|
||||
eDefaultMonitor = 0,
|
||||
eTempMonitor,
|
||||
eVoltMonitor,
|
||||
} monitor_types;
|
||||
|
||||
static monitor_types getFuncType(std::string f_name) {
|
||||
@@ -395,6 +488,9 @@ static monitor_types getFuncType(std::string f_name) {
|
||||
if (f_name.compare("rsmi_dev_temp_metric_get") == 0) {
|
||||
ret = eTempMonitor;
|
||||
}
|
||||
if (f_name.compare("rsmi_dev_volt_metric_get") == 0) {
|
||||
ret = eVoltMonitor;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -495,15 +591,21 @@ void Monitor::fillSupportedFuncs(SupportedFuncMap *supported_funcs) {
|
||||
}
|
||||
if (supported_monitors.size() > 0) {
|
||||
for (uint32_t i = 0; i < supported_monitors.size(); ++i) {
|
||||
assert(supported_monitors[i] > 0);
|
||||
|
||||
if (m_type == eDefaultMonitor) {
|
||||
assert(supported_monitors[i] > 0);
|
||||
supported_monitors[i] |=
|
||||
(supported_monitors[i] - 1) << MONITOR_TYPE_BIT_POSITION;
|
||||
} else if (m_type == eTempMonitor) {
|
||||
// Temp sensor file names are 1-based
|
||||
assert(supported_monitors[i] > 0);
|
||||
supported_monitors[i] |=
|
||||
static_cast<uint64_t>(getTempSensorEnum(supported_monitors[i]))
|
||||
<< MONITOR_TYPE_BIT_POSITION;
|
||||
} else if (m_type == eVoltMonitor) {
|
||||
// Voltage sensor file names are 0-based
|
||||
supported_monitors[i] |=
|
||||
static_cast<uint64_t>(getVoltSensorEnum(supported_monitors[i]))
|
||||
<< MONITOR_TYPE_BIT_POSITION;
|
||||
} else {
|
||||
assert(!"Unexpected monitor type");
|
||||
}
|
||||
|
||||
Tagairt in Eagrán Nua
Cuir bac ar úsáideoir