[ESI][Runtime] Add JSON output for esiquery telemetry

Author: teqdruid

lib/Dialect/ESI/runtime/CMakeLists.txt

@@ -244,6 +244,7 @@ add_executable(esiquery
 target_link_libraries(esiquery PRIVATE
   ESICppRuntime
   CLI11::CLI11
+  nlohmann_json::nlohmann_json
 )
 add_dependencies(ESIRuntime esiquery)
 install(TARGETS esiquery

lib/Dialect/ESI/runtime/cpp/tools/esiquery.cpp

@@ -22,12 +22,15 @@
 #include <iostream>
 #include <map>
 #include <stdexcept>
+#include <string>
+#include <nlohmann/json.hpp>
 
 using namespace esi;
 
 void printInfo(std::ostream &os, AcceleratorConnection &acc, bool details);
 void printHier(std::ostream &os, AcceleratorConnection &acc, bool details);
 void printTelemetry(std::ostream &os, AcceleratorConnection &acc);
+void printTelemetryJson(std::ostream &os, AcceleratorConnection &acc);
 
 int main(int argc, const char *argv[]) {
   CliParser cli("esiquery");
@@ -44,8 +47,11 @@ int main(int argc, const char *argv[]) {
   CLI::App *hierSub = cli.add_subcommand("hier", "Print ESI system hierarchy");
   hierSub->add_flag("--details", hierDetails,
                     "Print detailed information about the system");
-  CLI::App *telemetrySub =
+    bool telemetryJson = false;
+    CLI::App *telemetrySub =
       cli.add_subcommand("telemetry", "Print ESI system telemetry information");
+    telemetrySub->add_flag("--json", telemetryJson,
+               "Dump telemetry information as JSON");
 
   if (int rc = cli.esiParse(argc, argv))
     return rc;
@@ -63,8 +69,12 @@ int main(int argc, const char *argv[]) {
       printInfo(std::cout, *acc, infoDetails);
     else if (*hierSub)
       printHier(std::cout, *acc, hierDetails);
-    else if (*telemetrySub)
-      printTelemetry(std::cout, *acc);
+    else if (*telemetrySub) {
+      if (telemetryJson)
+        printTelemetryJson(std::cout, *acc);
+      else
+        printTelemetry(std::cout, *acc);
+    }
     return 0;
   } catch (std::exception &e) {
     ctxt.getLogger().error("esiquery", e.what());
@@ -159,6 +169,74 @@ void printHier(std::ostream &os, AcceleratorConnection &acc, bool details) {
   printInstance(os, design, /*indent=*/"", details);
 }
 
+static void insertTelemetryValue(nlohmann::json &root, const AppIDPath &path,
+                                 uint64_t value) {
+  if (path.empty()) {
+    root["__value"] = value;
+    return;
+  }
+
+  nlohmann::json *current = &root;
+  for (size_t i = 0; i < path.size(); ++i) {
+    const std::string key = path[i].toString();
+    nlohmann::json &next = (*current)[key];
+    if (i == path.size() - 1) {
+      if (next.is_object())
+        next["__value"] = value;
+      else
+        next = value;
+    } else {
+      if (!next.is_object()) {
+        nlohmann::json previous = next;
+        next = nlohmann::json::object();
+        if (!previous.is_null())
+          next["__value"] = previous;
+      }
+      current = &next;
+    }
+  }
+}
+
+static void collapseTelemetryJson(nlohmann::json &node) {
+  if (!node.is_object())
+    return;
+
+  for (auto it = node.begin(); it != node.end(); ++it)
+    collapseTelemetryJson(it.value());
+
+  if (node.size() == 1 && node.contains("__value")) {
+    nlohmann::json value = node["__value"];
+    node = value;
+  }
+}
+
+void printTelemetryJson(std::ostream &os, AcceleratorConnection &acc) {
+  Manifest manifest(acc.getCtxt(),
+                    acc.getService<services::SysInfo>()->getJsonManifest());
+  auto accel = manifest.buildAccelerator(acc);
+  acc.getServiceThread()->addPoll(*accel);
+
+  auto *telemetry = acc.getService<services::TelemetryService>();
+  if (!telemetry) {
+    os << nlohmann::json{{"error", "No telemetry service found"}}.dump(2)
+       << std::endl;
+    return;
+  }
+
+  const std::map<AppIDPath, services::TelemetryService::Metric *>
+      &telemetryPorts = telemetry->getTelemetryPorts();
+
+  nlohmann::json root = nlohmann::json::object();
+  for (const auto &[id, port] : telemetryPorts) {
+    port->connect();
+    uint64_t value = *port->read().get().as<uint64_t>();
+    insertTelemetryValue(root, id, value);
+  }
+
+  collapseTelemetryJson(root);
+  os << root.dump(2) << std::endl;
+}
+
 void printTelemetry(std::ostream &os, AcceleratorConnection &acc) {
   Manifest manifest(acc.getCtxt(),
                     acc.getService<services::SysInfo>()->getJsonManifest());