From 131cc52cfd68f3d40d9f18a551fbe5931707a85b Mon Sep 17 00:00:00 2001 From: Thomas Benz Date: Thu, 5 Oct 2023 09:56:36 +0200 Subject: [PATCH] properly set sefine for verilator --- idma.mk | 5 +++-- src/backend/idma_error_handler.sv | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/idma.mk b/idma.mk index 5984de15..c13ea39e 100644 --- a/idma.mk +++ b/idma.mk @@ -316,9 +316,10 @@ IDMA_VLT_PARAMS ?= .PRECIOUS: $(IDMA_VLT_DIR)/%_elab.log -$(IDMA_VLT_DIR)/%_elab.log: $(IDMA_PICKLE_DIR)/$(IDMA_VLT_TOP).sv +$(IDMA_VLT_DIR)/%_elab.log: $(IDMA_PICKLE_DIR)/sources.json mkdir -p $(IDMA_VLT_DIR) - cd $(IDMA_VLT_DIR); $(VERILATOR) $(IDMA_VLT_ARGS) $(IDMA_VLT_PARAMS) -Mdir obj_$* ../../../$^ --top-module $(IDMA_VLT_TOP) 2> $*_elab.log + $(MORTY) -f $< -i --top $(IDMA_VLT_TOP) -DVERILATOR --propagate_defines -o $(IDMA_VLT_DIR)/$(IDMA_VLT_TOP).sv + 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_verilator_clean: rm -rf $(IDMA_VLT_DIR)/obj_* diff --git a/src/backend/idma_error_handler.sv b/src/backend/idma_error_handler.sv index 75734d47..c8eb8968 100644 --- a/src/backend/idma_error_handler.sv +++ b/src/backend/idma_error_handler.sv @@ -300,9 +300,7 @@ module idma_error_handler #( // the counter is 0 -> no transfer in the datapath. This is an impossible // state end else begin - `IDMA_NONSYNTH_BLOCK(\ - `ASSERT_NEVER(inactive_tf_wait, 1'b1, clk_i, !rst_ni)\ - ) + `ASSERT_NEVER(inactive_tf_wait, 1'b1, clk_i, !rst_ni) end end end @@ -335,9 +333,7 @@ module idma_error_handler #( // the counter is 0 -> no transfer in the datapath. This is an impossible // state end else begin - `IDMA_NONSYNTH_BLOCK(\ - `ASSERT_NEVER(inactive_tf_wait_last_w, 1'b1, clk_i, !rst_ni)\ - ) + `ASSERT_NEVER(inactive_tf_wait_last_w, 1'b1, clk_i, !rst_ni) end end end