ADL power fully working! It uses same option as with Nvidia cards

Author: Davesmacer

README.md

@@ -89,13 +89,22 @@ This project uses [CMake] and [Hunter] package manager.
    ```sh
    cmake ..
    ```
+   Note: In Windows, it is possible to have issues with VS 2017 compilers, in that case, use VS 2017 installer to get VS 2015 compilers and use:
+   ```sh
+   cmake .. -G "Visual Studio 15 2017 Win64" -Tv140
+   ```
+
 
 3. Build the project using [CMake Build Tool Mode]. This is a portable variant
    of `make`.
 
    ```sh
    cmake --build .
    ```
+   Note: In Windows, it is possible to have compiler issues if you don't specify build config. In that case use:
+   ```sh
+   cmake --build . --config Release
+   ```
 
 4. _(Optional, Linux only)_ Install the built executable.
 

libethcore/Farm.h

@@ -259,22 +259,24 @@ class Farm: public FarmFace
 			if (hwmon) {
 				HwMonitorInfo hwInfo = i->hwmonInfo();
 				HwMonitor hw;
+				hw.powerW = 0.0;
 				unsigned int tempC = 0, fanpcnt = 0, powerW = 0;
 				if (hwInfo.deviceIndex >= 0) {
 					if (hwInfo.deviceType == HwMonitorInfoType::NVIDIA && nvmlh) {
 						wrap_nvml_get_tempC(nvmlh, hwInfo.deviceIndex, &tempC);
 						wrap_nvml_get_fanpcnt(nvmlh, hwInfo.deviceIndex, &fanpcnt);
 						if(power) {
 							wrap_nvml_get_power_usage(nvmlh, hwInfo.deviceIndex, &powerW);
+							hw.powerW = powerW/((double)1000.0);
 						}
 					}
 					else if (hwInfo.deviceType == HwMonitorInfoType::AMD && adlh) {
 						wrap_adl_get_tempC(adlh, hwInfo.deviceIndex, &tempC);
 						wrap_adl_get_fanpcnt(adlh, hwInfo.deviceIndex, &fanpcnt);
-						//TODO
-						//if(power) {
-						//wrap_adl_get_power_usage(adlh, hwInfo.deviceIndex, &powerW);
-						//}
+						if(power) {
+							wrap_adl_get_power_usage(adlh, hwInfo.deviceIndex, &powerW);
+							hw.powerW = adlf2double(powerW);
+						}
 					}
 #if defined(__linux)
 					// Overwrite with sysfs data if present
@@ -290,7 +292,6 @@ class Farm: public FarmFace
 				}
 				hw.tempC = tempC;
 				hw.fanP = fanpcnt;
-				hw.powrW = powerW/((double)1000.0);
 				p.minerMonitors.push_back(hw);
 			}
         }

libethcore/Miner.h

@@ -80,15 +80,15 @@ struct HwMonitor
 {
 	int tempC = 0;
 	int fanP = 0;
-	double powrW = 0;
+	double powerW = 0;
 };
 
 inline std::ostream& operator<<(std::ostream& os, HwMonitor _hw)
 {
 	string power = "";
-	if(_hw.powrW != 0){
+	if(_hw.powerW != 0){
 		ostringstream stream;
-		stream << fixed << setprecision(2) << _hw.powrW << "W";
+		stream << fixed << setprecision(2) << _hw.powerW << "W";
 		power = stream.str();
 	}
 	return os << _hw.tempC << "C " << _hw.fanP << "% " << power;

libhwmon/wrapadl.cpp

@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "wraphelper.h"
 #include "wrapadl.h"
 
 #if defined(__cplusplus)
@@ -72,6 +71,15 @@ return NULL;
 		wrap_dlsym(adlh->adl_dll, "ADL_Main_Control_Refresh");
 	adlh->adlMainControlDestroy = (wrap_adlReturn_t(*)(void))
 		wrap_dlsym(adlh->adl_dll, "ADL_Main_Control_Destroy");
+	adlh->adl2MainControlCreate = (wrap_adlReturn_t(*)(ADL_MAIN_MALLOC_CALLBACK, int, ADL_CONTEXT_HANDLE*))
+		wrap_dlsym(adlh->adl_dll, "ADL2_Main_Control_Create");
+	adlh->adl2MainControlDestroy = (wrap_adlReturn_t(*)(ADL_CONTEXT_HANDLE))
+		wrap_dlsym(adlh->adl_dll, "ADL_Main_Control_Destroy");
+	adlh->adl2Overdrive6CurrentPowerGet = (wrap_adlReturn_t(*)(ADL_CONTEXT_HANDLE, int, int, int*))
+		wrap_dlsym(adlh->adl_dll, "ADL2_Overdrive6_CurrentPower_Get");
+	adlh->adl2MainControlRefresh = (wrap_adlReturn_t(*)(ADL_CONTEXT_HANDLE))
+		wrap_dlsym(adlh->adl_dll, "ADL2_Main_Control_Refresh");
+
 
 	if (adlh->adlMainControlCreate == NULL ||
 		adlh->adlMainControlDestroy == NULL ||
@@ -80,7 +88,11 @@ return NULL;
 		adlh->adlAdapterAdapterInfoGet == NULL ||
 		adlh->adlAdapterAdapterIdGet == NULL ||
 		adlh->adlOverdrive5TemperatureGet == NULL ||
-		adlh->adlOverdrive5FanSpeedGet == NULL
+		adlh->adlOverdrive5FanSpeedGet == NULL ||
+		adlh->adl2MainControlCreate == NULL ||
+		adlh->adl2MainControlRefresh == NULL ||
+		adlh->adl2MainControlDestroy == NULL ||
+		adlh->adl2Overdrive6CurrentPowerGet == NULL
 		) {
 #if 0
 		printf("Failed to obtain all required ADL function pointers\n");
@@ -93,6 +105,11 @@ return NULL;
 	adlh->adlMainControlCreate(ADL_Main_Memory_Alloc, 1);
 	adlh->adlMainControlRefresh();
 
+	adlh->context = NULL;
+
+	adlh->adl2MainControlCreate(ADL_Main_Memory_Alloc, 1, &(adlh->context));
+	adlh->adl2MainControlRefresh(adlh->context);
+
 	int logicalGpuCount = 0;
 	adlh->adlAdapterNumberOfAdapters(&logicalGpuCount);
 
@@ -134,6 +151,7 @@ return NULL;
 int wrap_adl_destroy(wrap_adl_handle *adlh)
 {
 	adlh->adlMainControlDestroy();
+	adlh->adl2MainControlDestroy(adlh->context);
 	wrap_dlclose(adlh->adl_dll);
 	free(adlh);
 	return 0;
@@ -188,6 +206,16 @@ int wrap_adl_get_fanpcnt(wrap_adl_handle *adlh, int gpuindex, unsigned int *fanp
 	return 0;
 }
 
+int wrap_adl_get_power_usage(wrap_adl_handle *adlh, int gpuindex, unsigned int *power)
+{
+	wrap_adlReturn_t rc;
+	if (gpuindex < 0 || gpuindex >= adlh->adl_gpucount){
+		return -1;
+	}
+	rc = adlh->adl2Overdrive6CurrentPowerGet(adlh->context, adlh->phys_logi_device_id[gpuindex], 0, (int*)power);
+	return rc;
+}
+
 #if defined(__cplusplus)
 }
 #endif

libhwmon/wrapadl.h

@@ -2,14 +2,18 @@
 * Wrapper for ADL, inspired by wrapnvml from John E. Stone
 * 
 * By Philipp Andreas - github@smurfy.de
+* ADL power by Davesmacer
 */
 
+#include "wraphelper.h"
+
 #pragma once
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
+
 typedef enum wrap_adlReturn_enum {
 	WRAPADL_OK= 0
 } wrap_adlReturn_t;
@@ -24,6 +28,13 @@ typedef enum wrap_adlReturn_enum {
 #endif
 
 typedef void* (ADL_API_CALL *ADL_MAIN_MALLOC_CALLBACK)(int);
+/// \brief Handle to ADL client context.
+///
+///  ADL clients obtain context handle from initial call to \ref ADL2_Main_Control_Create.
+///  Clients have to pass the handle to each subsequent ADL call and finally destroy
+///  the context with call to \ref ADL2_Main_Control_Destroy
+/// \nosubgrouping
+typedef void* ADL_CONTEXT_HANDLE;
 
 #define ADL_MAX_PATH                                    256
 typedef struct AdapterInfo
@@ -111,6 +122,7 @@ typedef struct {
 	int adl_gpucount;
 	int *phys_logi_device_id;
 	LPAdapterInfo devs;
+	ADL_CONTEXT_HANDLE context;
 	wrap_adlReturn_t(*adlMainControlCreate)(ADL_MAIN_MALLOC_CALLBACK, int);
 	wrap_adlReturn_t(*adlAdapterNumberOfAdapters)(int *);
 	wrap_adlReturn_t(*adlAdapterAdapterInfoGet)(LPAdapterInfo, int);
@@ -119,6 +131,10 @@ typedef struct {
 	wrap_adlReturn_t(*adlOverdrive5FanSpeedGet)(int, int, ADLFanSpeedValue*);
 	wrap_adlReturn_t(*adlMainControlRefresh)(void);
 	wrap_adlReturn_t(*adlMainControlDestroy)(void);
+	wrap_adlReturn_t(*adl2MainControlCreate)(ADL_MAIN_MALLOC_CALLBACK, int, ADL_CONTEXT_HANDLE* );
+	wrap_adlReturn_t(*adl2MainControlDestroy)(ADL_CONTEXT_HANDLE);
+	wrap_adlReturn_t(*adl2Overdrive6CurrentPowerGet)(ADL_CONTEXT_HANDLE, int, int, int*);
+	wrap_adlReturn_t(*adl2MainControlRefresh)(ADL_CONTEXT_HANDLE);
 } wrap_adl_handle;
 
 wrap_adl_handle * wrap_adl_create();
@@ -132,6 +148,9 @@ int wrap_adl_get_tempC(wrap_adl_handle *adlh, int gpuindex, unsigned int *tempC)
 
 int wrap_adl_get_fanpcnt(wrap_adl_handle *adlh, int gpuindex, unsigned int *fanpcnt);
 
+int wrap_adl_get_power_usage(wrap_adl_handle *adlh, int gpuindex, unsigned int *milliwatts);
+
+
 #if defined(__cplusplus)
 }
 #endif

libhwmon/wraphelper.h

@@ -29,3 +29,26 @@ static int wrap_dlclose(void *h) {
 	return dlclose(h);
 }
 #endif
+//Converts from 8 fractional bit int to double (ADL method result format)
+static double adlf2double(int adlf){
+	double res = 0.0;
+	int fraction = 	adlf & 0x00FF; //last 8 bits seem to be decimal part
+	int number = 	(adlf & 0xFF00) >> 8; //first 8 bits are the integer part
+	double dfraction = 0; //decimal part
+	int i = 1;
+	while(fraction > 0){
+		double digit = number % 10;
+		if(fraction >= 100){//256 max value, if 3 digits, divide by 1000
+			dfraction += (digit / (double)1000.0);
+		}
+		else if(fraction >=10){//if 2 digits...
+			dfraction += (digit / (double)100.0);
+		}
+		else {//1 digit
+			dfraction += (digit / (double)10.0);
+		}
+		fraction /= 10; //take it out
+	}
+	res = number + dfraction;
+	return res;
+}