From c83ff1f504a62440ed3c5df120f0e83078449d5e Mon Sep 17 00:00:00 2001 From: Luca Colagrande Date: Thu, 29 Aug 2024 20:00:22 +0200 Subject: [PATCH] Bender.yml: Rename `snitch_cluster` target Due to collision with `snitch_cluster` target used in iDMA, whose sources are required by all Snitch-cluster-based systems, e.g. Occamy, sources specific to the Snitch cluster simulation target and not needed by Snitch-cluster-based systems need to fall under a different Bender target. We rename this to `snitch_cluster_sim`. --- Bender.yml | 4 ++-- target/common/common.mk | 2 +- target/snitch_cluster/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bender.yml b/Bender.yml index 29fc783b54..e170ba60d0 100644 --- a/Bender.yml +++ b/Bender.yml @@ -184,9 +184,9 @@ sources: - target/common/test/tb_bin.sv # target/snitch_cluster - - target: snitch_cluster + - target: snitch_cluster_sim files: - target/snitch_cluster/generated/snitch_cluster_wrapper.sv - - target: all(snitch_cluster, any(simulation, verilator)) + - target: all(snitch_cluster_sim, any(simulation, verilator)) files: - target/snitch_cluster/test/testharness.sv diff --git a/target/common/common.mk b/target/common/common.mk index e85817e20c..8f8b419a35 100644 --- a/target/common/common.mk +++ b/target/common/common.mk @@ -47,7 +47,7 @@ VLT_NUM_THREADS ?= 1 MATCH_REMOVE := 's/+incdir+\/[^ ]*//g' SED_SRCS := sed -e ${MATCH_REMOVE} -COMMON_BENDER_FLAGS += -t rtl +COMMON_BENDER_FLAGS += -t rtl -t snitch_cluster VSIM_BENDER += $(COMMON_BENDER_FLAGS) -t test -t simulation -t vsim VSIM_SOURCES = $(shell ${BENDER} script flist ${VSIM_BENDER} | ${SED_SRCS}) diff --git a/target/snitch_cluster/Makefile b/target/snitch_cluster/Makefile index 1a5ab23880..83ba2f7c55 100644 --- a/target/snitch_cluster/Makefile +++ b/target/snitch_cluster/Makefile @@ -66,7 +66,7 @@ $(BIN_DIR): # Simulator options # ##################### -COMMON_BENDER_FLAGS += -t snitch_cluster +COMMON_BENDER_FLAGS += -t snitch_cluster_sim QUESTA_64BIT = -64 VLOG_64BIT = -64