From d0079a96599f2fa545e37e10ea459ba4e30fb672 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 3 Dec 2020 14:06:55 -0800
Subject: [PATCH] Cleanup helper sbt targets | Use project/target/active.json
 for SBT timestamp

---
 .gitignore   |  1 -
 common.mk    | 17 +++++++++++------
 sims/firesim |  2 +-
 variables.mk |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a80f88ab..257d2c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,3 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
-*_TIMESTAMP
diff --git a/common.mk b/common.mk
index 159e7ea6..a474454a 100644
--- a/common.mk
+++ b/common.mk
@@ -66,14 +66,14 @@ SBT_SOURCE_DIRS = $(addprefix $(base_dir)/,generators sims/firesim/sim tools)
 SBT_SOURCES = $(call lookup_srcs,$(SBT_SOURCE_DIRS),sbt) $(base_dir)/build.sbt $(base_dir)/project/plugins.sbt $(base_dir)/project/build.properties
 
 #########################################################################################
-# SBT Server Setup (needed to rebuild project correctly)
+# SBT Server Setup (start server / rebuild proj. defs. if SBT_SOURCES change)
 #########################################################################################
 $(SBT_THIN_CLIENT_TIMESTAMP): $(SBT_SOURCES)
 ifneq (,$(wildcard $(SBT_THIN_CLIENT_TIMESTAMP)))
 	cd $(base_dir) && $(SBT) "reload"
 	touch $@
 else
-	touch $@
+	cd $(base_dir) && $(SBT) "exit"
 endif
 
 #########################################################################################
@@ -223,18 +223,23 @@ $(dramsim_lib):
 	$(MAKE) -C $(dramsim_dir) $(notdir $@)
 
 ################################################
-# Helper to run SBT or shutdown the SBT server
+# Helper to run SBT or manage the SBT server
 ################################################
 
+SBT_COMMAND ?= shell
 .PHONY: launch-sbt
 launch-sbt:
-	cd $(base_dir) && $(SBT)
+	cd $(base_dir) && $(SBT_NON_THIN) "$(SBT_COMMAND)"
 
-.PHONY: shutdown-sbt
-shutdown-sbt:
+.PHONY: shutdown-sbt-server
+shutdown-sbt-server:
 	cd $(base_dir) && $(SBT) "shutdown"
 	rm -rf $(SBT_THIN_CLIENT_TIMESTAMP)
 
+.PHONY: start-sbt-server
+start-sbt-server:
+	cd $(base_dir) && $(SBT) "exit"
+
 #########################################################################################
 # print help text
 #########################################################################################
diff --git a/sims/firesim b/sims/firesim
index 515ac120..6dc98f6c 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 515ac12059a347f34b13833888ace941a9629be5
+Subproject commit 6dc98f6cff25b348d3e2bf72fa17f2348c816b2f
diff --git a/variables.mk b/variables.mk
index c8f72b3f..88ba73ee 100644
--- a/variables.mk
+++ b/variables.mk
@@ -156,7 +156,7 @@ override SBT_OPTS += -Dsbt.sourcemode=true -Dsbt.workspace=$(base_dir)/tools
 
 SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
 
-SBT_THIN_CLIENT_TIMESTAMP = $(base_dir)/SBT_TIMESTAMP
+SBT_THIN_CLIENT_TIMESTAMP = $(base_dir)/project/target/active.json
 
 ifdef ENABLE_SBT_THIN_CLIENT
 override SCALA_BUILDTOOL_DEPS += $(SBT_THIN_CLIENT_TIMESTAMP)
@@ -165,6 +165,7 @@ SBT_CLIENT_FLAG = --client
 endif
 
 SBT ?= java $(JAVA_OPTS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS) $(SBT_CLIENT_FLAG)
+SBT_NON_THIN ?= $(subst $(SBT_CLIENT_FLAG),,$(SBT))
 
 define run_scala_main
 	cd $(base_dir) && $(SBT) ";project $(1); runMain $(2) $(3)"