From e5158cbe4c4d9fd7554961a1e26291a08eb4e58b Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Wed, 19 Aug 2020 22:32:47 -0700
Subject: [PATCH] Rename some variables

---
 sims/verilator/Makefile | 10 ++++++----
 vcs.mk                  |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile
index 9965001d..52c78eb6 100644
--- a/sims/verilator/Makefile
+++ b/sims/verilator/Makefile
@@ -80,7 +80,7 @@ TRACING_CFLAGS := $(if $(filter $(VERILATOR_FST_MODE),0),,-DCY_FST_TRACE)
 #----------------------------------------------------------------------------------------
 # we initially had --noassert for performance, but several modules use
 # assertions, including dramsim, so we enable --assert by default
-VMODE := \
+VERILATOR_OPT_FLAGS := \
 	-O3 \
 	--x-assign fast \
 	--x-initial fast \
@@ -92,6 +92,8 @@ VMODE := \
 # a crash, since 1000s of warnings are generated)
 VERILOG_IP_VERILATOR_FLAGS := \
 	--unroll-count 256 \
+	-Werror-PINMISSING \
+	-Werror-IMPLICIT \
 	-Wno-PINCONNECTEMPTY \
 	-Wno-ASSIGNDLY \
 	-Wno-DECLFILENAME \
@@ -122,7 +124,7 @@ PREPROC_DEFINES := \
 
 VERILATOR_NONCC_OPTS = \
 	$(RUNTIME_PROFILING_VFLAGS) \
-	$(VMODE) \
+	$(VERILATOR_OPT_FLAGS) \
 	$(PLATFORM_OPTS) \
 	$(TIMESCALE_OPTS) \
 	$(MAX_WIDTH_OPTS) \
@@ -136,13 +138,13 @@ VERILATOR_NONCC_OPTS = \
 # gcc configuration/optimization
 #----------------------------------------------------------------------------------------
 # -flto slows down compilation on small-memory and breaks on firesim-manager
-CMODE := -O3
+CXX_OPT_FLAGS := -O3
 
 VERILATOR_CXXFLAGS = \
 	$(CXXFLAGS) \
 	$(RUNTIME_PROFILING_CFLAGS) \
 	$(TRACING_CFLAGS) \
-	$(CMODE) \
+	$(CXX_OPT_FLAGS) \
 	-std=c++11 \
 	-D__STDC_FORMAT_MACROS \
 	-DTEST_HARNESS=V$(VLOG_MODEL) \
diff --git a/vcs.mk b/vcs.mk
index daed8af4..ef5761df 100644
--- a/vcs.mk
+++ b/vcs.mk
@@ -15,11 +15,11 @@ RESET_DELAY ?= 777.7
 # gcc configuration/optimization
 #----------------------------------------------------------------------------------------
 # -flto slows down compilation on small-memory and breaks on firesim-manager
-CMODE := -O3 -fbranch-probabilities -march=native
+CXX_OPT_FLAGS := -O3 -fbranch-probabilities -march=native
 
 VCS_CXXFLAGS = \
 	$(CXXFLAGS) \
-	$(CMODE) \
+	$(CXX_OPT_FLAGS) \
 	-I$(RISCV)/include \
 	-I$(dramsim_dir) \
 	-std=c++11 \