From 6b633ad13f155366ae644f1a80fc07d49e939b94 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Mon, 4 Oct 2021 15:48:18 -0700
Subject: [PATCH] Point to IOCells separately | Fixup Hwacha/Sodor more | Use
 tapeout package

---
 build.sbt              | 18 +++++++-----------
 common.mk              |  4 ++--
 generators/boom        |  2 +-
 generators/hwacha      |  2 +-
 generators/riscv-sodor |  2 +-
 generators/rocket-chip |  2 +-
 generators/testchipip  |  2 +-
 tools/barstools        |  2 +-
 tools/dsptools         |  2 +-
 9 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/build.sbt b/build.sbt
index f790d534..04a162f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -201,22 +201,18 @@ lazy val nvdla = (project in file("generators/nvdla"))
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
-lazy val iocell = (project in file("./tools/barstools/iocell/"))
+lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "src")
+  .settings(
+    Compile / scalaSource := baseDirectory.value / "main" / "scala" / "barstools" / "iocell",
+    Compile / resourceDirectory := baseDirectory.value / "main" / "resources"
+  )
   .settings(chiselSettings)
   .settings(commonSettings)
 
-lazy val tapeout = (project in file("./tools/barstools/tapeout/"))
-  .dependsOn(chipyard) // must depend on chipyard to get scala resources
+lazy val tapeout = (project in file("./tools/barstools/"))
+  .settings(chiselSettings)
   .settings(chiselTestSettings)
-  .settings(commonSettings)
-
-lazy val mdf = (project in file("./tools/barstools/mdf/scalalib/"))
-  .settings(commonSettings)
-
-lazy val barstoolsMacros = (project in file("./tools/barstools/macros/"))
-  .dependsOn(mdf)
   .enablePlugins(sbtassembly.AssemblyPlugin)
-  .settings(firrtlSettings)
   .settings(commonSettings)
 
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
diff --git a/common.mk b/common.mk
index d055f784..14a505fd 100644
--- a/common.mk
+++ b/common.mk
@@ -162,7 +162,7 @@ $(TOP_SMEMS_FILE) $(TOP_SMEMS_FIR): top_macro_temp
 	@echo "" > /dev/null
 
 top_macro_temp: $(TOP_SMEMS_CONF)
-	$(call run_scala_main,barstoolsMacros,barstools.macros.MacroCompiler,-n $(TOP_SMEMS_CONF) -v $(TOP_SMEMS_FILE) -f $(TOP_SMEMS_FIR) $(MACROCOMPILER_MODE))
+	$(call run_scala_main,tapeout,barstools.macros.MacroCompiler,-n $(TOP_SMEMS_CONF) -v $(TOP_SMEMS_FILE) -f $(TOP_SMEMS_FIR) $(MACROCOMPILER_MODE))
 
 HARNESS_MACROCOMPILER_MODE = --mode synflops
 .INTERMEDIATE: harness_macro_temp
@@ -170,7 +170,7 @@ $(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR): harness_macro_temp
 	@echo "" > /dev/null
 
 harness_macro_temp: $(HARNESS_SMEMS_CONF) | top_macro_temp
-	$(call run_scala_main,barstoolsMacros,barstools.macros.MacroCompiler, -n $(HARNESS_SMEMS_CONF) -v $(HARNESS_SMEMS_FILE) -f $(HARNESS_SMEMS_FIR) $(HARNESS_MACROCOMPILER_MODE))
+	$(call run_scala_main,tapeout,barstools.macros.MacroCompiler, -n $(HARNESS_SMEMS_CONF) -v $(HARNESS_SMEMS_FILE) -f $(HARNESS_SMEMS_FIR) $(HARNESS_MACROCOMPILER_MODE))
 
 ########################################################################################
 # remove duplicate files and headers in list of simulation file inputs
diff --git a/generators/boom b/generators/boom
index e1a70afe..e252e797 160000
--- a/generators/boom
+++ b/generators/boom
@@ -1 +1 @@
-Subproject commit e1a70afed7de77f6ba9f6e501de71f7f41afc47c
+Subproject commit e252e797c21aa3bf860cb9d67c6009ef00c5916f
diff --git a/generators/hwacha b/generators/hwacha
index 62c01f5a..17bdafcb 160000
--- a/generators/hwacha
+++ b/generators/hwacha
@@ -1 +1 @@
-Subproject commit 62c01f5a8858aa1b827f0f9372a4392d7b596fca
+Subproject commit 17bdafcb3a6bae36956dd7255af157844a6d5b4d
diff --git a/generators/riscv-sodor b/generators/riscv-sodor
index 449354c2..c4fdaa29 160000
--- a/generators/riscv-sodor
+++ b/generators/riscv-sodor
@@ -1 +1 @@
-Subproject commit 449354c27bf07ccc865dc6c005df1d08eaf5b01c
+Subproject commit c4fdaa29798f69df7c2bdaf124f9b493d26da212
diff --git a/generators/rocket-chip b/generators/rocket-chip
index a7b016e4..303564bb 160000
--- a/generators/rocket-chip
+++ b/generators/rocket-chip
@@ -1 +1 @@
-Subproject commit a7b016e46e22e4fdc013357051e30511f80df082
+Subproject commit 303564bb36c3679d90954806a7c162300567a6b9
diff --git a/generators/testchipip b/generators/testchipip
index 5917176c..247cad2d 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 5917176c911cec667655984c2adc566aa404f4fe
+Subproject commit 247cad2d0cf0f70f517a3f2a2d976bf4452b169e
diff --git a/tools/barstools b/tools/barstools
index 9130e36f..314d8072 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 9130e36fd1f0dbe7dad4ffe1a0e672246239f8d2
+Subproject commit 314d80729e7b32e3c10c0da6734bbdc9a867916f
diff --git a/tools/dsptools b/tools/dsptools
index aad6a3db..1b3b9485 160000
--- a/tools/dsptools
+++ b/tools/dsptools
@@ -1 +1 @@
-Subproject commit aad6a3db1520a05ae668681941a19bdcc40aec03
+Subproject commit 1b3b94853da900c4566f16f16f5dbe6ab55bc090