Fixes

Bender.yml

@@ -22,7 +22,7 @@ dependencies:
 export_include_dirs:
   - src/include
   - target/rtl/include
-  - test/include
+  - test
 
 sources:
   # Source files grouped in levels. Files in level 0 have no dependencies on files in this
@@ -106,6 +106,9 @@ sources:
   - target: idma_test
     files:
       # Level 0
+      - test/idma_intf.sv
+      - test/idma_test.sv
+      # Level 1
       - test/frontend/tb_idma_desc64_top.sv
       - test/frontend/tb_idma_desc64_bench.sv
       - test/future/idma_tb_per2axi.sv
@@ -114,7 +117,7 @@ sources:
       - test/future/tb_idma_improved_fifo.sv
       - test/midend/tb_idma_nd_midend.sv
       - test/midend/tb_idma_rt_midend.sv
-      # Level 1
+      # Level 2
       - test/future/idma_obi2axi_bridge.sv
       - test/future/idma_tilelink2axi_bridge.sv
 

idma.mk

@@ -38,10 +38,14 @@ IDMA_FE_IDS ?= reg32_3d reg64_2d
 # iDMA paths
 IDMA_ROOT     ?= $(shell $(BENDER) path idma)
 IDMA_REG_DIR  := $(shell $(BENDER) path register_interface)
+IDMA_CC_DIR   := $(shell $(BENDER) path common_cells)
 IDMA_REGTOOL  ?= $(IDMA_REG_DIR)/vendor/lowrisc_opentitan/util/regtool.py
 IDMA_UTIL_DIR := $(IDMA_ROOT)/util
 IDMA_RTL_DIR  := $(IDMA_ROOT)/target/rtl
 
+# cf_math_pkg file
+IDMA_CF_PKG   := $(IDMA_CC_DIR)/src/cf_math_pkg.sv
+
 # job file
 IDMA_JOBS_JSON := jobs/jobs.json
 
@@ -225,10 +229,12 @@ IDMA_MORTY_ARGS  ?=
 
 $(IDMA_PICKLE_DIR)/sources.json: $(IDMA_BENDER_FILES) $(IDMA_FULL_TB) $(IDMA_FULL_RTL) $(IDMA_INCLUDE_ALL)
 	mkdir -p $(IDMA_PICKLE_DIR)
-	$(BENDER) sources -f -t rtl -t synthesis -t synth -t asic -t snitch_cluster | sed -e $(IDMA_RELATIVE_PATH_REGEX) > $@
+	$(BENDER) sources -f -t rtl -t synth -t asic -t snitch_cluster | sed -e $(IDMA_RELATIVE_PATH_REGEX) > $@
 
 $(IDMA_PICKLE_DIR)/%.sv: $(IDMA_PICKLE_DIR)/sources.json
-	$(MORTY) -f $< -i --top $* $(IDMA_MORTY_ARGS) --propagate_defines -o $@
+	$(MORTY) -f $< -i --top $* $(IDMA_MORTY_ARGS) --propagate_defines -o $@.pre
+	$(CAT) $(IDMA_CF_PKG) $@.pre > $@
+	rm -f $@.pre
 
 $(IDMA_HTML_DIR)/%/index.html: $(IDMA_PICKLE_DIR)/%.sv
 	mkdir -p $(IDMA_HTML_DIR)/$*

util/deploy.py

@@ -54,6 +54,9 @@
         for line in content:
             f.write(f'# {line}\n')
 
+# remove internal CI from deployed branches
+os.remove('.github/workflows/gitlab-ci.yml')
+
 # add and commit files
 os.popen(GIT_ADD_ALL_CMD)
 time.sleep(0.5)