gpu_fdinfo: add gpu clock support for xe

Author: 17314642

src/gpu_fdinfo.cpp

@@ -244,22 +244,21 @@ int GPU_fdinfo::get_gpu_load()
     return result;
 }
 
-void GPU_fdinfo::find_intel_gt_dir()
+void GPU_fdinfo::find_i915_gt_dir()
 {
     std::string device = "/sys/bus/pci/devices/" + pci_dev + "/drm";
 
-    auto dir_iterator = fs::directory_iterator(device);
-
     // Find first dir which starts with name "card"
     for (const auto& entry : fs::directory_iterator(device)) {
         auto path = entry.path().string();
+
         if (path.substr(device.size() + 1, 4) == "card") {
             device = path;
             break;
         }
     }
 
-    device += "/gt_cur_freq_mhz";
+    device += "/gt_act_freq_mhz";
 
     if (!fs::exists(device)) {
         SPDLOG_WARN(
@@ -272,13 +271,63 @@ void GPU_fdinfo::find_intel_gt_dir()
     gpu_clock_stream.open(device);
 
     if (!gpu_clock_stream.good())
-        SPDLOG_WARN("Intel gt dir: failed to open {}", device);
+        SPDLOG_WARN("Intel i915 gt dir: failed to open {}", device);
+}
+
+void GPU_fdinfo::find_xe_gt_dir()
+{
+    std::string device = "/sys/bus/pci/devices/" + pci_dev + "/tile0";
+
+    if (!fs::exists(device)) {
+        SPDLOG_WARN(
+            "\"{}\" doesn't exist. GPU clock will be unavailable.",
+            device
+        );
+        return;
+    }
+
+    bool has_rcs = true;
+
+    // Check every "gt" dir if it has "engines/rcs" inside
+    for (const auto& entry : fs::directory_iterator(device)) {
+        auto path = entry.path().string();
+
+        if (path.substr(device.size() + 1, 2) != "gt")
+            continue;
+
+        SPDLOG_DEBUG("Checking \"{}\" for rcs.", path);
+
+        if (!fs::exists(path + "/engines/rcs")) {
+            SPDLOG_DEBUG("Skipping \"{}\" because rcs doesn't exist.", path);
+            continue;
+        }
+
+        SPDLOG_DEBUG("Found rcs in \"{}\"", path);
+        has_rcs = true;
+        device = path;
+        break;
+
+    }
+
+    if (!has_rcs) {
+        SPDLOG_WARN(
+            "rcs not found inside \"{}\". GPU clock will not be available.",
+            device
+        );
+        return;
+    }
+
+    device += "/freq0/act_freq";
+
+    gpu_clock_stream.open(device);
+
+    if (!gpu_clock_stream.good())
+        SPDLOG_WARN("Intel xe gt dir: failed to open {}", device);
 }
 
 int GPU_fdinfo::get_gpu_clock()
 {
-    // Only i915 currently supported
-    if (module != "i915" || !gpu_clock_stream.is_open())
+    if (!gpu_clock_stream.is_open())
         return 0;
 
     std::string clock_str;

src/gpu_fdinfo.h

@@ -62,7 +62,8 @@ class GPU_fdinfo {
     float last_power = 0;
 
     std::ifstream gpu_clock_stream;
-    void find_intel_gt_dir();
+    void find_i915_gt_dir();
+    void find_xe_gt_dir();
     int get_gpu_clock();
 
 public:
@@ -109,7 +110,9 @@ class GPU_fdinfo {
             find_intel_hwmon();
 
         if (module == "i915")
-            find_intel_gt_dir();
+            find_i915_gt_dir();
+        else if (module == "xe")
+            find_xe_gt_dir();
 
         std::thread thread(&GPU_fdinfo::main_thread, this);
         thread.detach();