wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Hoist permissive settings out of inner makefiles

Browse Source
This commit is contained in:
Colin Schmidt
2020-05-24 10:31:24 -07:00
parent 29664cdf6a
commit a7119fb5ed
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sims/vcs/Makefile
View File

@@ -25,9 +25,6 @@ sim_prefix = simv
sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG) sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)
sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug
PERMISSIVE_ON=+permissive
PERMISSIVE_OFF=+permissive-off
WAVEFORM_FLAG=+vcdplusfile=$(sim_out_name).vpd WAVEFORM_FLAG=+vcdplusfile=$(sim_out_name).vpd
.PHONY: default debug .PHONY: default debug

3
sims/verilator/Makefile
View File

@@ -28,9 +28,6 @@ sim_prefix = simulator
sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG) sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)
sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug
PERMISSIVE_ON=+permissive
PERMISSIVE_OFF=+permissive-off
WAVEFORM_FLAG=-v$(sim_out_name).vcd WAVEFORM_FLAG=-v$(sim_out_name).vcd
.PHONY: default debug .PHONY: default debug

2
variables.mk
View File

@@ -136,6 +136,8 @@ output_dir=$(sim_dir)/output/$(long_name)
######################################################################################### #########################################################################################
# helper variables to run binaries # helper variables to run binaries
######################################################################################### #########################################################################################
PERMISSIVE_ON=+permissive
PERMISSIVE_OFF=+permissive-off
BINARY ?= BINARY ?=
override SIM_FLAGS += +dramsim +max-cycles=$(timeout_cycles) override SIM_FLAGS += +dramsim +max-cycles=$(timeout_cycles)
VERBOSE_FLAGS ?= +verbose VERBOSE_FLAGS ?= +verbose