Remove sriracha and generated .sbtopts

.circleci/do-rtl-build.sh

@@ -21,9 +21,6 @@ cd $LOCAL_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
 ./scripts/init-fpga.sh
 
-# replace the workspace dir with a local dir so you can copy around
-sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts
-
 # set stricthostkeychecking to no (must happen before rsync)
 run "echo \"Ping $SERVER\""
 

.circleci/run-firesim-scala-tests.sh

@@ -29,9 +29,6 @@ mkdir -p $local_firesim_sysroot
 ./scripts/build-libdwarf.sh $local_firesim_sysroot
 cd $LOCAL_CHIPYARD_DIR
 
-# replace the workspace dir with a local dir so you can copy around
-sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts
-
 make -C $LOCAL_CHIPYARD_DIR/tools/dromajo/dromajo-src/src
 
 # set stricthostkeychecking to no (must happen before rsync)

.gitignore

@@ -20,4 +20,3 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
-.sbtopts

build.sbt

@@ -156,11 +156,9 @@ lazy val testchipip = (project in file("generators/testchipip"))
   .dependsOn(rocketchip, sifive_blocks)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
-lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHOT"
 
 lazy val chipyard = (project in file("generators/chipyard"))
-  .sourceDependency(testchipip, testchipipLib)
+  .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
-  .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
     sha3, // On separate line to allow for cleaner tutorial-setup patches
     dsptools, `rocket-dsp-utils`,
     gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
@@ -168,14 +166,12 @@ lazy val chipyard = (project in file("generators/chipyard"))
   .settings(commonSettings)
 
 lazy val tracegen = (project in file("generators/tracegen"))
-  .sourceDependency(testchipip, testchipipLib)
+  .dependsOn(testchipip, rocketchip, sifive_cache, boom)
-  .dependsOn(rocketchip, sifive_cache, boom)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
 lazy val icenet = (project in file("generators/icenet"))
-  .sourceDependency(testchipip, testchipipLib)
+  .dependsOn(testchipip, rocketchip)
-  .dependsOn(rocketchip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
@@ -185,8 +181,7 @@ lazy val hwacha = (project in file("generators/hwacha"))
   .settings(commonSettings)
 
 lazy val boom = (project in file("generators/boom"))
-  .sourceDependency(testchipip, testchipipLib)
+  .dependsOn(testchipip, rocketchip)
-  .dependsOn(rocketchip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
@@ -211,8 +206,7 @@ lazy val sha3 = (project in file("generators/sha3"))
   .settings(commonSettings)
 
 lazy val gemmini = (project in file("generators/gemmini"))
-  .sourceDependency(testchipip, testchipipLib)
+  .dependsOn(testchipip, rocketchip, chisel_testers)
-  .dependsOn(rocketchip, chisel_testers)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
@@ -280,7 +274,6 @@ lazy val midas      = ProjectRef(firesimDir, "midas")
 lazy val firesimLib = ProjectRef(firesimDir, "firesimLib")
 
 lazy val firechip = (project in file("generators/firechip"))
-  .sourceDependency(testchipip, testchipipLib)
   .dependsOn(chipyard, midasTargetUtils, midas, firesimLib % "test->test;compile->compile")
   .settings(
     commonSettings,

project/plugins.sbt

@@ -11,5 +11,4 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2")
 addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.3")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
-addSbtPlugin("com.eed3si9n" % "sbt-sriracha" % "0.1.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" )

scripts/init-submodules-no-riscv-tools-nolog.sh

@@ -88,5 +88,3 @@ echo "# line auto-generated by init-submodules-no-riscv-tools.sh" >> env.sh
 echo '__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"' >> env.sh
 echo "PATH=\$__DIR/bin:\$PATH" >> env.sh
 echo "PATH=\$__DIR/software/firemarshal:\$PATH" >> env.sh
-echo "-Dsbt.sourcemode=true" > .sbtopts
-echo "-Dsbt.workspace=$CHIPYARD_DIR/tools"  >> .sbtopts

variables.mk

@@ -6,7 +6,8 @@
 HELP_COMPILATION_VARIABLES = \
 "   JAVA_HEAP_SIZE    = if overridden, set the default java heap size (default is 8G)" \
 "   JAVA_TOOL_OPTIONS = if overridden, set underlying java tool options (default sets misc. sizes and tmp dir)" \
-"   SBT_OPTS          = if overridden, set underlying sbt options (default uses options in .sbtopts)" \
+"   SBT_OPTS          = set additional sbt command line options (these take the form -Dsbt.<option>=<setting>) " \
+"                       See https://www.scala-sbt.org/1.x/docs/Command-Line-Reference.html\#Command+Line+Options" \
 "   SBT_BIN           = if overridden, used to invoke sbt (default is to invoke sbt by sbt-launch.jar)" \
 "   FIRRTL_LOGLEVEL   = if overridden, set firrtl log level (default is error)"
 
@@ -164,12 +165,6 @@ export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -XX:MaxPermSize=256M -D
 #########################################################################################
 # default sbt launch command
 #########################################################################################
-# by default build chisel3/firrtl and other subprojects from source
-SBT_OPTS_FILE := $(base_dir)/.sbtopts
-ifneq (,$(wildcard $(SBT_OPTS_FILE)))
-override SBT_OPTS += $(subst $$PWD,$(base_dir),$(shell cat $(SBT_OPTS_FILE)))
-endif
-
 SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
 
 SBT_THIN_CLIENT_TIMESTAMP = $(base_dir)/project/target/active.json