Add Multicast functionality

.gitignore

@@ -68,6 +68,7 @@ hw/test/jobs
 
 # QuestaSim
 work
+work_*
 work-vsim
 modelsim.ini
 transcript
@@ -94,4 +95,4 @@ measurements
 # Misc
 *.csv
 **/*.log
-reviewdog
+reviewdog

.gitlab-ci.yml

@@ -124,4 +124,4 @@ morty:
     - collect-bender-sources
   script:
     - $BENDER sources -f > source_list.txt
-    - morty -f source_list.txt
+    - morty -f source_list.txt

Bender.lock

@@ -7,10 +7,10 @@ packages:
     dependencies:
     - common_cells
   axi:
-    revision: 9402c8a9ce0a7b5253c3c29e788612d771e8b5d6
-    version: 0.39.3
+    revision: fed6a2f3a92ad7d7b7ef42840901eb218a3c5532
+    version: null
     source:
-      Git: https://github.com/pulp-platform/axi.git
+      Git: https://github.com/colluca/axi.git
     dependencies:
     - common_cells
     - common_verification
@@ -32,22 +32,22 @@ packages:
     dependencies:
     - common_cells
   common_cells:
-    revision: 0d67563b6b592549542544f1abc0f43e5d4ee8b4
-    version: 1.35.0
+    revision: 0fd2ba32926c0360534dc3d5795143cb259abb1c
+    version: null
     source:
       Git: https://github.com/pulp-platform/common_cells.git
     dependencies:
     - common_verification
     - tech_cells_generic
   common_verification:
-    revision: 9c07fa860593b2caabd9b5681740c25fac04b878
-    version: 0.2.3
+    revision: fb1885f48ea46164a10568aeff51884389f67ae3
+    version: 0.2.5
     source:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   idma:
-    revision: 95f366e56f7e772c283fb3c8b343afc4a3978375
-    version: 0.6.2
+    revision: ff5d56fffb3767814db88d6bf8f381974ea33aa5
+    version: 0.6.4
     source:
       Git: https://github.com/pulp-platform/iDMA.git
     dependencies:
@@ -58,16 +58,16 @@ packages:
     - obi
     - register_interface
   obi:
-    revision: 1aa411df145c4ebdd61f8fed4d003c33f7b20636
-    version: 0.1.2
+    revision: 8097928cf1b43712f93d5356f336397879b4ad2c
+    version: 0.1.6
     source:
       Git: https://github.com/pulp-platform/obi.git
     dependencies:
     - common_cells
     - common_verification
   register_interface:
-    revision: ae616e5a1ec2b41e72d200e5ab09c65e94aebd3d
-    version: 0.4.4
+    revision: 5daa85d164cf6b54ad061ea1e4c6f3624556e467
+    version: 0.4.5
     source:
       Git: https://github.com/pulp-platform/register_interface.git
     dependencies:

Bender.yml

@@ -10,9 +10,12 @@ package:
 
 dependencies:
   idma: { git: "https://github.com/pulp-platform/iDMA.git", version: 0.6.2 }
-  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.35.0 }
+  # idma: { git: "https://github.com/pulp-platform/iDMA.git", rev: "mcast" }
+  # common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.35.0 }
+  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", rev: "multicast-xbar" }
   common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.3 }
   axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.3 }
+  # axi: { git: "https://github.com/colluca/axi.git", rev: "feature/multicast-xbar" }
   axi_riscv_atomics: { git: "https://github.com/pulp-platform/axi_riscv_atomics.git", version: 0.8.2 }
 
 export_include_dirs:
@@ -26,19 +29,28 @@ sources:
   - hw/floo_fifo.sv
   - hw/floo_cdc.sv
   - hw/floo_route_select.sv
-  - hw/floo_route_comp.sv
+  - hw/floo_mask_decode.sv
   - hw/floo_vc_arbiter.sv
   - hw/floo_wormhole_arbiter.sv
   - hw/floo_simple_rob.sv
   - hw/floo_rob.sv
   - hw/floo_rob_wrapper.sv
-  - hw/floo_meta_buffer.sv
+  - hw/floo_reduction_sync.sv
+  - hw/floo_route_xymask.sv
+  - hw/floo_gen_path_mask.sv
   # Level 2
+  - hw/floo_route_select.sv
+  - hw/floo_route_comp.sv
+  - hw/floo_meta_buffer.sv
+  - hw/floo_reduction_arbiter.sv
+  # Level 3
+  - hw/floo_output_arbiter.sv
+  # Level 4
   - hw/floo_nw_join.sv
   - hw/floo_axi_chimney.sv
   - hw/floo_nw_chimney.sv
   - hw/floo_router.sv
-  # Level 3 (Wrappers)
+  # Level 5 (Wrappers)
   - hw/floo_axi_router.sv
   - hw/floo_nw_router.sv
 
@@ -70,6 +82,7 @@ sources:
       - hw/test/floo_axi_rand_slave.sv
       - hw/test/floo_dma_test_node.sv
       - hw/test/axi_reorder_compare.sv
+      - hw/test/axi_reorder_compare_multicast.sv
       - hw/test/axi_reorder_remap_compare.sv
       - hw/test/axi_bw_monitor.sv
       - hw/test/floo_hbm_model.sv
@@ -80,6 +93,7 @@ sources:
       - hw/tb/tb_floo_router.sv
       - hw/tb/tb_floo_rob.sv
       - hw/tb/tb_floo_vc_router.sv
+      - hw/tb/tb_floo_rob_multicast.sv
 
   - target: all(floo_test, axi_mesh)
     include_dirs:

Makefile

@@ -42,7 +42,8 @@ BENDER_FLAGS += -t idma_test
 BENDER_FLAGS := $(BENDER_FLAGS) $(EXTRA_BENDER_FLAGS)
 
 WORK 	 		?= work
-TB_DUT 		?= floo_noc_router_test
+# TB_DUT 		?= tb_floo_rob_multicast #floo_noc_router_test
+TB_DUT ?= tb_floo_rob_multicast
 
 VLOG_ARGS += -suppress vlog-2583
 VLOG_ARGS += -suppress vlog-13314
@@ -92,9 +93,11 @@ endif
 
 FLOOGEN ?= floogen
 FLOO_CFG_DIR ?= $(MKFILE_DIR)floogen/examples
-FLOOGEN_CFG ?= $(FLOO_CFG_DIR)/single_cluster.yml
+# FLOOGEN_CFG ?= $(FLOO_CFG_DIR)/single_cluster.yml
+FLOOGEN_CFG ?= $(FLOO_CFG_DIR)/axi_mesh_xy.yml
 
 FLOOGEN_OUT_DIR ?= $(MKFILE_DIR)generated
+FLOOGEN_ARGS = --visualize
 
 .PHONY: install-floogen pkg-sources sources clean-sources