From fd5a00a0ab9d2fa8635e6a9566afd6662417c2a3 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Mon, 15 Jul 2019 10:58:41 -0700
Subject: [PATCH] rename sim dirs | add "fast" helper target | re-add -q flag

---
 common.mk                                | 5 ++++-
 sims/{vsim => vcs}/.gitignore            | 0
 sims/{vsim => vcs}/Makefile              | 1 +
 sims/{verisim => verilator}/.gitignore   | 0
 sims/{verisim => verilator}/Makefile     | 0
 sims/{verisim => verilator}/verilator.mk | 0
 6 files changed, 5 insertions(+), 1 deletion(-)
 rename sims/{vsim => vcs}/.gitignore (100%)
 rename sims/{vsim => vcs}/Makefile (99%)
 rename sims/{verisim => verilator}/.gitignore (100%)
 rename sims/{verisim => verilator}/Makefile (100%)
 rename sims/{verisim => verilator}/verilator.mk (100%)

diff --git a/common.mk b/common.mk
index 5f9d04cb..0c94a669 100644
--- a/common.mk
+++ b/common.mk
@@ -73,11 +73,14 @@ $(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR): $(HARNESS_SMEMS_CONF)
 verilog: $(sim_vsrcs)
 
 #########################################################################################
-# helper rules to run simulator
+# helper rules to run simulations
 #########################################################################################
+.PHONY: run-binary run-fast
 run-binary: $(sim)
 	(set -o pipefail && $(sim) $(PERMISSIVE_ON) $(SIM_FLAGS) $(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
+
 #########################################################################################
 # run assembly/benchmarks rules
 #########################################################################################
diff --git a/sims/vsim/.gitignore b/sims/vcs/.gitignore
similarity index 100%
rename from sims/vsim/.gitignore
rename to sims/vcs/.gitignore
diff --git a/sims/vsim/Makefile b/sims/vcs/Makefile
similarity index 99%
rename from sims/vsim/Makefile
rename to sims/vcs/Makefile
index 88aaed1e..fcf6ed7c 100644
--- a/sims/vsim/Makefile
+++ b/sims/vcs/Makefile
@@ -54,6 +54,7 @@ VCS_NONCC_OPTS = \
 	-error=PCWM-L \
 	-timescale=1ns/10ps \
 	-quiet \
+	-q \
 	+rad \
 	+v2k \
 	+vcs+lic+wait \
diff --git a/sims/verisim/.gitignore b/sims/verilator/.gitignore
similarity index 100%
rename from sims/verisim/.gitignore
rename to sims/verilator/.gitignore
diff --git a/sims/verisim/Makefile b/sims/verilator/Makefile
similarity index 100%
rename from sims/verisim/Makefile
rename to sims/verilator/Makefile
diff --git a/sims/verisim/verilator.mk b/sims/verilator/verilator.mk
similarity index 100%
rename from sims/verisim/verilator.mk
rename to sims/verilator/verilator.mk