Check bender

.gitlab/common.yml

@@ -22,20 +22,8 @@ variables:
 # Update the cache with bender and python dependencies
 .init-deps-tpl:
   script:
-    # Check out the biggest bender dependencies serially
-    # to avoid rate limiting issues
-    # TODO(fischeti): Remove once bender supports rate limiting
-    - bender path cheshire
-    - bender path cva6
-    - bender path ibex
-    - bender path floo_noc
-    - bender path idma
-    - bender path cluster_interconnect
-    - bender path snitch_cluster
-    # Collect bender sourcess
-    - bender checkout
-    # Install the python venv
-    - make python-venv
+    # Source the IIS environment which will setup bender and python
+    - source iis-env.sh
     # Initialize the PD repository
     - make init-pd
   cache:

Bender.lock

@@ -207,7 +207,7 @@ packages:
       Path: .deps/fhg_spu_cluster
     dependencies: []
   floo_noc:
-    revision: ea35a9909d60d552bbdafc7e898590f326b1898a
+    revision: 6b5cabc5ea6303ec4ca0715d996b1dece7d68640
     version: null
     source:
       Git: https://github.com/pulp-platform/FlooNoC.git
@@ -216,7 +216,14 @@ packages:
     - axi_riscv_atomics
     - common_cells
     - common_verification
+    - floo_noc_pd
     - idma
+  floo_noc_pd:
+    revision: null
+    version: null
+    source:
+      Path: .bender/git/checkouts/floo_noc-051cdbf4a4876727/./pd
+    dependencies: []
   fpnew:
     revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315
     version: null

Makefile

@@ -107,6 +107,9 @@ SN_GEN_DIR = $(PB_GEN_DIR)
 include $(SN_ROOT)/make/common.mk
 include $(SN_ROOT)/make/rtl.mk
 
+$(SN_CFG): $(FLOO_CFG)
+	@sed -i 's/nr_clusters: .*/nr_clusters: $(SN_CLUSTERS),/' $<
+
 .PHONY: sn-hw-clean sn-hw-all
 
 sn-hw-all: $(SN_CLUSTER_WRAPPER) $(SN_CLUSTER_PKG)
@@ -116,9 +119,6 @@ sn-hw-clean:
 ###########
 # FlooNoC #
 ###########
-.PHONY: update-sn-cfg
-update-sn-cfg: $(SN_CFG)
-	@sed -i 's/nr_clusters: .*/nr_clusters: $(SN_CLUSTERS),/' $<
 
 .PHONY: floo-hw-all floo-clean
 
@@ -174,7 +174,7 @@ PB_HW_ALL += $(CHS_HW_ALL)
 PB_HW_ALL += $(CHS_SIM_ALL)
 PB_HW_ALL += $(PB_GEN_DIR)/floo_picobello_noc_pkg.sv
 PB_HW_ALL += $(PB_RDL_HW_ALL)
-PB_HW_ALL += update-sn-cfg
+PB_HW_ALL += $(SN_CFG)
 
 .PHONY: picobello-hw-all picobello-clean clean
 

iis-env.sh

@@ -6,6 +6,7 @@
 export VSIM="questa-2023.4 vsim"
 export VOPT="questa-2023.4 vopt"
 export VLIB="questa-2023.4 vlib"
+export BENDER="/home/fischeti/.cargo/bin/bender -d ${CI_PROJECT_DIR} --suppress W22"
 export BASE_PYTHON=/usr/local/anaconda3/bin/python3.11
 export CHS_SW_GCC_BINROOT=/usr/pack/riscv-1.0-kgf/riscv64-gcc-12.2.0/bin
 export VERIBLE_FMT="oseda -2025.03 verible-verilog-format"