Upstreaming changes from chimera from dkeller/chimera v2

.gitignore

@@ -7,3 +7,4 @@ regression_tests/
 pulp-runtime/
 fault_injection_sim/
 venv/
+.venv/

Bender.lock

@@ -69,7 +69,7 @@ packages:
     dependencies:
     - hci
   common_cells:
-    revision: 9afda9abb565971649c2aa0985639c096f351171
+    revision: b20ad7aba2080b3bb705680e0f70f1fc180ce290
     version: 1.38.0
     source:
       Git: https://github.com/pulp-platform/common_cells.git
@@ -98,14 +98,6 @@ packages:
       Git: https://github.com/pulp-platform/event_unit_flex.git
     dependencies:
     - common_cells
-  flex-v:
-    revision: e9355c2f6ec4c105abdff39489e5d1be93bc4374
-    version: null
-    source:
-      Git: https://github.com/pulp-platform/flex-v.git
-    dependencies:
-    - fpnew
-    - tech_cells_generic
   fpnew:
     revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315
     version: null
@@ -122,7 +114,7 @@ packages:
     dependencies:
     - common_cells
   hci:
-    revision: 5421524afca701e45a83d0f1ec47568c019e021a
+    revision: 0faa4f3cdfc87ead4a10e5c307c00aa6c4504d0d
     version: null
     source:
       Git: https://github.com/pulp-platform/hci.git
@@ -173,8 +165,8 @@ packages:
       Git: https://github.com/pulp-platform/icache-intc.git
     dependencies: []
   idma:
-    revision: 92799c5fabcf2cd1f224f970bbb040b290d08fd5
-    version: null
+    revision: ff5d56fffb3767814db88d6bf8f381974ea33aa5
+    version: 0.6.4
     source:
       Git: https://github.com/pulp-platform/idma.git
     dependencies:
@@ -198,14 +190,15 @@ packages:
     dependencies:
     - common_cells
   neureka:
-    revision: ff7090eb3738a5192af0f4e1499e4ed44a3041e5
+    revision: 5ff2b6bc0a04de07eb2549a599655fb6d7f99c58
     version: null
     source:
       Git: https://github.com/pulp-platform/neureka.git
     dependencies:
     - hci
     - hwpe-ctrl
     - hwpe-stream
+    - register_interface
     - zeroriscy
   obi:
     revision: c2141a653c755461ff44f61d12aeb5d99fc8e760
@@ -237,7 +230,7 @@ packages:
     - register_interface
     - tech_cells_generic
   redundancy_cells:
-    revision: d924bd6a2ffa48f0e6d26e6c66725012cf677abe
+    revision: 9e31f7c6c24877eaf58279903e7a162b16c9a721
     version: null
     source:
       Git: https://github.com/pulp-platform/redundancy_cells.git
@@ -256,6 +249,14 @@ packages:
     - axi
     - common_cells
     - common_verification
+  riscv:
+    revision: c760db14dbd6cc3ec3b8ae8274df2eac7225bcac
+    version: null
+    source:
+      Git: https://github.com/AlSaqr-platform/riscv_nn.git
+    dependencies:
+    - fpnew
+    - tech_cells_generic
   scm:
     revision: 472f99affe44ff7b282b519c047a3cfeb35b16c6
     version: 1.2.0

Bender.yml

@@ -18,23 +18,23 @@ dependencies:
   cluster_interconnect:   { git: "https://github.com/pulp-platform/cluster_interconnect.git", rev: v1.3.0      }
   event_unit_flex:        { git: "https://github.com/pulp-platform/event_unit_flex.git",      rev: astral-v1.0 }
   mchan:                  { git: "https://github.com/pulp-platform/mchan.git", rev: v1.2.4 }
-  idma:                   { git: "https://github.com/pulp-platform/idma.git", rev: "92799c5fabcf2cd1f224f970bbb040b290d08fd5" } # branch: smazzola/chimera
+  idma:                   { git: "https://github.com/pulp-platform/idma.git", rev: v0.6.4 }
   hier-icache:            { git: "https://github.com/pulp-platform/hier-icache.git", rev: v1.3.0 }
   cluster_icache:         { git: "https://github.com/pulp-platform/cluster_icache.git", rev: v0.2.0 }
   cluster_peripherals:    { git: "https://github.com/pulp-platform/cluster_peripherals.git", rev: v2.2.0 }
   axi:                    { git: "https://github.com/pulp-platform/axi.git", version: 0.39.3  }
   timer_unit:             { git: "https://github.com/pulp-platform/timer_unit.git", version: 1.0.2 }
   common_cells:           { git: "https://github.com/pulp-platform/common_cells.git", version: 1.35.0 }
   tech_cells_generic:     { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.3 }
-  flex-v:                 { git: "https://github.com/pulp-platform/flex-v.git", rev: astral-v1.1 }
+  riscv:                  { git: "https://github.com/AlSaqr-platform/riscv_nn.git", rev: astral-v1.0 }
   cv32e40p:               { git: "https://github.com/pulp-platform/cv32e40p.git", rev: astral-v1.0 }
   ibex:                   { git: "https://github.com/pulp-platform/ibex.git", rev: "pulpissimo-v6.1.2" }
   scm:                    { git: "https://github.com/pulp-platform/scm.git", rev: v1.2.0 }
-  hci:                    { git: "https://github.com/pulp-platform/hci.git", rev: 5421524afca701e45a83d0f1ec47568c019e021a } # branch: main
-  register_interface:     { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.4  }
-  redundancy_cells:       { git: "https://github.com/pulp-platform/redundancy_cells.git", rev: astral-v1.0 }
+  hci:                    { git: "https://github.com/pulp-platform/hci.git", rev: 5421524afca701e45a83d0f1ec47568c019e021a  } # branch: main
+  register_interface:     { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.5  }
+  redundancy_cells:       { git: "https://github.com/pulp-platform/redundancy_cells.git", rev: 9e31f7c6c24877eaf58279903e7a162b16c9a721 } # branch: astral-v0
   redmule:                { git: "https://github.com/pulp-platform/redmule.git", rev: astral-v1.0 }
-  neureka:                { git: "https://github.com/pulp-platform/neureka.git", rev: ff7090eb3738a5192af0f4e1499e4ed44a3041e5 } # branch: main
+  neureka:                { git: "https://github.com/pulp-platform/neureka.git", rev: astral-v1.0 }
   softex:                 { git: "https://github.com/belanoa/softex.git"       , rev: astral-v1.0 }
   obi:                    { git: "https://github.com/pulp-platform/obi.git", rev: v0.1.3 }
 
@@ -96,3 +96,4 @@ sources:
     files:
     - nonfree/gf12/sourcecode/tc_sram.sv
     - nonfree/gf12/sourcecode/tc_clk.sv
+

Makefile

@@ -12,7 +12,9 @@ else
 QUESTA ?=
 endif
 
+
 BENDER ?= bender
+# BENDER ?= /local/user/dkm/Projects/pulp_cluster/bender-cust/target/debug/bender
 PYTHON ?= python3
 
 VSIM ?= $(QUESTA) vsim
@@ -27,6 +29,12 @@ REGRESSIONS := $(ROOT_DIR)/regression_tests
 
 VLOG_ARGS += -suppress vlog-2583 -suppress vlog-13314 -suppress vlog-13233 -timescale \"1 ns / 1 ps\" \"+incdir+$(shell pwd)/include\"
 
+# TB's wide DMA port toggle override
+export TB_ENABLE_WIDE_PORT
+ifneq ($(strip $(TB_ENABLE_WIDE_PORT)),)
+VLOG_ARGS += +define+TB_ENABLE_WIDE_PORT=$(TB_ENABLE_WIDE_PORT)
+endif
+
 define generate_vsim
 	echo 'set ROOT [file normalize [file dirname [info script]]/$3]' > $1
 	$(BENDER) script vsim --vlog-arg="$(VLOG_ARGS)" $2 | grep -v "set ROOT" >> $1
@@ -38,10 +46,12 @@ endef
 ######################
 
 NONFREE_REMOTE ?= [email protected]:pulp-restricted/pulp-cluster-nonfree.git
-NONFREE_COMMIT ?= f492530603be007bdc82c37bc0ebae6599d7c7a2 # branch: smazzola/chimera
+#NONFREE_COMMIT ?= 6f5b4b5aa85b6f3ac4bbe03439dd250ab4810d80 # branch: dkeller/chimera-v2
+NONFREE_BRANCH ?= dkeller/chimera-v2
 
 nonfree-init:
-	git clone $(NONFREE_REMOTE) nonfree
+	rm -rf nonfree;
+	git clone --single-branch --branch $(NONFREE_BRANCH) $(NONFREE_REMOTE) nonfree
 	cd nonfree && git checkout $(NONFREE_COMMIT)
 
 ################
@@ -63,6 +73,8 @@ Bender.lock:
 	$(BENDER) checkout
 	touch Bender.lock
 
+update:
+	$(BENDER) update
 
 ######
 # SW #
@@ -76,28 +88,101 @@ sw-clean:
 
 ## Clone pulp-runtime as SW stack
 PULP_RUNTIME_REMOTE ?= https://github.com/pulp-platform/pulp-runtime.git
-PULP_RUNTIME_COMMIT ?= 3c6e91f03942b3a1951b1315b6f175bbd851361c # branch: smazzola/chimera
+PULP_RUNTIME_REF	?= dkeller/chimera-v2
+PULP_RUNTIME_DIR	?= $(ROOT_DIR)/pulp-runtime
+# Lock (optional)
+PULP_RUNTIME_LOCK_FILE ?= pulp-runtime.lock
+PULP_RUNTIME_COMMIT := $(shell test -f $(PULP_RUNTIME_LOCK_FILE) && cat $(PULP_RUNTIME_LOCK_FILE) || echo)
 
 pulp-runtime:
-	git clone $(PULP_RUNTIME_REMOTE) $@
-	cd $@ && git checkout $(PULP_RUNTIME_COMMIT)
+	@if [ -d "$(PULP_RUNTIME_DIR)/.git" ]; then \
+		echo "[pulp-runtime] Using existing repo at $(PULP_RUNTIME_DIR)"; \
+		git -C $(PULP_RUNTIME_DIR) fetch --tags --all; \
+	else \
+		echo "[pulp-runtime] Cloning $(PULP_RUNTIME_REMOTE)"; \
+		git clone $(PULP_RUNTIME_REMOTE) $(PULP_RUNTIME_DIR); \
+	fi
+	@if [ -n "$(PULP_RUNTIME_COMMIT)" ]; then \
+		echo "[pulp-runtime] Checking out locked commit $(PULP_RUNTIME_COMMIT)"; \
+		git -C $(PULP_RUNTIME_DIR) checkout --detach $(PULP_RUNTIME_COMMIT); \
+	else \
+		echo "[pulp-runtime] Checking out ref $(PULP_RUNTIME_REF)"; \
+		git -C $(PULP_RUNTIME_DIR) checkout $(PULP_RUNTIME_REF) || true; \
+		git -C $(PULP_RUNTIME_DIR) pull --ff-only || true; \
+	fi
+
+lock-runtime:
+	@git -C $(PULP_RUNTIME_DIR) rev-parse HEAD > $(PULP_RUNTIME_LOCK_FILE) && \
+	echo "Locked pulp-runtime to $$(cat $(PULP_RUNTIME_LOCK_FILE))"
+
+unlock-runtime:
+	@rm -f $(PULP_RUNTIME_LOCK_FILE) && echo "Unlocked pulp-runtime (will track $(PULP_RUNTIME_REF))"
 
 ## Clone fault injection scripts
 FAULT_SIM_REMOTE ?= https://github.com/pulp-platform/InjectaFault.git
-FAULT_SIM_COMMIT ?= 84ddcff # branch: rt/rename-var
+FAULT_SIM_BRANCH ?= rt/rename-var
+FAULT_SIM_DIR	?= $(ROOT_DIR)/fault_injection_sim
+# Lock (optional)
+FAULT_SIM_LOCK_FILE ?= fault_injection_sim.lock
+FAULT_SIM_COMMIT := $(shell test -f $(FAULT_SIM_LOCK_FILE) && cat $(FAULT_SIM_LOCK_FILE) || echo)
 
 fault_injection_sim:
-	git clone $(FAULT_SIM_REMOTE) $@
-	cd $@ && git checkout $(FAULT_SIM_COMMIT)
+	@if [ -d "$(FAULT_SIM_DIR)/.git" ]; then \
+		echo "[fault_injection_sim] Using existing repo at $(FAULT_SIM_DIR)"; \
+		git -C $(FAULT_SIM_DIR) fetch --tags --all; \
+	else \
+		echo "[fault_injection_sim] Cloning $(FAULT_SIM_REMOTE)"; \
+		git clone $(FAULT_SIM_REMOTE) $(FAULT_SIM_DIR); \
+	fi
+	@if [ -n "$(FAULT_SIM_COMMIT)" ]; then \
+		echo "[fault_injection_sim] Checking out locked commit $(FAULT_SIM_COMMIT)"; \
+		git -C $(FAULT_SIM_DIR) checkout --detach $(FAULT_SIM_COMMIT); \
+	else \
+		echo "[fault_injection_sim] Checking out ref $(FAULT_SIM_BRANCH)"; \
+		git -C $(FAULT_SIM_DIR) checkout $(FAULT_SIM_BRANCH) || true; \
+		git -C $(FAULT_SIM_DIR) pull --ff-only || true; \
+	fi
+
+lock-fault-sim:
+	@git -C $(FAULT_SIM_DIR) rev-parse HEAD > $(FAULT_SIM_LOCK_FILE) && \
+	echo "Locked fault_injection_sim to $$(cat $(FAULT_SIM_LOCK_FILE))"
+
+unlock-fault-sim:
+	@rm -f $(FAULT_SIM_LOCK_FILE) && echo "Unlocked fault_injection_sim (will track $(FAULT_SIM_BRANCH))"
 
 ## Clone regression tests
 REGRESSION_TESTS_REMOTE ?= https://github.com/pulp-platform/regression_tests.git
-REGRESSION_TESTS_COMMIT ?= 53e038baec991aa94e113ecefc03ca6377e56f85 # branch: smazzola/chimera
+REGRESSION_TESTS_BRANCH ?= dkeller/chimera-v2
+REGRESSION_TESTS_DIR	?= $(ROOT_DIR)/regression_tests
+# Lock (optional)
+REGRESSION_TESTS_LOCK_FILE ?= regression_tests.lock
+REGRESSION_TESTS_COMMIT := $(shell test -f $(REGRESSION_TESTS_LOCK_FILE) && cat $(REGRESSION_TESTS_LOCK_FILE) || echo)
 
 regression_tests:
-	git clone $(REGRESSION_TESTS_REMOTE) $@
-	cd $@ && git checkout $(REGRESSION_TESTS_COMMIT)
-	cd $@ && git submodule update --init --recursive
+	@if [ -d "$(REGRESSION_TESTS_DIR)/.git" ]; then \
+		echo "[regression_tests] Using existing repo at $(REGRESSION_TESTS_DIR)"; \
+		git -C $(REGRESSION_TESTS_DIR) fetch --tags --all; \
+	else \
+		echo "[regression_tests] Cloning $(REGRESSION_TESTS_REMOTE)"; \
+		git clone $(REGRESSION_TESTS_REMOTE) $(REGRESSION_TESTS_DIR); \
+	fi
+	@if [ -n "$(REGRESSION_TESTS_COMMIT)" ]; then \
+		echo "[regression_tests] Checking out locked commit $(REGRESSION_TESTS_COMMIT)"; \
+		git -C $(REGRESSION_TESTS_DIR) checkout --detach $(REGRESSION_TESTS_COMMIT); \
+	else \
+		echo "[regression_tests] Checking out ref $(REGRESSION_TESTS_BRANCH)"; \
+		git -C $(REGRESSION_TESTS_DIR) checkout $(REGRESSION_TESTS_BRANCH) || true; \
+		git -C $(REGRESSION_TESTS_DIR) pull --ff-only || true; \
+	fi
+	@echo "[regression_tests] Initializing submodules (e.g., pulp-nnx)"
+	@git -C $(REGRESSION_TESTS_DIR) submodule update --init --recursive
+
+lock-regression-tests:
+	@git -C $(REGRESSION_TESTS_DIR) rev-parse HEAD > $(REGRESSION_TESTS_LOCK_FILE) && \
+	echo "Locked regression_tests to $$(cat $(REGRESSION_TESTS_LOCK_FILE))"
+
+unlock-regression-tests:
+	@rm -f $(REGRESSION_TESTS_LOCK_FILE) && echo "Unlocked regression_tests (will track $(REGRESSION_TESTS_BRANCH))"
 
 #########################
 # Hardware dependencies #
@@ -113,16 +198,14 @@ endif
 IDMA_ROOT ?= .
 
 # Python requirements (version and packages) coming from iDMA repository
-gen_idma_hw: $(IDMA_ROOT)/.idma_generated
-$(IDMA_ROOT)/.idma_generated:
+gen_idma_hw:
 	@$(PYTHON) --version >/dev/null 2>&1 || { echo "ERROR: Python not found. Python 3.8 or higher is required."; exit 1; } && \
 	$(PYTHON) -c "import sys; assert sys.version_info >= (3, 8)" || { echo "ERROR: Python version must be 3.8 or higher"; exit 1; } && \
-	rm -rf venv && $(PYTHON) -m venv venv && \
+	$(PYTHON) -m venv venv && \
 	. venv/bin/activate && \
 	pip install --upgrade pip && \
 	pip install -r $(IDMA_ROOT)/requirements.txt && \
-	make -C $(IDMA_ROOT) idma_hw_all && \
-	touch $@
+	make -C $(IDMA_ROOT) idma_hw_all
 
 clean_idma_hw:
 	make -C $(IDMA_ROOT) idma_clean_all
@@ -150,7 +233,7 @@ scripts/synth-compile.tcl: | Bender.lock
 $(library):
 	$(QUESTA) vlib $(library)
 
-compile: $(IDMA_ROOT)/.idma_generated $(library)
+compile: gen_idma_hw $(library)
 	@test -f Bender.lock || { echo "ERROR: Bender.lock file does not exist. Did you run make checkout in bender mode?"; exit 1; }
 	@test -f scripts/compile.tcl || { echo "ERROR: scripts/compile.tcl file does not exist. Did you run make scripts in bender mode?"; exit 1; }
 	$(VSIM) -c -do 'quit -code [source scripts/compile.tcl]'
@@ -162,8 +245,15 @@ run:
 	$(VSIM) +permissive -suppress 3053 -suppress 8885 -lib $(library)  +MAX_CYCLES=$(max_cycles) +UVM_TESTNAME=$(test_case) +APP=$(elf-bin) +notimingchecks +nospecify  -t 1ps \
 	${top_level}_optimized +permissive-off ++$(elf-bin) ++$(target-options) ++$(cl-bin) | tee sim.log
 
+.PHONY: clean
+
+clean:
+	rm -rf scripts/synth-compile.tcl
+	rm -rf scripts/compile.tcl
+	rm -rf transcript
+	rm -rf *.log
+
 ####################
 # Regression tests #
 ####################
-
 include regression.mk

README.md

@@ -1,6 +1,6 @@
 # PULP Cluster
 
-![pulp_cluster schematic](doc/PULP_CLUSTER.png)
+![pulp_cluster schematic](doc/PULP_CLUSTER_updateOct2024.png)
 
 The `pulp_cluster` repository contains the structure of the cluster subsystem
 used in PULP chips. For more details on the internal architecture, see the

bender-common.mk

@@ -11,7 +11,16 @@ common_defs += -D CLUSTER_ALIAS
 common_defs += -D USE_PULP_PARAMETERS
 
 common_targs += -t rtl
-# common_targs += -t mchan
+# DMA configuration
+DMA_TYPE ?= idma
+
+ifeq ($(DMA_TYPE),mchan)
+  common_targs += -t mchan
+  common_defs += -D TARGET_MCHAN
+else
+  # Default to iDMA
+endif
+
 common_targs += -t cluster_standalone
 common_targs += -t scm_use_fpga_scm
 common_targs += -t cv32e40p_use_ff_regfile