Fixes

Author: micprog

Makefile

@@ -7,6 +7,7 @@
 ###############
 
 BENDER ?= bender
+PEAKRDL ?= peakrdl
 
 #########################
 # Files and directories #
@@ -80,10 +81,7 @@ $(GENERATED_DOCS_DIR):
 	mkdir -p $@
 
 $(GENERATED_DOCS_DIR)/peripherals.md: hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral_reg.rdl | $(GENERATED_DOCS_DIR)
-	peakrdl markdown $< -o $@
-
-# Command to generate rdl regblock:
-# peakrdl regblock hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral_reg.rdl -o hw/snitch_cluster/src/snitch_cluster_peripheral --cpuif apb4-flat --default-reset arst_n
+	$(PEAKRDL) markdown $< -o $@
 
 $(DOXYGEN_DOCS_DIR): $(DOXYFILE) $(DOXYGEN_INPUTS)
 	doxygen $<

hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral.sv

@@ -75,7 +75,7 @@ module snitch_cluster_peripheral
     .s_apb_penable ( sn_periph_regs_apb_req.penable ),
     .s_apb_pwrite  ( sn_periph_regs_apb_req.pwrite  ),
     .s_apb_pprot   ( sn_periph_regs_apb_req.pprot   ),
-    .s_apb_paddr   ( sn_periph_regs_apb_req.paddr   ),
+    .s_apb_paddr   ( sn_periph_regs_apb_req.paddr[SNITCH_CLUSTER_PERIPHERAL_REG_MIN_ADDR_WIDTH-1:0] ),
     .s_apb_pwdata  ( sn_periph_regs_apb_req.pwdata  ),
     .s_apb_pstrb   ( sn_periph_regs_apb_req.pstrb   ),
     .s_apb_pready  ( sn_periph_regs_apb_rsp.pready  ),

pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "pandas",
     "peakrdl",
     "peakrdl-markdown",
-    "peakrdl-regblock@git+https://github.com/micprog/PeakRDL-regblock.git#egg=offset_params",
+    "peakrdl-rawheader@git+https://github.com/micprog/PeakRDL-rawheader.git",
     "prettytable",
     "progressbar2",
     "psutil",

target/common/common.mk

@@ -20,7 +20,8 @@ SN_BIN_DIR    = $(SN_TARGET_DIR)/bin
 
 # External executables
 BENDER	     ?= bender
-REGGEN       ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
+# REGGEN       ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
+PEAKRDL      ?= peakrdl
 VERIBLE_FMT  ?= verible-verilog-format
 CLANG_FORMAT ?= clang-format
 RISCV_MC     ?= $(LLVM_BINROOT)/llvm-mc
@@ -83,7 +84,7 @@ $(SN_GEN_DIR) $(SN_BIN_DIR):
 # $1: target name, $2: prerequisite (hjson description file)
 define peakrdl_generate_header
 	@echo "[peakRDL] Generating $1"
-	peakrdl c-header -b htol $2 -o $1
+	$(PEAKRDL) c-header -b htol $2 -o $1
 	@$(CLANG_FORMAT) -i $1
 endef
 

target/common/rtl.mk

@@ -8,26 +8,33 @@ SN_BOOTROM_DIR ?= $(SN_TARGET_DIR)/test
 # Templates
 SN_CLUSTER_WRAPPER_TPL = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl
 SN_CLUSTER_PKG_TPL     = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_pkg.sv.tpl
+SN_CLUSTER_RDL_TPL	   = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_wrapper.rdl.tpl
 
 # Generated RTL sources
 SN_CLUSTER_WRAPPER    = $(SN_GEN_DIR)/snitch_cluster_wrapper.sv
 SN_CLUSTER_PKG        = $(SN_GEN_DIR)/snitch_cluster_pkg.sv
-SN_CLUSTER_PERIPH_TOP = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv
+SN_CLUSTER_PERIPH_TOP = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.sv
 SN_CLUSTER_PERIPH_PKG = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg_pkg.sv
 SN_BOOTROM            = $(SN_BOOTROM_DIR)/snitch_bootrom.sv
+SN_CLUSTER_RDL        = $(SN_GEN_DIR)/snitch_cluster_wrapper.rdl
+SN_CLUSTER_ADDR_SVH   = $(SN_GEN_DIR)/snitch_cluster_addrmap.svh
 
 # All generated RTL sources
-SN_GEN_RTL_SRCS = $(SN_CLUSTER_WRAPPER) $(SN_CLUSTER_PKG) $(SN_CLUSTER_PERIPH_TOP) $(SN_CLUSTER_PERIPH_PKG) $(SN_BOOTROM) 
+SN_GEN_RTL_SRCS = $(SN_CLUSTER_WRAPPER) $(SN_CLUSTER_PKG) $(SN_CLUSTER_PERIPH_TOP) $(SN_CLUSTER_PERIPH_PKG) $(SN_BOOTROM) $(SN_CLUSTER_ADDR_PKG)
 
 # CLUSTERGEN rules
 $(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_WRAPPER),$(SN_CLUSTER_WRAPPER_TPL)))
 $(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_PKG),$(SN_CLUSTER_PKG_TPL)))
+$(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_RDL),$(SN_CLUSTER_RDL_TPL)))
 
-# REGGEN rules
+# peakRDL rules
 $(SN_CLUSTER_PERIPH_PKG): $(SN_CLUSTER_PERIPH_TOP)
-$(SN_CLUSTER_PERIPH_TOP): $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.hjson
-	@echo "[REGGEN] Generating peripheral regfile"
-	$(REGGEN) -r -t $(SN_PERIPH_DIR) $<
+$(SN_CLUSTER_PERIPH_TOP): $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.rdl
+	@echo "[peakrdl] Generating peripheral regfile"
+	$(PEAKRDL) regblock $< -o $(PERIPH_DIR) --cpuif apb4-flat --default-reset arst_n
+$(SN_CLUSTER_ADDR_PKG): $(SN_CLUSTER_RDL)
+	@echo "[peakrdl] Generating addr pkg"
+	$(PEAKRDL) raw-header $< -o $(SN_GEN_DIR) --format svh -I $(SN_PERIPH_DIR)
 
 # Bootrom rules
 $(SN_BOOTROM_DIR)/bootrom.elf $(SN_BOOTROM_DIR)/bootrom.dump $(SN_BOOTROM_DIR)/bootrom.bin $(SN_BOOTROM): $(SN_BOOTROM_DIR)/bootrom.S $(SN_BOOTROM_DIR)/bootrom.ld $(SN_BOOTROM_GEN) | $(SN_BOOTROM_DIR)