From 87e4090e3861251d02322fca63648153f5ed2619 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 8 Jul 2019 14:31:41 -0700 Subject: [PATCH] bump boom | correct error on first cmd in pipe --- common.mk | 4 ++-- generators/boom | 2 +- sims/verisim/Makefile | 2 +- sims/vsim/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.mk b/common.mk index 310da07c..1b0d139d 100644 --- a/common.mk +++ b/common.mk @@ -76,7 +76,7 @@ verilog: $(sim_vsrcs) # helper rules to run simulator ######################################################################################### run-binary: $(sim) - $(sim) $(PERMISSIVE_ON) $(SIM_FLAGS) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out + (set -o pipefail && $(sim) $(PERMISSIVE_ON) $(SIM_FLAGS) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) ######################################################################################### # run assembly/benchmarks rules @@ -89,7 +89,7 @@ $(output_dir)/%.run: $(output_dir)/% $(sim) $(sim) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(PERMISSIVE_OFF) $< && touch $@ $(output_dir)/%.out: $(output_dir)/% $(sim) - $(sim) $(PERMISSIVE_ON) +verbose +max-cycles=$(timeout_cycles) $(PERMISSIVE_OFF) $< 3>&1 1>&2 2>&3 | spike-dasm > $@ + (set -o pipefail && $(sim) $(PERMISSIVE_ON) +verbose +max-cycles=$(timeout_cycles) $(PERMISSIVE_OFF) $< 3>&1 1>&2 2>&3 | spike-dasm > $@) ######################################################################################### # include build/project specific makefrags made from the generator diff --git a/generators/boom b/generators/boom index 80a68074..84879571 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit 80a680745c27dfe54bdd217e8de9c24c1c96b553 +Subproject commit 848795715f721b6a88887283179176474a1496b8 diff --git a/sims/verisim/Makefile b/sims/verisim/Makefile index 655d67cc..629373c8 100644 --- a/sims/verisim/Makefile +++ b/sims/verisim/Makefile @@ -84,7 +84,7 @@ $(sim_debug): $(model_mk_debug) # helper rules to run simulator with debug ######################################################################################### run-binary-debug: $(sim_debug) - $(sim_debug) $(SIM_FLAGS) -v$(sim_out_name).vcd $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out + (set -o pipefail && $(sim_debug) $(SIM_FLAGS) -v$(sim_out_name).vcd $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) ######################################################################################### # create a verisim vpd rule diff --git a/sims/vsim/Makefile b/sims/vsim/Makefile index d34fb5eb..f5882757 100644 --- a/sims/vsim/Makefile +++ b/sims/vsim/Makefile @@ -90,7 +90,7 @@ $(sim_debug) : $(sim_vsrcs) $(sim_dotf) # helper rules to run simulator with debug ######################################################################################### run-binary-debug: $(sim_debug) - $(sim_debug) $(PERMISSIVE_ON) $(SIM_FLAGS) +vcdplusfile=$(sim_out_name).vpd $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out + (set -o pipefail && $(sim_debug) $(PERMISSIVE_ON) $(SIM_FLAGS) +vcdplusfile=$(sim_out_name).vpd $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) ######################################################################################### # create a vcs vpd rule