WIP: First work on test quadrant crossbar

pulp-platform · Dec 16, 2021 · 649e0f7 · 649e0f7
1 parent cee8bd2
commit 649e0f7
Show file tree

Hide file tree

Showing 13 changed files with 1,561 additions and 596 deletions.
diff --git a/docs/schema/occamy.schema.json b/docs/schema/occamy.schema.json
@@ -49,12 +49,23 @@
                 }
             }
         },
+
         "wide_xbar": {
             "$ref": "http://pulp-platform.org/snitch/axi_xbar.schema.json"
         },
+        "wide_xbar_slv_id_width_no_rocache": {
+            "type": "integer",
+            "description": "ID width of incoming slave ports.",
+            "default": 3
+        },
         "narrow_xbar": {
             "$ref": "http://pulp-platform.org/snitch/axi_xbar.schema.json"
         },
+        "narrow_xbar_slv_id_width": {
+            "type": "integer",
+            "description": "ID width of incoming slave ports.",
+            "default": 4
+        },
         "nr_s1_quadrant": {
             "title": "Number of S1 Quadrants",
             "type": "integer",
@@ -100,8 +111,18 @@
                 "wide_xbar": {
                     "$ref": "http://pulp-platform.org/snitch/axi_xbar.schema.json"
                 },
+                "wide_xbar_slv_id_width": {
+                    "type": "integer",
+                    "description": "ID width of incoming slave ports.",
+                    "default": 2
+                },
                 "narrow_xbar": {
                     "$ref": "http://pulp-platform.org/snitch/axi_xbar.schema.json"
+                },
+                "narrow_xbar_slv_id_width": {
+                    "type": "integer",
+                    "description": "ID width of incoming slave ports.",
+                    "default": 4
                 }
             }
         }

diff --git a/hw/system/occamy/Makefile b/hw/system/occamy/Makefile
@@ -74,6 +74,11 @@ update-clint:
 	@echo "[REGGEN]  Re-generate CLINT regs"
 	@$(ROOT)/util/regtool.py -r -t src/clint src/clint/clint.hjson
 
+quad_xbar_test:
+	@$(ROOT)/util/occamygen.py --cfg $(CFG) --outdir src \
+		--pkg-sv src/occamy_pkg.sv.tpl \
+		--quad_xbar_test  src/quad_xbar_test.sv.tpl
+
 update-plic:
 	@mkdir -p src/rv_plic
 	@echo "[REGGEN]  Generate PLIC"

diff --git a/hw/system/occamy/src/occamy_cfg.hjson b/hw/system/occamy/src/occamy_cfg.hjson
@@ -42,11 +42,13 @@
       wide_xbar: {
         max_slv_trans: 4,
         max_mst_trans: 4,
+        slv_id_width: 2,
         fall_through: false,
       },
       narrow_xbar: {
         max_slv_trans: 4,
         max_mst_trans: 4,
+        slv_id_width: 4,
         fall_through: false,
       },
     },

diff --git a/hw/system/occamy/src/occamy_cluster_wrapper.sv b/hw/system/occamy/src/occamy_cluster_wrapper.sv
@@ -28,7 +28,7 @@ package occamy_cluster_pkg;
   localparam int unsigned NarrowIdWidthOut = $clog2(NrMasters) + NarrowIdWidthIn;
 
   localparam int unsigned NrDmaMasters = 2 + 1;
-  localparam int unsigned WideIdWidthIn = 2;
+  localparam int unsigned WideIdWidthIn = 0;
   localparam int unsigned WideIdWidthOut = $clog2(NrDmaMasters) + WideIdWidthIn;
 
   localparam int unsigned UserWidth = 1;