replica
/
firesim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix redundant SBT_FLAGS adding

This commit is contained in:
Howard Mao 2019-07-10 11:39:36 -07:00
parent 9c75e58e20
commit 2d49250ecb
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sim/Makefile
View File

@ -30,15 +30,16 @@ ifdef FIRESIM_STANDALONE
base_dir := $(firesim_base_dir)
SBT ?= sbt
JVM_MEMORY ?= 16G
SBT_FLAGS ?= -J-Xmx$(JVM_MEMORY) ++2.12.4
SCALA_VERSION ?= 2.12.4
SBT_FLAGS ?= -J-Xmx$(JVM_MEMORY) ++$(SCALA_VERSION)
SBT ?= sbt $(SBT_FLAGS)
# Manage the FIRRTL dependency manually
FIRRTL_SUBMODULE_DIR ?= $(firesim_base_dir)/target-rtl/chipyard/tools/firrtl
FIRRTL_JAR ?= $(firesim_base_dir)/target-rtl/chipyard/lib/firrtl.jar
$(FIRRTL_JAR): $(shell find $(FIRRTL_SUBMODULE_DIR)/src/main/scala -iname "*.scala")
$(MAKE) -C $(FIRRTL_SUBMODULE_DIR) SBT="$(SBT) $(SBT_FLAGS)" root_dir=$(FIRRTL_SUBMODULE_DIR) build-scala
$(MAKE) -C $(FIRRTL_SUBMODULE_DIR) SBT="$(SBT)" root_dir=$(FIRRTL_SUBMODULE_DIR) build-scala
touch $(FIRRTL_SUBMODULE_DIR)/utils/bin/firrtl.jar
mkdir -p $(@D)
cp -p $(FIRRTL_SUBMODULE_DIR)/utils/bin/firrtl.jar $@
@ -62,9 +63,9 @@ compile: $(VERILOG)
# Phony targets for launching the sbt shell and running scalatests
sbt: $(FIRRTL_JAR)
cd $(base_dir) && $(SBT) $(SBT_FLAGS) shell
cd $(base_dir) && $(SBT) shell
test: $(FIRRTL_JAR)
cd $(base_dir) && $(SBT) $(SBT_FLAGS) test
cd $(base_dir) && $(SBT) test
# All target-agnostic firesim recipes are defined here

3
sim/src/main/makefrag/fasedtests/Makefrag
View File

@ -36,8 +36,7 @@ common_chisel_args = $(patsubst $(base_dir)/%,%,$(GENERATED_DIR)) $(DESIGN_PACKA
$(VERILOG) $(HEADER): $(chisel_srcs) $(FIRRTL_JAR)
mkdir -p $(@D)
$(SBT) $(SBT_FLAGS) \
"runMain $(DESIGN_PACKAGE).Generator $(if $(STROBER),strober,midas) $(common_chisel_args)"
$(SBT) "runMain $(DESIGN_PACKAGE).Generator $(if $(STROBER),strober,midas) $(common_chisel_args)"
##########################
# Driver Sources & Flags #

8
sim/src/main/makefrag/firesim/Makefrag
View File

@ -34,8 +34,8 @@ endif
$(VERILOG) $(HEADER): $(SCALA_SOURCES) $(FIRRTL_JAR)
mkdir -p $(@D)
cd $(base_dir) && $(SBT) $(SBT_FLAGS) \
"project $(firesim_sbt_project)" "runMain firesim.firesim.FireSimGenerator $(if $(STROBER),strober,midas) $(common_chisel_args)"
cd $(base_dir) && \
$(SBT) "project $(firesim_sbt_project)" "runMain firesim.firesim.FireSimGenerator $(if $(STROBER),strober,midas) $(common_chisel_args)"
##########################
# Driver Sources & Flags #
@ -56,8 +56,8 @@ CONF_NAME ?= runtime.conf
.PHONY: conf
conf:
mkdir -p $(GENERATED_DIR)
cd $(base_dir) && $(SBT) $(SBT_FLAGS) \
"project $(firesim_sbt_project)" "runMain firesim.firesim.FireSimRuntimeConfGenerator $(CONF_NAME) $(common_chisel_args)"
cd $(base_dir) && \
$(SBT) "project $(firesim_sbt_project)" "runMain firesim.firesim.FireSimRuntimeConfGenerator $(CONF_NAME) $(common_chisel_args)"
################################################################
# SW RTL Simulation Args -- for MIDAS- & FPGA-level Simulation #

3
sim/src/main/makefrag/midasexamples/Makefrag
View File

@ -32,8 +32,7 @@ CONF_NAME ?= runtime.conf
$(VERILOG) $(HEADER): $(chisel_srcs) $(FIRRTL_JAR)
mkdir -p $(@D)
$(SBT) $(SBT_FLAGS) \
"runMain $(DESIGN_PACKAGE).Generator $(if $(STROBER),strober,midas) $(common_chisel_args)"
$(SBT) "runMain $(DESIGN_PACKAGE).Generator $(if $(STROBER),strober,midas) $(common_chisel_args)"
# Remove once runtime conf generation is generalized, and something is always emitted
touch $(GENERATED_DIR)/$(CONF_NAME)

2
sim/target-agnostic.mk
View File

@ -190,7 +190,7 @@ unittest_args = \
EMUL=$(EMUL) \
ROCKETCHIP_DIR=$(rocketchip_dir) \
GEN_DIR=$(unittest_generated_dir) \
SBT="$(SBT) $(SBT_FLAGS)" \
SBT="$(SBT)" \
CONFIG=$(UNITTEST_CONFIG)
run-midas-unittests: $(chisel_srcs)