treewide: Add multicast support

pulp-platform · Jan 15, 2024 · f875a71 · f875a71
1 parent c651556
commit f875a71
Show file tree

Hide file tree

Showing 19 changed files with 947 additions and 171 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -65,3 +65,19 @@ occamy-full-vsim:
     - make LENGTH=384 sw
     - make bin/occamy_top.vsim
     - ./run.py sw/run-full-occamy.yaml --simulator vsim
+
+##########################
+# Multicast Occamy tests #
+##########################
+
+# Questa
+occamy-mcast-vsim:
+  variables:
+    RISCV_CFLAGS: "-DUSE_MULTICAST"
+    DATA_CFG: "$(PWD)/sw/device/apps/blas/gemm/params.hjson"
+  script:
+    - cd target/sim
+    - make CFG_OVERRIDE=cfg/M-Q8C4.hjson rtl
+    - make LENGTH=1024 sw
+    - make bin/occamy_top.vsim
+    - ./run.py sw/run-full-occamy.yaml -j
diff --git a/Bender.local b/Bender.local
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 overrides:
-  axi:                { git: https://github.com/pulp-platform/axi.git,                version: 0.39.0-beta.4 }
-  common_cells:       { git: https://github.com/pulp-platform/common_cells.git,       version: 1.31.1 }
+  axi:                { git: https://github.com/pulp-platform/axi.git,                rev: feature/multicast-xbar }
+  common_cells:       { git:  https://github.com/pulp-platform/common_cells.git,      rev: multicast-xbar }
   register_interface: { git: https://github.com/pulp-platform/register_interface.git, version: 0.4.2 }
diff --git a/Bender.yml b/Bender.yml
@@ -29,7 +29,7 @@ dependencies:
   cva6:                   { path: hw/vendor/openhwgroup_cva6                                                }
   opentitan_peripherals:  { path: hw/vendor/pulp_platform_opentitan_peripherals                             }
   register_interface:     { git:  https://github.com/pulp-platform/register_interface.git, version: 0.3.8   }
-  snitch_cluster:         { git:  https://github.com/pulp-platform/snitch_cluster.git,     rev:     extend/snRuntime }
+  snitch_cluster:         { git:  https://github.com/pulp-platform/snitch_cluster.git,     rev:     experimental/mcast }
   tech_cells_generic:     { git:  https://github.com/pulp-platform/tech_cells_generic.git, rev:     v0.2.11 }
 
 workspace:

diff --git a/hw/occamy/occamy_cva6.sv.tpl b/hw/occamy/occamy_cva6.sv.tpl
@@ -72,7 +72,7 @@ module ${name}_cva6 import ${name}_pkg::*; (
     .AxiAddrWidth (${soc_narrow_xbar.in_cva6.aw}),
     .AxiDataWidth (${soc_narrow_xbar.in_cva6.dw}),
     .AxiIdWidth (${soc_narrow_xbar.in_cva6.iw}),
-    .AxiUserWidth (${max(1, soc_narrow_xbar.in_cva6.uw)}),
+    .AxiUserWidth (${cfg["narrow_xbar_user_width"]}),
     .axi_ar_chan_t(${soc_narrow_xbar.in_cva6.ar_chan_type()}),
     .axi_aw_chan_t(${soc_narrow_xbar.in_cva6.aw_chan_type()}),
     .axi_w_chan_t(${soc_narrow_xbar.in_cva6.w_chan_type()}),

diff --git a/hw/occamy/occamy_quadrant_s1.sv.tpl b/hw/occamy/occamy_quadrant_s1.sv.tpl
@@ -26,6 +26,7 @@
 %>
 
 `include "axi/typedef.svh"
+`include "axi/assign.svh"
 `include "axi_tlb/typedef.svh"
 
 /// Occamy Stage 1 Quadrant

diff --git a/hw/occamy/occamy_quadrant_s1_ctrl.sv.tpl b/hw/occamy/occamy_quadrant_s1_ctrl.sv.tpl
@@ -18,6 +18,8 @@
   wide_tlb_entries = wide_tlb_cfg.get("l1_num_entries", 1)
 %>
 
+`include "axi/assign.svh"
+
 module ${name}_quadrant_s1_ctrl
   import ${name}_pkg::*;
   import ${name}_quadrant_s1_reg_pkg::*;

diff --git a/hw/occamy/occamy_soc.sv.tpl b/hw/occamy/occamy_soc.sv.tpl
@@ -421,6 +421,7 @@ module ${name}_soc
     logic [${wide_in.aw-1}:0] num_bytes;
     axi_pkg::cache_t    cache_src, cache_dst;
     axi_pkg::burst_t    burst_src, burst_dst;
+    logic [${wide_in.uw-1}:0] user_src, user_dst;
     logic               decouple_rw;
     logic               deburst;
     logic               serialize;