Update rdl enum

Author: micprog

sw/tests/perf_cnt.c

@@ -4,6 +4,7 @@
 
 #include "printf.h"
 #include "snrt.h"
+#include "snitch_cluster_peripheral_addrmap.h"
 
 #define WIDE_WORD_SIZE 64
 
@@ -40,7 +41,7 @@ int main() {
             // Configure and start the performance counter
             snrt_cfg_perf_counter(
                 i,
-                SNITCH_CLUSTER_PERIPHERAL_PERF_CNT_SEL_0_METRIC_0_VALUE_CYCLE,
+                PERF_METRIC__CYCLE,
                 0);
             snrt_start_perf_counter(i);
         }
@@ -71,11 +72,11 @@ int main() {
         // Configure performance counters to track DMA read and writes
         snrt_cfg_perf_counter(
             0,
-            SNITCH_CLUSTER_PERIPHERAL_PERF_CNT_SEL_0_METRIC_0_VALUE_DMA_AW_DONE,
+            PERF_METRIC__DMA_AW_DONE,
             0);
         snrt_cfg_perf_counter(
             1,
-            SNITCH_CLUSTER_PERIPHERAL_PERF_CNT_SEL_0_METRIC_0_VALUE_DMA_AR_DONE,
+            PERF_METRIC__DMA_AR_DONE,
             0);
 
         // Transfer around some data
@@ -109,11 +110,11 @@ int main() {
         // Configure performance counters to track DMA read and write beats
         snrt_cfg_perf_counter(
             0,
-            SNITCH_CLUSTER_PERIPHERAL_PERF_CNT_SEL_0_METRIC_0_VALUE_DMA_W_DONE,
+            PERF_METRIC__DMA_W_DONE,
             0);
         snrt_cfg_perf_counter(
             1,
-            SNITCH_CLUSTER_PERIPHERAL_PERF_CNT_SEL_0_METRIC_0_VALUE_DMA_R_DONE,
+            PERF_METRIC__DMA_R_DONE,
             0);
 
         // Transfer around some data

target/snitch_cluster/sw.mk

@@ -21,9 +21,15 @@ SNRT_HAL_HDRS_DIR ?= $(SN_ROOT)/target/snitch_cluster/sw/runtime/common
 
 SNITCH_CLUSTER_CFG_H        = $(SNRT_HAL_HDRS_DIR)/snitch_cluster_cfg.h
 SNITCH_CLUSTER_ADDRMAP_H    = $(SNRT_HAL_HDRS_DIR)/snitch_cluster_addrmap.h
+SNITCH_CLUSTER_WRAPPER_ADDRMAP_H    = $(SNRT_HAL_HDRS_DIR)/snitch_cluster_wrapper_addrmap.h
 SNITCH_CLUSTER_PERIPHERAL_H = $(SNRT_HAL_HDRS_DIR)/snitch_cluster_peripheral.h
+SNITCH_CLUSTER_PERIPHERAL_ADDRMAP_H = $(SNRT_HAL_HDRS_DIR)/snitch_cluster_peripheral_addrmap.h
 
-SNRT_HAL_HDRS = $(SNITCH_CLUSTER_CFG_H) $(SNITCH_CLUSTER_ADDRMAP_H) $(SNITCH_CLUSTER_PERIPHERAL_H)
+SNRT_HAL_HDRS =  $(SNITCH_CLUSTER_CFG_H)
+SNRT_HAL_HDRS += $(SNITCH_CLUSTER_ADDRMAP_H)
+SNRT_HAL_HDRS += $(SNITCH_CLUSTER_WRAPPER_ADDRMAP_H)
+SNRT_HAL_HDRS += $(SNITCH_CLUSTER_PERIPHERAL_H)
+SNRT_HAL_HDRS += $(SNITCH_CLUSTER_PERIPHERAL_ADDRMAP_H)
 
 # CLUSTERGEN headers
 $(eval $(call sn_cluster_gen_rule,$(SNITCH_CLUSTER_CFG_H),$(SNITCH_CLUSTER_CFG_H).tpl))
@@ -33,6 +39,15 @@ $(eval $(call sn_cluster_gen_rule,$(SNITCH_CLUSTER_ADDRMAP_H),$(SNITCH_CLUSTER_A
 $(SNITCH_CLUSTER_PERIPHERAL_H): $(SN_ROOT)/hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral_reg.rdl
 	$(call peakrdl_generate_header,$@,$<)
 
+$(SNITCH_CLUSTER_WRAPPER_ADDRMAP_H): $(SN_GEN_DIR)/snitch_cluster_wrapper.rdl
+	@echo "[peakrdl] Generating addrmap header"
+	$(PEAKRDL) raw-header $< -o $(SNITCH_CLUSTER_WRAPPER_ADDRMAP_H) --format c -I $(SN_PERIPH_DIR)
+
+$(SNITCH_CLUSTER_PERIPHERAL_ADDRMAP_H): $(SN_GEN_DIR)/snitch_cluster_peripheral_reg.rdl
+	@echo "[peakrdl] Generating addrmap header"
+	$(PEAKRDL) raw-header $< -o $(SNITCH_CLUSTER_PERIPHERAL_ADDRMAP_H) --format c -I $(SN_PERIPH_DIR)
+
+
 .PHONY: sn-clean-headers
 sn-clean-sw: sn-clean-headers
 sn-clean-headers:

target/snitch_cluster/sw/runtime/common/.gitignore

@@ -1,3 +1,5 @@
 snitch_cluster_cfg.h
 snitch_cluster_addrmap.h
+snitch_cluster_wrapper_addrmap.h
 snitch_cluster_peripheral.h
+snitch_cluster_peripheral_addrmap.h