From 520de19f86cce4a97edd5effcb80ab7f54542110 Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Fri, 16 Aug 2019 11:06:10 -0700 Subject: [PATCH] Make waveforms precious (#204) * Make waveforms precious * Fix typo in run-binary-debug --- common.mk | 2 +- sims/vcs/Makefile | 1 + sims/verilator/Makefile | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 5c33317..3c333c6 100644 --- a/common.mk +++ b/common.mk @@ -93,7 +93,7 @@ run-binary-fast: $(sim) # helper rules to run simulator with as much debug info as possible ######################################################################################### run-binary-debug: $(sim_debug) - (set -o pipefail && $(sim_debug) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAG) $(WAVEFORM_FLAG) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) + (set -o pipefail && $(sim_debug) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAGS) $(WAVEFORM_FLAG) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) run-fast: run-asm-tests-fast run-bmark-tests-fast diff --git a/sims/vcs/Makefile b/sims/vcs/Makefile index fa05531..d897452 100644 --- a/sims/vcs/Makefile +++ b/sims/vcs/Makefile @@ -90,6 +90,7 @@ $(sim_debug) : $(sim_vsrcs) $(sim_common_files) ######################################################################################### # create a vcs vpd rule ######################################################################################### +.PRECIOUS: $(output_dir)/%.vpd %.vpd $(output_dir)/%.vpd: $(output_dir)/% $(sim_debug) $(sim_debug) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAGS) +vcdplusfile=$@ $(PERMISSIVE_OFF) $< diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index d717aa6..77514e2 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -105,6 +105,7 @@ $(sim_debug): $(model_mk_debug) ######################################################################################### # create a verilator vpd rule ######################################################################################### +.PRECIOUS: $(output_dir)/%.vpd %.vcd $(output_dir)/%.vpd: $(output_dir)/% $(sim_debug) rm -f $@.vcd && mkfifo $@.vcd vcd2vpd $@.vcd $@ > /dev/null &