From 0a513e45794398fd97f102e720c8365882418e0d Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 1 Dec 2021 21:08:13 +0000
Subject: [PATCH 01/14] Used published dependencies for Chisel & Friends

---
 build.sbt | 103 +++++++++++++++++++-----------------------------------
 1 file changed, 35 insertions(+), 68 deletions(-)

diff --git a/build.sbt b/build.sbt
index b1f7e004..509c67d7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,14 +17,7 @@ lazy val commonSettings = Seq(
   unmanagedBase := (chipyardRoot / unmanagedBase).value,
   allDependencies := {
     // drop specific maven dependencies in subprojects in favor of Chipyard's version
-    val dropDeps = Seq(
-      ("edu.berkeley.cs", "firrtl"),
-      ("edu.berkeley.cs", "chisel3"),
-      ("edu.berkeley.cs", "rocketchip"),
-      ("edu.berkeley.cs", "chisel-iotesters"),
-      ("edu.berkeley.cs", "treadle"),
-      ("edu.berkeley.cs", "firrtl-interpreter"))
-
+    val dropDeps = Seq(("edu.berkeley.cs", "rocketchip"))
     allDependencies.value.filterNot { dep =>
       dropDeps.contains((dep.organization, dep.name))
     }
@@ -67,34 +60,23 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
+val chiselVersion = "3.4.1"
+
+lazy val chiselSettings = Seq(
+  libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion),
+  addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full))
+
+val firrtlVersion = "1.4.1"
+
+lazy val firrtlSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "firrtl" % firrtlVersion))
+
 // Subproject definitions begin
 
 // -- Rocket Chip --
 
-// This needs to stay in sync with the chisel3 and firrtl git submodules
-val chiselVersion = "3.4.1"
-lazy val chiselRef = ProjectRef(workspaceDirectory / "chisel3", "chisel")
-lazy val chiselLib = "edu.berkeley.cs" %% "chisel3" % chiselVersion
-lazy val chiselLibDeps = (chiselRef / Keys.libraryDependencies)
-// While not built from source, *must* be in sync with the chisel3 git submodule
-// Building from source requires extending sbt-sriracha or a similar plugin and
-//   keeping scalaVersion in sync with chisel3 to the minor version
-lazy val chiselPluginLib = "edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full
-
-val firrtlVersion = "1.4.1"
-lazy val firrtlRef = ProjectRef(workspaceDirectory / "firrtl", "firrtl")
-lazy val firrtlLib = "edu.berkeley.cs" %% "firrtl" % firrtlVersion
-val firrtlLibDeps = settingKey[Seq[sbt.librarymanagement.ModuleID]]("FIRRTL Library Dependencies sans antlr4")
-Global / firrtlLibDeps := {
-  // drop antlr4 compile dep. but keep antlr4-runtime dep. (compile needs the plugin to be setup)
-  (firrtlRef / Keys.libraryDependencies).value.filterNot(_.name == "antlr4")
-}
-
- // Rocket-chip dependencies (subsumes making RC a RootProject)
+// Rocket-chip dependencies (subsumes making RC a RootProject)
 lazy val hardfloat  = (project in rocketChipDir / "hardfloat")
-  .sourceDependency(chiselRef, chiselLib)
-  .settings(addCompilerPlugin(chiselPluginLib))
-  .settings(libraryDependencies ++= chiselLibDeps.value)
+  .settings(chiselSettings)
   .dependsOn(midasTargetUtils)
   .settings(commonSettings)
   .settings(
@@ -126,11 +108,8 @@ lazy val rocketConfig = (project in rocketChipDir / "api-config-chipsalliance/bu
   )
 
 lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
-  .sourceDependency(chiselRef, chiselLib)
-  .settings(addCompilerPlugin(chiselPluginLib))
-  .settings(libraryDependencies ++= chiselLibDeps.value)
   .dependsOn(hardfloat, rocketMacros, rocketConfig)
-  .settings(commonSettings)
+  .settings(commonSettings, chiselSettings)
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
@@ -145,29 +124,27 @@ lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
   )
 lazy val rocketLibDeps = (rocketchip / Keys.libraryDependencies)
 
+
 // -- Chipyard-managed External Projects --
 
-lazy val firrtl_interpreter = (project in file("tools/firrtl-interpreter"))
-  .sourceDependency(firrtlRef, firrtlLib)
-  .settings(commonSettings)
-  .settings(libraryDependencies ++= (Global / firrtlLibDeps).value)
-lazy val firrtlInterpreterLibDeps = (firrtl_interpreter / Keys.libraryDependencies)
-
-lazy val treadle = (project in file("tools/treadle"))
-  .sourceDependency(firrtlRef, firrtlLib)
-  .settings(commonSettings)
-  .settings(libraryDependencies ++= (Global / firrtlLibDeps).value)
-lazy val treadleLibDeps = (treadle / Keys.libraryDependencies)
+// Because we're not using a release version of iotesters to work around a
+// scala test version problem, override it's libdeps to prevent using snapshots
+lazy val chipyardMandatedVersions = Map(
+  "chisel-iotesters" -> "1.5.4",
+  "firrtl-interpreter" -> "1.4.4",
+  "treadle" -> "1.3.4",
+  "chisel3" -> chiselVersion,
+  "firrtl" -> firrtlVersion
+)
 
 lazy val chisel_testers = (project in file("tools/chisel-testers"))
-  .sourceDependency(chiselRef, chiselLib)
-  .settings(addCompilerPlugin(chiselPluginLib))
-  .settings(libraryDependencies ++= chiselLibDeps.value)
-  .dependsOn(firrtl_interpreter, treadle)
-  .settings(libraryDependencies ++= firrtlInterpreterLibDeps.value)
-  .settings(libraryDependencies ++= treadleLibDeps.value)
-  .settings(commonSettings)
-lazy val chiselTestersLibDeps = (chisel_testers / Keys.libraryDependencies)
+  .settings(chiselSettings)
+  .settings(
+    allDependencies := allDependencies.value.map {
+      case dep if chipyardMandatedVersions.isDefinedAt(dep.name) =>
+        dep.organization %% dep.name % chipyardMandatedVersions(dep.name)
+      case o => o
+    })
 
 // -- Normal Projects --
 
@@ -231,14 +208,12 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
 lazy val sha3 = (project in file("generators/sha3"))
   .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
   .settings(commonSettings)
 
 lazy val gemmini = (project in file("generators/gemmini"))
   .sourceDependency(testchipip, testchipipLib)
   .dependsOn(rocketchip, chisel_testers)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
   .settings(commonSettings)
 
 lazy val nvdla = (project in file("generators/nvdla"))
@@ -247,39 +222,31 @@ lazy val nvdla = (project in file("generators/nvdla"))
   .settings(commonSettings)
 
 lazy val iocell = (project in file("./tools/barstools/iocell/"))
-  .sourceDependency(chiselRef, chiselLib)
-  .settings(addCompilerPlugin(chiselPluginLib))
-  .settings(libraryDependencies ++= chiselLibDeps.value)
+  .settings(chiselSettings)
   .settings(commonSettings)
 
 lazy val tapeout = (project in file("./tools/barstools/tapeout/"))
   .dependsOn(chisel_testers, chipyard) // must depend on chipyard to get scala resources
-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
   .settings(commonSettings)
 
 lazy val mdf = (project in file("./tools/barstools/mdf/scalalib/"))
   .settings(commonSettings)
 
 lazy val barstoolsMacros = (project in file("./tools/barstools/macros/"))
-  .sourceDependency(chiselRef, chiselLib)
-  .settings(addCompilerPlugin(chiselPluginLib))
-  .settings(libraryDependencies ++= chiselLibDeps.value)
-  .dependsOn(firrtl_interpreter, mdf, chisel_testers)
-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
-  .settings(libraryDependencies ++= firrtlInterpreterLibDeps.value)
+  .dependsOn(mdf)
   .enablePlugins(sbtassembly.AssemblyPlugin)
+  .settings(firrtlSettings)
   .settings(commonSettings)
 
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
   .dependsOn(chisel_testers)
-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
   .settings(
     commonSettings,
     libraryDependencies ++= Seq(
+      "org.scalatest" %% "scalatest" % "3.2.+" % "test",
       "org.typelevel" %% "spire" % "0.16.2",
       "org.scalanlp" %% "breeze" % "1.1",
       "junit" % "junit" % "4.13" % "test",
-      "org.scalatest" %% "scalatest" % "3.0.+" % "test",
       "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
   ))
 

From 5886a848852735ca5736cc3e17b0dd8d75405aea Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 1 Dec 2021 21:29:05 +0000
Subject: [PATCH 02/14] Bump FireSim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index cd13db4f..7591ff12 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit cd13db4f2006d47bf71c593b0255b32c6a0bbec5
+Subproject commit 7591ff12cf7e7afc8ae0f0d6369404ec18411621

From 804e3de41c6a5b845ef4713acf5c0dc9f8b13773 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 1 Dec 2021 23:16:03 +0000
Subject: [PATCH 03/14] Revert "Force FIRRTL 1.4.1"

This reverts commit 7d244d635c5f02512e8e9a3d2c0a057fdd4b0bd1.
---
 variables.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/variables.mk b/variables.mk
index d5f5cb41..9ba9f4a3 100644
--- a/variables.mk
+++ b/variables.mk
@@ -169,10 +169,6 @@ SBT_OPTS_FILE := $(base_dir)/.sbtopts
 ifneq (,$(wildcard $(SBT_OPTS_FILE)))
 override SBT_OPTS += $(subst $$PWD,$(base_dir),$(shell cat $(SBT_OPTS_FILE)))
 endif
-# Workaround: Specify a firrtl version in system properties so that Treadle uses a
-# compatible version of FIRRTL and not 1.5-SNAPSHOT (which is the default
-# specified in it's build.sbt, and is not overridden by Chipyard's build.sbt)
-override SBT_OPTS += -DfirrtlVersion=1.4.1
 
 SCALA_BUILDTOOL_DEPS = $(SBT_SOURCES)
 

From a2d88c714094ddb5ff1c0cdfea57782a4effb52d Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Sat, 4 Dec 2021 20:10:53 +0000
Subject: [PATCH 04/14] Update tutorial patches

---
 scripts/tutorial-patches/build.sbt.patch | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index dd26bcc9..bdbb3a7e 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -1,8 +1,8 @@
 diff --git a/build.sbt b/build.sbt
-index b1f7e004..f39c3712 100644
+index c38f5180..551aa8c0 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -184,7 +184,7 @@ lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHO
+@@ -169,7 +169,7 @@ lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHO
  lazy val chipyard = (project in file("generators/chipyard"))
    .sourceDependency(testchipip, testchipipLib)
    .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
@@ -11,19 +11,17 @@ index b1f7e004..f39c3712 100644
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
    .settings(libraryDependencies ++= rocketLibDeps.value)
-@@ -228,11 +228,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -213,10 +213,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
  
 -lazy val sha3 = (project in file("generators/sha3"))
 -  .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
 -  .settings(libraryDependencies ++= rocketLibDeps.value)
--  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
 -  .settings(commonSettings)
 +//lazy val sha3 = (project in file("generators/sha3"))
 +//  .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
 +//  .settings(libraryDependencies ++= rocketLibDeps.value)
-+//  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
 +//  .settings(commonSettings)
  
  lazy val gemmini = (project in file("generators/gemmini"))

From a5b412cfbcae3ed8237aab964bb03ef7ee9f4188 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Mon, 6 Dec 2021 23:36:13 +0000
Subject: [PATCH 05/14] Remove sriracha and generated .sbtopts

---
 .circleci/do-rtl-build.sh                       |  3 ---
 .circleci/run-firesim-scala-tests.sh            |  3 ---
 .gitignore                                      |  1 -
 build.sbt                                       | 17 +++++------------
 project/plugins.sbt                             |  1 -
 scripts/init-submodules-no-riscv-tools-nolog.sh |  2 --
 variables.mk                                    |  9 ++-------
 7 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
index 95f3c903..3a537ea3 100755
--- a/.circleci/do-rtl-build.sh
+++ b/.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\""
 
diff --git a/.circleci/run-firesim-scala-tests.sh b/.circleci/run-firesim-scala-tests.sh
index 0a74adb8..022894f2 100755
--- a/.circleci/run-firesim-scala-tests.sh
+++ b/.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)
diff --git a/.gitignore b/.gitignore
index 7c0f02bf..257d2c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,3 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
-.sbtopts
diff --git a/build.sbt b/build.sbt
index 509c67d7..d44a9243 100644
--- a/build.sbt
+++ b/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(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
+  .dependsOn(testchipip, 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(rocketchip, sifive_cache, boom)
+  .dependsOn(testchipip, rocketchip, sifive_cache, boom)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
 lazy val icenet = (project in file("generators/icenet"))
-  .sourceDependency(testchipip, testchipipLib)
-  .dependsOn(rocketchip)
+  .dependsOn(testchipip, 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(rocketchip)
+  .dependsOn(testchipip, 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(rocketchip, chisel_testers)
+  .dependsOn(testchipip, 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,
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7e6f3aa8..026b95e9 100644
--- a/project/plugins.sbt
+++ b/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" )
diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
index 743ea198..967c4ba7 100755
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/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
diff --git a/variables.mk b/variables.mk
index 9ba9f4a3..dd40f565 100644
--- a/variables.mk
+++ b/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

From 6f8a199cf0bc576da8a78e58868747345fdce931 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Mon, 6 Dec 2021 23:39:03 +0000
Subject: [PATCH 06/14] Remove chisel3, firrtl. firrt-intp, treadle submodules

---
 .gitmodules              | 12 ------------
 tools/chisel3            |  1 -
 tools/firrtl             |  1 -
 tools/firrtl-interpreter |  1 -
 tools/treadle            |  1 -
 5 files changed, 16 deletions(-)
 delete mode 160000 tools/chisel3
 delete mode 160000 tools/firrtl
 delete mode 160000 tools/firrtl-interpreter
 delete mode 160000 tools/treadle

diff --git a/.gitmodules b/.gitmodules
index caac6751..6128783a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,12 +7,6 @@
 [submodule "barstools"]
 	path = tools/barstools
 	url = https://github.com/ucb-bar/barstools.git
-[submodule "tools/chisel3"]
-	path = tools/chisel3
-	url = https://github.com/freechipsproject/chisel3.git
-[submodule "tools/firrtl"]
-	path = tools/firrtl
-	url = https://github.com/freechipsproject/firrtl
 [submodule "tools/torture"]
 	path = tools/torture
 	url = https://github.com/ucb-bar/riscv-torture.git
@@ -77,15 +71,9 @@
 [submodule "tools/chisel-testers"]
 	path = tools/chisel-testers
 	url = https://github.com/freechipsproject/chisel-testers.git
-[submodule "tools/treadle"]
-	path = tools/treadle
-	url = https://github.com/freechipsproject/treadle.git
 [submodule "generators/sha3"]
 	path = generators/sha3
 	url = https://github.com/ucb-bar/sha3.git
-[submodule "tools/firrtl-interpreter"]
-	path = tools/firrtl-interpreter
-	url = https://github.com/freechipsproject/firrtl-interpreter.git
 [submodule "vlsi/hammer-cadence-plugins"]
 	path = vlsi/hammer-cadence-plugins
 	url = https://github.com/ucb-bar/hammer-cadence-plugins.git
diff --git a/tools/chisel3 b/tools/chisel3
deleted file mode 160000
index 58d38f96..00000000
--- a/tools/chisel3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 58d38f9620e7e91e4668266686484073c0ba7d2e
diff --git a/tools/firrtl b/tools/firrtl
deleted file mode 160000
index 7756f8f9..00000000
--- a/tools/firrtl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7756f8f9634b68a1375d2c2ca13abc5742234201
diff --git a/tools/firrtl-interpreter b/tools/firrtl-interpreter
deleted file mode 160000
index 5ab0cfe7..00000000
--- a/tools/firrtl-interpreter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ab0cfe7020ca17804078c85d020730764ee176f
diff --git a/tools/treadle b/tools/treadle
deleted file mode 160000
index 925687ad..00000000
--- a/tools/treadle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 925687ad22c42dd2c8b4dc127c0476f9902b3163

From f5ac1a3f46ef84fed776ce85e225c03309ad34bb Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Mon, 6 Dec 2021 16:54:24 -0800
Subject: [PATCH 07/14] [docs] Explain how to modify published dependencies

---
 .../Managing-Published-Scala-Dependencies.rst | 54 +++++++++++++++++++
 docs/Advanced-Concepts/index.rst              |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst

diff --git a/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
new file mode 100644
index 00000000..4e3fcd0d
--- /dev/null
+++ b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
@@ -0,0 +1,54 @@
+Managing Published Scala Dependencies
+=====================================
+
+In preparation for Chisel 3.5, in Chipyard 1.5 Chisel, FIRRTL, the FIRRTL
+interpreter, and Treadle, were transitioned from being built-from-source to
+managed as published dependencies. Their submodules have been removed.
+Switching between published versions can be achieved by changing the versions
+specified in Chipyard's build.sbt.
+
+Lists of available artifacts can be using search.maven.org or mvnrepository.org:
+
+- `Chisel3 <https://mvnrepository.com/artifact/edu.berkeley.cs/chisel3>`_
+- `FIRRTL <https://mvnrepository.com/artifact/edu.berkeley.cs/firrtl>`_
+- `FIRRTL Interpreter <https://mvnrepository.com/artifact/edu.berkeley.cs/firrtl-interpreter>`_
+- `Treadle <https://mvnrepository.com/artifact/edu.berkeley.cs/treadle>`_
+
+
+Publishing Local Changes
+-------------------------
+
+Under the new system, the simplest means to make custom source modifications to the packages
+above is to run ``sbt +publishLocal`` from within a locally modified clone of each
+of their respective repositories. This will post your custom variant
+to your local ivy2 repository, which can generally be found at ~/.ivy2.  See the `SBT
+documentation <https://www.scala-sbt.org/1.x/docs/Publishing.html#Publishing+locally>`_
+for more detail.
+
+In practice, this will require the following steps:
+
+#. Check out and modify the desired projects.
+#. Take note of, or modify, the versions of each projects (in
+   their build.sbt). If you're cloning from master generally
+   these will have default versions of ``1.X-SNAPSHOT``, where ``X`` is
+   not-yet-released next major version. You can modify the version string, to say ``1.X-<MYSUFFIX>``, to uniquely identify your
+   change.
+#. Call ``sbt +publishLocal`` in each subproject. You may need to rebuild other
+   published dependencies. SBT will be clear about what it is publishing and
+   where it is putting it. The ``+`` is generally necessary and ensures that
+   all cross versions of the package are published.
+#. Update the Chisel or FIRRTL version in Chipyard's build.sbt to match the
+   versions of your locally published packages.
+#. Use Chipyard as you would normally. Now when you call out to make in
+   Chipyard you should see SBT resolving dependencies to the locally
+   published instances in your local ivy2 repository.
+#. When you're finished, consider removing your locally published packages (by
+   removing the appropriate directory in your ivy2 repository) to prevent
+   accidentally reusing them in the future.
+
+A final word of caution: packages you publish to your local ivy repository will
+be visible to other projects you may be building on your system. For example,
+if you locally publish Chisel 3.5.0, other projects that depend on Chisel 3.5.0
+will preferentially use the locally published variant over the version
+available on Maven (the "real" 3.5.0).  Take care to note versions you are
+publishing and remove locally published versions once you are done with them.
diff --git a/docs/Advanced-Concepts/index.rst b/docs/Advanced-Concepts/index.rst
index b294d11b..d4092c67 100644
--- a/docs/Advanced-Concepts/index.rst
+++ b/docs/Advanced-Concepts/index.rst
@@ -15,4 +15,5 @@ They expect you to know about Chisel, Parameters, configs, etc.
    Resources
    CDEs
    Harness-Clocks
+   Managing-Published-Scala-Dependencies
 

From 1eea2c83b91416682d1b29dec884435fcaebfd45 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Tue, 7 Dec 2021 18:16:11 +0000
Subject: [PATCH 08/14] [sbt] Update comments about mandatedVersions

---
 build.sbt                                | 18 ++++++++++--------
 scripts/tutorial-patches/build.sbt.patch | 12 ++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/build.sbt b/build.sbt
index d44a9243..a00d7361 100644
--- a/build.sbt
+++ b/build.sbt
@@ -70,6 +70,16 @@ val firrtlVersion = "1.4.1"
 
 lazy val firrtlSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "firrtl" % firrtlVersion))
 
+// In some projects we override the default versions of Chisel and friends.
+// This map captures the expected defaults used by projects under Chipyard.
+lazy val chipyardMandatedVersions = Map(
+  "chisel-iotesters" -> "1.5.4",
+  "firrtl-interpreter" -> "1.4.4",
+  "treadle" -> "1.3.4",
+  "chisel3" -> chiselVersion,
+  "firrtl" -> firrtlVersion
+)
+
 // Subproject definitions begin
 
 // -- Rocket Chip --
@@ -129,14 +139,6 @@ lazy val rocketLibDeps = (rocketchip / Keys.libraryDependencies)
 
 // Because we're not using a release version of iotesters to work around a
 // scala test version problem, override it's libdeps to prevent using snapshots
-lazy val chipyardMandatedVersions = Map(
-  "chisel-iotesters" -> "1.5.4",
-  "firrtl-interpreter" -> "1.4.4",
-  "treadle" -> "1.3.4",
-  "chisel3" -> chiselVersion,
-  "firrtl" -> firrtlVersion
-)
-
 lazy val chisel_testers = (project in file("tools/chisel-testers"))
   .settings(chiselSettings)
   .settings(
diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index bdbb3a7e..f09f99d4 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -1,17 +1,17 @@
 diff --git a/build.sbt b/build.sbt
-index c38f5180..551aa8c0 100644
+index a00d7361..fbdf2e53 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -169,7 +169,7 @@ lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHO
+@@ -161,7 +161,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
+ 
  lazy val chipyard = (project in file("generators/chipyard"))
-   .sourceDependency(testchipip, testchipipLib)
-   .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
+   .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
 -    sha3, // On separate line to allow for cleaner tutorial-setup patches
 +    //sha3, // On separate line to allow for cleaner tutorial-setup patches
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
    .settings(libraryDependencies ++= rocketLibDeps.value)
-@@ -213,10 +213,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -202,10 +202,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
  
@@ -25,4 +25,4 @@ index c38f5180..551aa8c0 100644
 +//  .settings(commonSettings)
  
  lazy val gemmini = (project in file("generators/gemmini"))
-   .sourceDependency(testchipip, testchipipLib)
+   .dependsOn(testchipip, rocketchip, chisel_testers)

From 290426050903424070e430846a37fbfe9cc8a274 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Tue, 7 Dec 2021 23:07:10 -0800
Subject: [PATCH 09/14] Update
 docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst

Co-authored-by: Abraham Gonzalez <abe.j.gonza@gmail.com>
---
 .../Managing-Published-Scala-Dependencies.rst               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
index 4e3fcd0d..e53f7a3d 100644
--- a/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
+++ b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
@@ -5,7 +5,7 @@ In preparation for Chisel 3.5, in Chipyard 1.5 Chisel, FIRRTL, the FIRRTL
 interpreter, and Treadle, were transitioned from being built-from-source to
 managed as published dependencies. Their submodules have been removed.
 Switching between published versions can be achieved by changing the versions
-specified in Chipyard's build.sbt.
+specified in Chipyard's ``build.sbt``.
 
 Lists of available artifacts can be using search.maven.org or mvnrepository.org:
 
@@ -21,7 +21,7 @@ Publishing Local Changes
 Under the new system, the simplest means to make custom source modifications to the packages
 above is to run ``sbt +publishLocal`` from within a locally modified clone of each
 of their respective repositories. This will post your custom variant
-to your local ivy2 repository, which can generally be found at ~/.ivy2.  See the `SBT
+to your local ivy2 repository, which can generally be found at ``~/.ivy2``.  See the `SBT
 documentation <https://www.scala-sbt.org/1.x/docs/Publishing.html#Publishing+locally>`_
 for more detail.
 
@@ -37,7 +37,7 @@ In practice, this will require the following steps:
    published dependencies. SBT will be clear about what it is publishing and
    where it is putting it. The ``+`` is generally necessary and ensures that
    all cross versions of the package are published.
-#. Update the Chisel or FIRRTL version in Chipyard's build.sbt to match the
+#. Update the Chisel or FIRRTL version in Chipyard's ``build.sbt`` to match the
    versions of your locally published packages.
 #. Use Chipyard as you would normally. Now when you call out to make in
    Chipyard you should see SBT resolving dependencies to the locally

From df8161c3dafc74ff75ebedb48c7c6d941201307b Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 8 Dec 2021 07:13:06 +0000
Subject: [PATCH 10/14] Bump to chisel 3.4.4 and FIRRTL 1.4.4

---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index a00d7361..565836f3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -60,13 +60,13 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
-val chiselVersion = "3.4.1"
+val chiselVersion = "3.4.4"
 
 lazy val chiselSettings = Seq(
   libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion),
   addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full))
 
-val firrtlVersion = "1.4.1"
+val firrtlVersion = "1.4.4"
 
 lazy val firrtlSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "firrtl" % firrtlVersion))
 

From 170994ac9d472b5a78692105a021b482493941a2 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 8 Dec 2021 07:16:24 +0000
Subject: [PATCH 11/14] [sbt] Seperate settings assignments onto multiple lines

---
 build.sbt                                | 3 ++-
 scripts/tutorial-patches/build.sbt.patch | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 565836f3..afb82b5d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -119,7 +119,8 @@ lazy val rocketConfig = (project in rocketChipDir / "api-config-chipsalliance/bu
 
 lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
   .dependsOn(hardfloat, rocketMacros, rocketConfig)
-  .settings(commonSettings, chiselSettings)
+  .settings(commonSettings)
+  .settings(chiselSettings)
   .settings(
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index f09f99d4..bc67c91b 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -1,8 +1,8 @@
 diff --git a/build.sbt b/build.sbt
-index a00d7361..fbdf2e53 100644
+index 2187fe12..2319fc95 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -161,7 +161,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
+@@ -162,7 +162,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
  
  lazy val chipyard = (project in file("generators/chipyard"))
    .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
@@ -11,7 +11,7 @@ index a00d7361..fbdf2e53 100644
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
    .settings(libraryDependencies ++= rocketLibDeps.value)
-@@ -202,10 +202,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -203,10 +203,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
  

From c8b8ef791a7bf4c25227eaba4b2e86a0c0a68064 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 8 Dec 2021 07:19:55 +0000
Subject: [PATCH 12/14] Bump FireSim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 7591ff12..1e6d7861 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 7591ff12cf7e7afc8ae0f0d6369404ec18411621
+Subproject commit 1e6d7861588ced4ebe286228dce340692df8b4c4

From 8666889a533f4a438507bbb49ad2cb6388887b17 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Tue, 7 Dec 2021 23:23:05 -0800
Subject: [PATCH 13/14] Update
 docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst

Co-authored-by: Abraham Gonzalez <abe.j.gonza@gmail.com>
---
 .../Advanced-Concepts/Managing-Published-Scala-Dependencies.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
index e53f7a3d..9b0c73fa 100644
--- a/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
+++ b/docs/Advanced-Concepts/Managing-Published-Scala-Dependencies.rst
@@ -29,7 +29,7 @@ In practice, this will require the following steps:
 
 #. Check out and modify the desired projects.
 #. Take note of, or modify, the versions of each projects (in
-   their build.sbt). If you're cloning from master generally
+   their ``build.sbt``). If you're cloning from ``master`` generally
    these will have default versions of ``1.X-SNAPSHOT``, where ``X`` is
    not-yet-released next major version. You can modify the version string, to say ``1.X-<MYSUFFIX>``, to uniquely identify your
    change.

From 54447d03c0c760545fa9519f907b4f5af91b665b Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Wed, 8 Dec 2021 16:52:21 +0000
Subject: [PATCH 14/14] Use a temp branch of barstools until 3.5 is in

---
 tools/barstools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/barstools b/tools/barstools
index 61ab39f8..9130e36f 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 61ab39f82976aaad09c174bc411015a86691c546
+Subproject commit 9130e36fd1f0dbe7dad4ffe1a0e672246239f8d2