smarter gpu figuriung out

src/gpu.cpp

@@ -98,46 +98,62 @@ GpuMetricsHeader_t getGpuMetricsHeader(std::string path) {
     return header;
 }
 
+/* will return empty metric if fails */
 auto getGpuMetrics(GpuMetricsHeader_t h, std::string path) {
     GpuMetrics_v1_3_t metrics;
-    if (h.format_revision == 1 && h.content_revision == 3) {
-        std::ifstream f(path, std::ios::binary);
-        if (f.good()) {
-            f.ignore(sizeof(h));  // skip header
-            f.read(reinterpret_cast<char *>(&metrics), sizeof(metrics));
-            f.close();
-        }
-    } else {
-        std::println("[GpuMetrics] read failed, unsupported format");
+    uint8_t rev = h.format_revision * 10 + h.content_revision;
+
+    switch (rev) {
+        case 13: {
+            std::ifstream f(path, std::ios::binary);
+            if (f.good()) {
+                f.ignore(sizeof(h));  // skip header
+                f.read(reinterpret_cast<char *>(&metrics), sizeof(metrics));
+                f.close();
+            }
+		} break;
     }
 
     return metrics;
 }
 
-// clean abstraction of gpu_metrics + extra metrics from fs
+// clean abstraction of gpu_metrics + extra metrics from fs, works with rx7800xt
 gpu_t getGpu(GpuMetricsHeader_t header, std::string hw) {
     gpu_t gpu;
-    auto metrics = getGpuMetrics(header, hw + "/gpu_metrics");
 
-    // we want as much data as posible from gpu_metrics so we dont read filesystem as much
+    // these are always read from fs
     gpu.fan_speed = std::stol(readFile(hw + "/hwmon/hwmon2/fan1_input"));
-    gpu.core_clock = metrics.average_vclk1_frequency;  // why not gfxclock?
-    gpu.mem_clock = metrics.average_gfxclk_frequency;  // why gfxclock? min mem clock seems to be 96mhz, this is probably including time sleeping
     gpu.vcore = std::stod(readFile(hw + "/hwmon/hwmon2/in0_input")) / 1000.0;
-    gpu.power_avg = metrics.average_socket_power;
     gpu.power_cap = std::stol(readFile(hw + "/hwmon/hwmon2/power1_cap", 6));
     gpu.power_max = std::stol(readFile(hw + "/hwmon/hwmon2/power1_cap_max", 6));
     // gpu.fan_pwm = std::stoi(readFile(hw + "/hwmon/hwmon2/pwm1")); // not super useful
-    gpu.edge_temp = metrics.temperature_edge;
-    gpu.hotspot_temp = metrics.temperature_hotspot;
-    gpu.mem_temp = metrics.temperature_mem;
-    gpu.gfx_vrm_temp = metrics.temperature_vrgfx;
-    gpu.soc_vrm_temp = metrics.temperature_vrsoc;
-    gpu.mem_vrm_temp = metrics.temperature_vrmem;
     gpu.vram_used = std::stoul(readFile(hw + "/mem_info_vram_used"));
     gpu.vram_total = std::stoul(readFile(hw + "/mem_info_vram_total"));
-    gpu.core_usage = metrics.average_gfx_activity;
-    gpu.media_usage = metrics.average_mm_activity;
-    gpu.umc_usage = metrics.average_umc_activity;
+
+    auto metrics = getGpuMetrics(header, hw + "/gpu_metrics");
+
+    // check if metrics valid, if not use fs
+    if (header.structure_size != 0) {
+        gpu.core_clock = metrics.average_vclk1_frequency;  // why not gfxclock?
+        gpu.mem_clock = metrics.average_gfxclk_frequency;  // why gfxclock? min mem clock seems to be 96mhz, this is probably including time sleeping
+        gpu.core_usage = metrics.average_gfx_activity;
+        gpu.media_usage = metrics.average_mm_activity;
+        gpu.umc_usage = metrics.average_umc_activity;
+        gpu.edge_temp = metrics.temperature_edge;
+        gpu.hotspot_temp = metrics.temperature_hotspot;
+        gpu.mem_temp = metrics.temperature_mem;
+        gpu.gfx_vrm_temp = metrics.temperature_vrgfx;
+        gpu.soc_vrm_temp = metrics.temperature_vrsoc;
+        gpu.mem_vrm_temp = metrics.temperature_vrmem;
+        gpu.power_avg = metrics.average_socket_power;
+    } else {
+        gpu.core_clock = std::stol(readFile(hw + "/hwmon/hwmon2/freq1_input", 6));
+        gpu.mem_clock = std::stol(readFile(hw + "/hwmon/hwmon2/freq2_input", 6));
+        gpu.vcore = std::stod(readFile(hw + "/hwmon/hwmon2/in0_input")) / 1000.0;
+        gpu.power_avg = std::stol(readFile(hw + "/hwmon/hwmon2/power1_input", 6));
+        gpu.edge_temp = std::stol(readFile(hw + "/hwmon/hwmon2/temp1_input", 3));
+        gpu.core_usage = std::stoi(readFile(hw + "/gpu_busy_percent"));
+    }
+
     return gpu;
-}
+}