Merge remote-tracking branch 'origin/dev' into hammer-sim-integration

vcs.mk

@@ -8,12 +8,16 @@ RESET_DELAY ?= 777.7
 
 VCS_CC_OPTS = \
 	-CC "-I$(RISCV)/include" \
-	-CC "-std=c++11"
+	-CC "-I$(dramsim_dir)" \
+	-CC "-std=c++11" \
+	-CC "$(EXTRA_SIM_CC_FLAGS)"
 
 VCS_NONCC_OPTS = \
+	$(dramsim_lib) \
 	$(RISCV)/lib/libfesvr.a \
 	+lint=all,noVCDE,noONGS,noUI \
 	-error=PCWM-L \
+	-error=noZMMCM \
 	-timescale=1ns/10ps \
 	-quiet \
 	-q \
@@ -22,13 +26,15 @@ VCS_NONCC_OPTS = \
 	+vcs+lic+wait \
 	+vc+list \
 	-f $(sim_common_files) \
-	-sverilog \
+	-sverilog +systemverilogext+.sv+.svi+.svh+.svt -assert svaext +libext+.sv \
+	+v2k +verilog2001ext+.v95+.vt+.vp +libext+.v \
 	-debug_pp \
 	+incdir+$(build_dir) \
 	$(sim_vsrcs) \
 	+libext+.v
 
 VCS_DEFINE_OPTS = \
+	+define+VCS \
 	+define+CLOCK_PERIOD=$(CLOCK_PERIOD) \
 	+define+RESET_DELAY=$(RESET_DELAY) \
 	+define+PRINTF_COND=$(TB).printf_cond \