diff --git a/common.mk b/common.mk index bd263b1d..8770683e 100644 --- a/common.mk +++ b/common.mk @@ -16,6 +16,7 @@ HELP_COMPILATION_VARIABLES += \ " EXTRA_SIM_LDFLAGS = additional LDFLAGS for building simulators" \ " EXTRA_SIM_SOURCES = additional simulation sources needed for simulator" \ " EXTRA_SIM_REQS = additional make requirements to build the simulator" \ +" EXTRA_SIM_OUT_NAME = additional suffix appended to the simulation .out log filename" \ " ENABLE_CUSTOM_FIRRTL_PASS = if set, enable custom firrtl passes (SFC lowers to LowFIRRTL & MFC converts to Verilog)" \ " ENABLE_YOSYS_FLOW = if set, add compilation flags to enable the vlsi flow for yosys(tutorial flow)" \ " EXTRA_CHISEL_OPTIONS = additional options to pass to the Chisel compiler" \ diff --git a/generators/rocket-gpu b/generators/rocket-gpu index 77e740d9..080bfd70 160000 --- a/generators/rocket-gpu +++ b/generators/rocket-gpu @@ -1 +1 @@ -Subproject commit 77e740d990674bda1e1e7fabf261f28a0a0985a2 +Subproject commit 080bfd706b09033a4996052d8ede25af00116507 diff --git a/sims/vcs/vcs.mk b/sims/vcs/vcs.mk index 9913481c..3876a43d 100644 --- a/sims/vcs/vcs.mk +++ b/sims/vcs/vcs.mk @@ -36,6 +36,7 @@ VCS_CC_OPTS = \ $(filter -l%,$(VCS_LDFLAGS)) VCS_NONCC_OPTS = \ + -j36 \ -notice \ -line \ +lint=all,noVCDE,noONGS,noUI,noPCTIO-L,noPCTI-L \ diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index d90c4c38..12c793b0 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -195,13 +195,13 @@ model_mk_debug = $(model_dir_debug)/V$(TB).mk $(model_mk): $(sim_common_files) $(EXTRA_SIM_REQS) rm -rf $(model_dir) mkdir -p $(model_dir) - $(VERILATOR) $(VERILATOR_OPTS) $(EXTRA_SIM_SOURCES) -o $(sim) -Mdir $(model_dir) + $(VERILATOR) -j 36 $(VERILATOR_OPTS) $(EXTRA_SIM_SOURCES) -o $(sim) -Mdir $(model_dir) touch $@ $(model_mk_debug): $(sim_common_files) $(EXTRA_SIM_REQS) rm -rf $(model_dir_debug) mkdir -p $(model_dir_debug) - $(VERILATOR) $(VERILATOR_OPTS) +define+DEBUG $(EXTRA_SIM_SOURCES) -o $(sim_debug) $(TRACING_OPTS) -Mdir $(model_dir_debug) + $(VERILATOR) -j 36 $(VERILATOR_OPTS) +define+DEBUG $(EXTRA_SIM_SOURCES) -o $(sim_debug) $(TRACING_OPTS) -Mdir $(model_dir_debug) touch $@ #########################################################################################