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

rename files | only remove .h on blackbox files

Browse Source
This commit is contained in:
abejgonzalez
2019-07-16 18:55:44 -07:00
parent 27641bdffc
commit b0b4078801
5 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sims/vcs/Makefile
View File

@@ -61,7 +61,7 @@ VCS_NONCC_OPTS = \
+v2k \
+vcs+lic+wait \
+vc+list \
-f $(sim_files) \
-f $(sim_common_files) \
-sverilog \
+incdir+$(build_dir) \
+define+CLOCK_PERIOD=1.0 \
@@ -79,11 +79,11 @@ VCS_OPTS = -notice -line $(VCS_CC_OPTS) $(VCS_NONCC_OPTS)
#########################################################################################
# vcs simulator rules
#########################################################################################
$(sim): $(sim_vsrcs) $(sim_files)
$(sim): $(sim_vsrcs) $(sim_common_files)
rm -rf csrc && $(VCS) $(VCS_OPTS) -o $@ \
-debug_pp
$(sim_debug) : $(sim_vsrcs) $(sim_files)
$(sim_debug) : $(sim_vsrcs) $(sim_common_files)
rm -rf csrc && $(VCS) $(VCS_OPTS) -o $@ \
+define+DEBUG -debug_pp

21
sims/verilator/Makefile
View File

@@ -56,20 +56,29 @@ model_mk_debug = $(model_dir_debug)/V$(VLOG_MODEL).mk
# build makefile fragment that builds the verilator sim rules
#########################################################################################
LDFLAGS := $(LDFLAGS) -L$(RISCV)/lib -Wl,-rpath,$(RISCV)/lib -L$(sim_dir) -lfesvr -lpthread
SHARED_FLAGS := \
$(sim_vsrcs) \
-f $(sim_common_files) \
-LDFLAGS "$(LDFLAGS)"
$(model_mk): $(sim_vsrcs) $(sim_files) $(INSTALLED_VERILATOR)
$(model_mk): $(sim_vsrcs) $(sim_common_files) $(INSTALLED_VERILATOR)
rm -rf $(build_dir)/$(long_name)
mkdir -p $(build_dir)/$(long_name)
$(VERILATOR) $(VERILATOR_FLAGS) -Mdir $(build_dir)/$(long_name) \
-o $(sim) $(sim_vsrcs) -f $(sim_files) -LDFLAGS "$(LDFLAGS)" \
$(VERILATOR) $(VERILATOR_FLAGS) \
-Mdir $(build_dir)/$(long_name) \
-o $(sim) \
$(SHARED_FLAGS) \
-CFLAGS "-I$(build_dir) -include $(build_dir)/$(long_name).plusArgs -include $(model_header)"
touch $@
$(model_mk_debug): $(sim_vsrcs) $(sim_files) $(INSTALLED_VERILATOR)
$(model_mk_debug): $(sim_vsrcs) $(sim_common_files) $(INSTALLED_VERILATOR)
rm -rf $(build_dir)/$(long_name)
mkdir -p $(build_dir)/$(long_name).debug
$(VERILATOR) $(VERILATOR_FLAGS) -Mdir $(build_dir)/$(long_name).debug --trace \
-o $(sim_debug) $(sim_vsrcs) -f $(sim_files) -LDFLAGS "$(LDFLAGS)" \
$(VERILATOR) $(VERILATOR_FLAGS) \
-Mdir $(build_dir)/$(long_name).debug \
--trace \
-o $(sim_debug) \
$(SHARED_FLAGS) \
-CFLAGS "-I$(build_dir) -include $(build_dir)/$(long_name).plusArgs -include $(model_header_debug)"
touch $@

5
sims/verilator/verilator.mk
View File

@@ -6,7 +6,7 @@
# verilator version, binary, and path
#########################################################################################
VERILATOR_VERSION = 4.016
VERILATOR_INSTALL_DIR ?= verilator
VERILATOR_INSTALL_DIR ?= verilator_install
VERILATOR_SRCDIR = $(VERILATOR_INSTALL_DIR)/src/verilator-$(VERILATOR_VERSION)
INSTALLED_VERILATOR = $(abspath $(VERILATOR_INSTALL_DIR)/install/bin/verilator)
@@ -45,7 +45,8 @@ VERILATOR := $(INSTALLED_VERILATOR) --cc --exe
CXXFLAGS := $(CXXFLAGS) -O1 -std=c++11 -I$(RISCV)/include -D__STDC_FORMAT_MACROS
VERILATOR_FLAGS := --top-module $(VLOG_MODEL) \
+define+PRINTF_COND=\$$c\(\"verbose\",\"\&\&\"\,\"done_reset\"\) \
+define+STOP_COND=\$$c\(\"done_reset\"\) --assert \
+define+STOP_COND=\$$c\(\"done_reset\"\) \
--assert \
--output-split 20000 \
-Wno-STMTDLY --x-assign unique \
-O3 -CFLAGS "$(CXXFLAGS) -DTEST_HARNESS=V$(VLOG_MODEL) -DVERILATOR"