From 6677616e128c9d59f10692030422a29065a6ad8d Mon Sep 17 00:00:00 2001
From: chick <chick@qrhino.com>
Date: Wed, 2 Jun 2021 15:55:36 -0700
Subject: [PATCH 1/2] - Add submodules   - api-config-chipsalliance   -
 rocket-dsp-utils - update check-commit.sh to include rocket-dsp-utils -
 changes to build.sbt   - change rocket-dsptools to rocket-dp-utils   - add
 api-config-chipsalliance

---
 .circleci/check-commit.sh      |  2 +-
 .gitmodules                    |  6 ++++++
 build.sbt                      | 14 +++++++++++---
 tools/api-config-chipsalliance |  1 +
 tools/rocket-dsp-utils         |  1 +
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 160000 tools/api-config-chipsalliance
 create mode 160000 tools/rocket-dsp-utils

diff --git a/.circleci/check-commit.sh b/.circleci/check-commit.sh
index 42b4a093ca..1b59191e71 100755
--- a/.circleci/check-commit.sh
+++ b/.circleci/check-commit.sh
@@ -90,7 +90,7 @@ else
 fi
 search
 
-submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "firrtl-interpreter" "torture" "treadle")
+submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "rocket-dsp-utils" "firrtl-interpreter" "torture" "treadle")
 dir="tools"
 if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
 then
diff --git a/.gitmodules b/.gitmodules
index 6f99f693bd..6e5288e6cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -134,3 +134,9 @@
 [submodule "fpga/fpga-shells"]
 	path = fpga/fpga-shells
 	url = https://github.com/sifive/fpga-shells.git
+[submodule "tools/api-config-chipsalliance"]
+	path = tools/api-config-chipsalliance
+	url = https://github.com/chipsalliance/api-config-chipsalliance.git
+[submodule "tools/rocket-dsp-utils"]
+	path = tools/rocket-dsp-utils
+	url = https://github.com/ucb-bar/rocket-dsp-utils
diff --git a/build.sbt b/build.sbt
index 3123c4b803..d3e99cc981 100644
--- a/build.sbt
+++ b/build.sbt
@@ -185,7 +185,7 @@ lazy val chipyard = (project in file("generators/chipyard"))
   .sourceDependency(testchipip, testchipipLib)
   .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
     sha3, // On separate line to allow for cleaner tutorial-setup patches
-    dsptools, `rocket-dsptools`,
+    dsptools, `rocket-dsp-utils`,
     gemmini, icenet, tracegen, cva6, nvdla, sodor)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
@@ -278,8 +278,16 @@ lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
       "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
   ))
 
-lazy val `rocket-dsptools` = freshProject("rocket-dsptools", file("./tools/dsptools/rocket"))
-  .dependsOn(rocketchip, dsptools)
+lazy val `api-config-chipsalliance` = freshProject("api-config-chipsalliance", file("./tools/api-config-chipsalliance"))
+  .settings(
+    commonSettings,
+    libraryDependencies ++= Seq(
+      "org.scalatest" %% "scalatest" % "3.0.+" % "test",
+      "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
+    ))
+
+lazy val `rocket-dsp-utils` = freshProject("rocket-dsp-utils", file("./tools/rocket-dsp-utils"))
+  .dependsOn(rocketchip, `api-config-chipsalliance`, dsptools)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
diff --git a/tools/api-config-chipsalliance b/tools/api-config-chipsalliance
new file mode 160000
index 0000000000..fd8df1105a
--- /dev/null
+++ b/tools/api-config-chipsalliance
@@ -0,0 +1 @@
+Subproject commit fd8df1105a92065425cd353b6855777e35bd79b4
diff --git a/tools/rocket-dsp-utils b/tools/rocket-dsp-utils
new file mode 160000
index 0000000000..355bf9f203
--- /dev/null
+++ b/tools/rocket-dsp-utils
@@ -0,0 +1 @@
+Subproject commit 355bf9f2038c68f4d44650f66d1516d171bfb224

From 9e1bf57466c5bdb1c0bcee24fcb13927d8dd5a97 Mon Sep 17 00:00:00 2001
From: chick <chick@qrhino.com>
Date: Wed, 9 Jun 2021 11:15:46 -0700
Subject: [PATCH 2/2] Update reference in build.sbt.patch from
 `rocket-dsptools` to `rocket-dsp-utils`

---
 scripts/tutorial-patches/build.sbt.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index 325bdfaee1..0e55dde41c 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -8,7 +8,7 @@ index 3123c4b8..487fc428 100644
    .dependsOn(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-dsptools`,
+     dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor)
    .settings(libraryDependencies ++= rocketLibDeps.value)
 @@ -223,11 +223,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))