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

[make] Move firesim-as-top handling of bloop into Makefile

This commit is contained in:
David Biancolin 2020-06-21 23:20:33 +00:00
parent f6fe209f6e
commit 2130716105
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sim/Makefile
View File

@ -39,12 +39,14 @@ JVM_MEMORY ?= 16G
SCALA_VERSION ?= 2.12.10
JAVA_ARGS ?= -Xmx$(JVM_MEMORY)
SBT ?= java $(JAVA_ARGS) -jar $(rocketchip_dir)/sbt-launch.jar
BLOOP ?= bloop
BLOOP_CONFIG_DIR ?= $(base_dir)/.bloop
SCALA_BUILDTOOL_DEPS ?= build.sbt
ifdef FIRESIM_USE_BLOOP
override SCALA_BUILDTOOL_DEPS += .bloop/TIMESTAMP
ifdef ENABLE_BLOOP
override SCALA_BUILDTOOL_DEPS += $(BLOOP_CONFIG_DIR)/TIMESTAMP
define run_scala_main
bloop run $(shell echo $(1) | sed 's/{.*}//') --main $(2) -- $(3)
endef
@ -54,6 +56,12 @@ define run_scala_main
endef
endif
#########################
# Bloop Project Defs #
#########################
$(BLOOP_CONFIG_DIR)/TIMESTAMP: build.sbt
cd $(base_dir) && $(SBT) "project $(firesim_sbt_project)" "bloopInstall"
touch $@
# Manage the FIRRTL dependency manually
FIRRTL_SUBMODULE_DIR ?= $(chipyard_dir)/tools/firrtl

7
sim/target-agnostic.mk
View File

@ -254,13 +254,6 @@ run-midas-unittests: $(chisel_srcs)
run-midas-unittests-debug: $(chisel_srcs)
$(MAKE) -f $(simif_dir)/unittest/Makefrag $@ $(unittest_args)
#########################
# Bloop Project Defs #
#########################
.bloop/TIMESTAMP : build.sbt
cd $(base_dir) && $(SBT) "project $(firesim_sbt_project)" "bloopInstall"
touch $@
#########################
# ScalaDoc #
#########################