amdgpu: fix reading apu power & temperature

src/amdgpu.cpp

@@ -9,6 +9,7 @@
 #include "overlay.h"
 #include "hud_elements.h"
 #include "logging.h"
+#include "mesa/util/macros.h"
 
 std::string metrics_path = "";
 struct amdgpu_common_metrics amdgpu_common_metrics;
@@ -94,8 +95,9 @@ void amdgpu_get_instant_metrics(struct amdgpu_common_metrics *metrics) {
 		} else if( IS_VALID_METRIC(amdgpu_metrics->average_core_power[0]) ) {
 			// fallback 1: sum of core power
 			metrics->average_cpu_power_w = 0;
-			for (unsigned i = 0; i < cpuStats.GetCPUData().size() / 2; i++)
-				metrics->average_cpu_power_w = metrics->average_cpu_power_w + amdgpu_metrics->average_core_power[i] / 1000.f;
+			unsigned i = 0;
+			do metrics->average_cpu_power_w = metrics->average_cpu_power_w + amdgpu_metrics->average_core_power[i] / 1000.f;
+			while (++i < ARRAY_SIZE(amdgpu_metrics->average_core_power) && IS_VALID_METRIC(amdgpu_metrics->average_core_power[i]));
 		} else if( IS_VALID_METRIC(amdgpu_metrics->average_socket_power) && IS_VALID_METRIC(amdgpu_metrics->average_gfx_power) ) {
 			// fallback 2: estimate cpu power from total socket power
 			metrics->average_cpu_power_w = amdgpu_metrics->average_socket_power / 1000.f - amdgpu_metrics->average_gfx_power / 1000.f;
@@ -149,13 +151,15 @@ void amdgpu_get_instant_metrics(struct amdgpu_common_metrics *metrics) {
 		int cpu_temp = 0;
 		if( IS_VALID_METRIC(amdgpu_metrics->temperature_core[0]) ) {
 			// prefered method
-			for (unsigned i = 0; i < cpuStats.GetCPUData().size() / 2; i++)
-				cpu_temp = MAX(cpu_temp, amdgpu_metrics->temperature_core[i]);
+			unsigned i = 0;
+			do cpu_temp = MAX(cpu_temp, amdgpu_metrics->temperature_core[i]);
+			while (++i < ARRAY_SIZE(amdgpu_metrics->temperature_core) && IS_VALID_METRIC(amdgpu_metrics->temperature_core[i]));
 			metrics->apu_cpu_temp_c = cpu_temp / 100;
 		} else if( header->content_revision >= 3 && IS_VALID_METRIC(amdgpu_metrics->average_temperature_core[0]) ) {
 			// fallback 1
-			for (unsigned i = 0; i < cpuStats.GetCPUData().size() / 2; i++)
-				cpu_temp = MAX(cpu_temp, amdgpu_metrics->average_temperature_core[i]);
+			unsigned i = 0;
+			do cpu_temp = MAX(cpu_temp, amdgpu_metrics->average_temperature_core[i]);
+			while (++i < ARRAY_SIZE(amdgpu_metrics->average_temperature_core) && IS_VALID_METRIC(amdgpu_metrics->average_temperature_core[i]));
 			metrics->apu_cpu_temp_c = cpu_temp / 100;
 		} else if( cpuStats.ReadcpuTempFile(cpu_temp) ) {
 			// fallback 2: Try temp from file 'm_cpuTempFile' of 'cpu.cpp'

tests/test_amdgpu.cpp

@@ -34,9 +34,12 @@ static void test_amdgpu_get_instant_metrics(void **state) {
     amdgpu_get_instant_metrics(&metrics);
     assert_int_equal(metrics.gpu_load_percent, 64);
     assert_float_equal(metrics.average_gfx_power_w, 33, 0);
+    assert_float_equal(metrics.average_cpu_power_w, 0, 0);
     assert_int_equal(metrics.current_gfxclk_mhz, 2165);
     assert_int_equal(metrics.current_uclk_mhz, 1000);
     assert_int_equal(metrics.gpu_temp_c, 36);
+    assert_int_equal(metrics.soc_temp_c, 0);
+    assert_int_equal(metrics.apu_cpu_temp_c, 0);
     assert_false(metrics.is_power_throttled);
     assert_false(metrics.is_current_throttled);
     assert_false(metrics.is_temp_throttled);
@@ -56,11 +59,12 @@ static void test_amdgpu_get_instant_metrics(void **state) {
     amdgpu_get_instant_metrics(&metrics);
     assert_int_equal(metrics.gpu_load_percent, 100);
     assert_float_equal(metrics.average_gfx_power_w, 6.161, 0);
+    assert_float_equal(metrics.average_cpu_power_w, 9.235, 0);
     assert_int_equal(metrics.current_gfxclk_mhz, 1040);
     assert_int_equal(metrics.current_uclk_mhz, 687);
     assert_int_equal(metrics.gpu_temp_c, 81);
     assert_int_equal(metrics.soc_temp_c, 71);
-    assert_int_equal(metrics.apu_cpu_temp_c, 655);
+    assert_int_equal(metrics.apu_cpu_temp_c, 80);
     assert_true(metrics.is_power_throttled);
     assert_false(metrics.is_current_throttled);
     assert_false(metrics.is_temp_throttled);