Simplify Obs Pin

KULeuven-MICAS · Dec 1, 2024 · 4d6042a · 4d6042a
1 parent 2197a75
commit 4d6042a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hw/occamy/occamy_chip.sv.tpl b/hw/occamy/occamy_chip.sv.tpl
@@ -14,7 +14,7 @@ import ${name}_pkg::*;
   input  logic        clk_i,
   input  logic        rst_ni,
   // Obs pins
-  output obs_t        obs_o,
+  output logic [${obs_pin_width-1}:0]  obs_o [${nr_clusters_s1_quadrant}],
   /// Peripheral clock
   input  logic        clk_periph_i,
   input  logic        rst_periph_ni,

diff --git a/util/occamygen/occamy.py b/util/occamygen/occamy.py
@@ -658,10 +658,14 @@ def get_chip_kwargs(soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, occamy_cfg,
                              for cluster_generator in cluster_generators]
     nr_cores_quadrant = sum(core_per_cluster_list)
     nr_s1_quadrants = occamy_cfg["nr_s1_quadrant"]
+    cluster_cfg = cluster_generators[0].cfg
     chip_kwargs = {
         "name": name,
         "util": util,
         "occamy_cfg": occamy_cfg,
+        "nr_clusters_s1_quadrant": len(occamy_cfg["clusters"]),
+        "obs_pin_width": cluster_cfg["observable_pin_width"],
+
         "soc_wide_xbar": soc_wide_xbar,
         "soc_axi_lite_narrow_periph_xbar": soc_axi_lite_narrow_periph_xbar,
         "cores": nr_s1_quadrants * nr_cores_quadrant + 1