From 4328041c259a25751c7830788dbe6ca3711df263 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Wed, 31 May 2023 22:10:47 -0700
Subject: [PATCH] Add shuttle core

---
 .gitmodules                                   |  3 ++
 .../main/scala/config/ShuttleConfigs.scala    | 32 +++++++++++++++++++
 generators/shuttle                            |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 generators/chipyard/src/main/scala/config/ShuttleConfigs.scala
 create mode 160000 generators/shuttle

diff --git a/.gitmodules b/.gitmodules
index 5a3eb6fc..ea6b5ddb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -124,3 +124,6 @@
 [submodule "software/embench/embench-iot"]
 	path = software/embench/embench-iot
 	url = https://github.com/embench/embench-iot.git
+[submodule "shuttle"]
+	path = generators/shuttle
+	url = https://github.com/ucb-bar/shuttle.git
diff --git a/generators/chipyard/src/main/scala/config/ShuttleConfigs.scala b/generators/chipyard/src/main/scala/config/ShuttleConfigs.scala
new file mode 100644
index 00000000..6e86e020
--- /dev/null
+++ b/generators/chipyard/src/main/scala/config/ShuttleConfigs.scala
@@ -0,0 +1,32 @@
+package chipyard
+
+import org.chipsalliance.cde.config.{Config}
+
+//-----------------
+// Shuttle Configs
+//-----------------
+
+class ShuttleConfig extends Config(
+  new shuttle.common.WithNShuttleCores ++
+  new chipyard.config.AbstractConfig)
+
+class ShuttleCosimConfig extends Config(
+  new chipyard.harness.WithCospike ++                            // attach spike-cosim
+  new chipyard.config.WithTraceIO ++
+  new shuttle.common.WithShuttleDebugROB ++
+  new shuttle.common.WithNShuttleCores ++
+  new chipyard.config.AbstractConfig)
+
+class dmiShuttleCosimConfig extends Config(
+  new chipyard.harness.WithSerialTLTiedOff ++                    // don't attach anything to serial-tl
+  new chipyard.harness.WithCospike ++                            // attach spike-cosim
+  new chipyard.config.WithDMIDTM ++                              // have debug module expose a clocked DMI port
+  new chipyard.config.WithTraceIO ++
+  new shuttle.common.WithShuttleDebugROB ++
+  new shuttle.common.WithNShuttleCores ++
+  new chipyard.config.AbstractConfig)
+
+class GemminiShuttleConfig extends Config(
+  new gemmini.DefaultGemminiConfig ++                            // use Gemmini systolic array GEMM accel
+  new shuttle.common.WithNShuttleCores ++
+  new chipyard.config.AbstractConfig)
diff --git a/generators/shuttle b/generators/shuttle
new file mode 160000
index 00000000..3c15591a
--- /dev/null
+++ b/generators/shuttle
@@ -0,0 +1 @@
+Subproject commit 3c15591a9ee237bb1251e5362de22ad19f64ba07