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

Cleanly reload proj. defs. with thin client support

Browse Source
This commit is contained in:
abejgonzalez
2020-12-02 12:18:12 -08:00
parent 5bc7e6cd68
commit 4e53dc1e66
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -21,3 +21,4 @@ env-riscv-tools.sh
env-esp-tools.sh env-esp-tools.sh
.bloop/ .bloop/
.bsp/ .bsp/
*_TIMESTAMP

18
common.mk
View File

@@ -69,9 +69,20 @@ SBT_SOURCES = $(call lookup_srcs,$(SBT_SOURCE_DIRS),sbt) $(base_dir)/build.sbt $
# Bloop Project Definitions # Bloop Project Definitions
######################################################################################### #########################################################################################
$(BLOOP_CONFIG_DIR)/TIMESTAMP: $(SBT_SOURCES) $(BLOOP_CONFIG_DIR)/TIMESTAMP: $(SBT_SOURCES)
cd $(base_dir) && $(SBT) "project chipyardRoot" "bloopInstall" cd $(base_dir) && $(SBT) ";project chipyardRoot; bloopInstall"
touch $@ touch $@
#########################################################################################
# SBT Server Setup (needed to rebuild project correctly)
#########################################################################################
$(SBT_THIN_CLIENT_TIMESTAMP): $(SBT_SOURCES)
ifneq (,$(wildcard $(SBT_THIN_CLIENT_TIMESTAMP)))
cd $(base_dir) && $(SBT) "reload"
touch $@
else
touch $@
endif
######################################################################################### #########################################################################################
# create list of simulation file inputs # create list of simulation file inputs
######################################################################################### #########################################################################################
@@ -226,9 +237,10 @@ $(dramsim_lib):
launch-sbt: launch-sbt:
cd $(base_dir) && $(SBT) cd $(base_dir) && $(SBT)
.PHONY: launch-sbt .PHONY: shutdown-sbt
shutdown-sbt: shutdown-sbt:
cd $(base_dir) && $(SBT) shutdown cd $(base_dir) && $(SBT) "shutdown"
rm -rf $(SBT_THIN_CLIENT_TIMESTAMP)
######################################################################################### #########################################################################################
# print help text # print help text

7
variables.mk
View File

@@ -154,7 +154,12 @@ JAVA_OPTS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -XX:MaxPermSize=256M
# by default build chisel3/firrtl and other subprojects from source # by default build chisel3/firrtl and other subprojects from source
override SBT_OPTS += -Dsbt.sourcemode=true -Dsbt.workspace=$(base_dir)/tools override SBT_OPTS += -Dsbt.sourcemode=true -Dsbt.workspace=$(base_dir)/tools
SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
SBT_THIN_CLIENT_TIMESTAMP = $(base_dir)/SBT_TIMESTAMP
ifdef ENABLE_SBT_THIN_CLIENT ifdef ENABLE_SBT_THIN_CLIENT
override SCALA_BUILDTOOL_DEPS += $(SBT_THIN_CLIENT_TIMESTAMP)
# enabling speeds up sbt loading # enabling speeds up sbt loading
# however if build.sbt changes are done you need to # however if build.sbt changes are done you need to
# "shutdown" the server (shutdown-sbt target) to reload build.sbt changes # "shutdown" the server (shutdown-sbt target) to reload build.sbt changes
@@ -168,8 +173,6 @@ BLOOP_CONFIG_DIR ?= $(base_dir)/.bloop
# This mirrors the bloop default. Set to a system-unique port in a multi-user environment # This mirrors the bloop default. Set to a system-unique port in a multi-user environment
BLOOP_NAILGUN_PORT ?= 8212 BLOOP_NAILGUN_PORT ?= 8212
SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
ifdef ENABLE_BLOOP ifdef ENABLE_BLOOP
override SCALA_BUILDTOOL_DEPS += $(BLOOP_CONFIG_DIR)/TIMESTAMP override SCALA_BUILDTOOL_DEPS += $(BLOOP_CONFIG_DIR)/TIMESTAMP
# Two notes about the bloop invocation: # Two notes about the bloop invocation: