diff --git a/idma.mk b/idma.mk index fb7f8a9e..9a350dfd 100644 --- a/idma.mk +++ b/idma.mk @@ -384,6 +384,8 @@ IDMA_VLT_ARGS := --cc \ IDMA_VLT_TOP ?= IDMA_VLT_PARAMS ?= +IDMA_VLT_TEST_DIR := $(IDMA_ROOT)/test/backend + .PRECIOUS: $(IDMA_VLT_DIR)/%_elab.log $(IDMA_VLT_DIR)/%_elab.log: $(IDMA_PICKLE_DIR)/sources.json @@ -399,9 +401,8 @@ $(IDMA_VLT_DIR)/%_elab.log: $(IDMA_PICKLE_DIR)/sources.json rm -f $(IDMA_VLT_DIR)/$(IDMA_VLT_TOP).sv.pre cd $(IDMA_VLT_DIR); $(VERILATOR) $(IDMA_VLT_ARGS) $(IDMA_VLT_PARAMS) -Mdir obj_$* $(IDMA_VLT_TOP).sv --top-module $(IDMA_VLT_TOP) 2> $*_elab.log -$(IDMA_VLT_DIR)/idma.f: Bender.yml - mkdir -p $(IDMA_VLT_DIR) - $(BENDER) script verilator -t rtl -t idma_simulation -t snitch_cluster -t verilator -t verilator_test -DSYNTHESIS -DVERILATOR > $@ +$(IDMA_VLT_TEST_DIR)/idma.f: Bender.yml + $(BENDER) script verilator -t rtl -t idma_simulation -t snitch_cluster -t verilator -t verilator_test > $@ idma_verilator_clean: rm -rf $(IDMA_VLT_DIR) @@ -486,6 +487,6 @@ idma_pickle_all: $(IDMA_PICKLE_ALL) idma_hw_all: $(IDMA_FULL_RTL) $(IDMA_INCLUDE_ALL) $(IDMA_FULL_TB) $(IDMA_HJSON_ALL) $(IDMA_WAVE_ALL) -idma_sim_all: $(IDMA_VCS_DIR)/compile.sh $(IDMA_VSIM_DIR)/compile.tcl $(IDMA_VLT_DIR)/idma.f +idma_sim_all: $(IDMA_VCS_DIR)/compile.sh $(IDMA_VSIM_DIR)/compile.tcl $(IDMA_VLT_TEST_DIR)/idma.f idma_all: idma_hw_all idma_sim_all idma_doc_all idma_pickle_all diff --git a/target/.gitignore b/target/.gitignore index e8ac3ac6..dd06202b 100644 --- a/target/.gitignore +++ b/target/.gitignore @@ -1,5 +1,3 @@ doc morty -sim/verilator/* -!sim/verilator/driver.cpp -!sim/verilator/idma.sh +sim/verilator diff --git a/test/backend/.gitignore b/test/backend/.gitignore new file mode 100644 index 00000000..2c271ac4 --- /dev/null +++ b/test/backend/.gitignore @@ -0,0 +1,3 @@ +obj_dir +*.f +*.vcd diff --git a/target/sim/verilator/driver.cpp b/test/backend/driver.cpp similarity index 100% rename from target/sim/verilator/driver.cpp rename to test/backend/driver.cpp diff --git a/target/sim/verilator/idma.sh b/test/backend/idma.sh similarity index 100% rename from target/sim/verilator/idma.sh rename to test/backend/idma.sh diff --git a/test/backend/tb_idma_backend.sv b/test/backend/tb_idma_backend.sv index 75b39595..453950d0 100644 --- a/test/backend/tb_idma_backend.sv +++ b/test/backend/tb_idma_backend.sv @@ -16,7 +16,6 @@ `include "obi/typedef.svh" `endif -`include "memory_types.svh" `include "idma/typedef.svh" `ifndef BACKEND_NAME