Add power support for amdsysfs

Author: smurfy

libethcore/Farm.h

@@ -281,10 +281,9 @@ class Farm: public FarmFace
 					if (hwInfo.deviceType == HwMonitorInfoType::AMD && sysfsh) {
 						wrap_amdsysfs_get_tempC(sysfsh, hwInfo.deviceIndex, &tempC);
 						wrap_amdsysfs_get_fanpcnt(sysfsh, hwInfo.deviceIndex, &fanpcnt);
-						//TODO
-						//if(power) {
-						//wrap_amdsysfs_get_power_usage(sysfsh, hwInfo.deviceIndex, &powerW);
-						//}
+						if(power) {
+							wrap_amdsysfs_get_power_usage(sysfsh, hwInfo.deviceIndex, &powerW);
+						}
 					}
 #endif
 				}

libhwmon/wrapamdsysfs.cpp

@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <fstream>
 #include <sys/types.h>
+#include <regex>
 #if defined(__linux)
 #include <dirent.h>
 #endif
@@ -207,4 +208,33 @@ int wrap_amdsysfs_get_fanpcnt(wrap_amdsysfs_handle *sysfsh, int index, unsigned
 
 	*fanpcnt = double(pwm - pwmMin) / double(pwmMax - pwmMin) * 100.0;
 	return 0;
+}
+
+int wrap_amdsysfs_get_power_usage(wrap_amdsysfs_handle *sysfsh, int index, unsigned int *milliwatts)
+{
+	int gpuindex = sysfsh->card_sysfs_device_id[index];
+	if (gpuindex < 0 || index >= sysfsh->sysfs_gpucount)
+		return -1;
+
+	char dbuf[120];
+	snprintf(dbuf, 120, "/sys/kernel/debug/dri/%u/amdgpu_pm_info", gpuindex);
+
+	std::ifstream ifs(dbuf, std::ios::binary);
+	std::string line;
+
+	while (std::getline(ifs, line))
+	{
+		std::smatch sm;
+		std::regex regex(R"(([\d|\.]+) W \(average GPU\))");
+		if (std::regex_search(line, sm, regex)) {
+			if (sm.size() == 2) {
+				double watt = atof(sm.str(1).c_str());
+				*milliwatts = (unsigned int)(watt * 1000);
+				return 0;
+			}
+		}
+
+	}
+
+	return -1;
 }

libhwmon/wrapamdsysfs.h

@@ -21,3 +21,4 @@ int wrap_amdsysfs_get_tempC(wrap_amdsysfs_handle *sysfsh, int index, unsigned in
 
 int wrap_amdsysfs_get_fanpcnt(wrap_amdsysfs_handle *sysfsh, int index, unsigned int *fanpcnt);
 
+int wrap_amdsysfs_get_power_usage(wrap_amdsysfs_handle *sysfsh, int index, unsigned int *milliwatts);