Bump chipyard to integrate mempress

.gitmodules

@@ -130,3 +130,6 @@
 [submodule "generators/constellation"]
 	path = generators/constellation
 	url = https://github.com/ucb-bar/constellation.git
+[submodule "generators/mempress"]
+	path = generators/mempress
+	url = https://github.com/ucb-bar/mempress.git

build.sbt

@@ -149,10 +149,16 @@ lazy val chipyard = (project in file("generators/chipyard"))
     sha3, // On separate line to allow for cleaner tutorial-setup patches
     dsptools, `rocket-dsp-utils`,
     gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
-    constellation)
+    constellation, mempress)
   .settings(libraryDependencies ++= rocketLibDeps.value)
   .settings(commonSettings)
 
+lazy val mempress = (project in file("generators/mempress"))
+  .dependsOn(rocketchip, midasTargetUtils)
+  .settings(libraryDependencies ++= rocketLibDeps.value)
+  .settings(chiselTestSettings)
+  .settings(commonSettings)
+
 lazy val constellation = (project in file("generators/constellation"))
   .dependsOn(rocketchip)
   .settings(libraryDependencies ++= rocketLibDeps.value)

generators/chipyard/src/main/scala/config/RocketConfigs.scala

@@ -21,6 +21,14 @@ class TinyRocketConfig extends Config(
   new freechips.rocketchip.subsystem.With1TinyCore ++             // single tiny rocket-core
   new chipyard.config.AbstractConfig)
 
+class MempressConfig extends Config(
+  new mempress.WithMemPress ++
+  new freechips.rocketchip.subsystem.WithInclusiveCache(nBanks=8, nWays=16, capacityKB=2048) ++
+  new chipyard.config.WithExtMemIdBits(7) ++
+  new freechips.rocketchip.subsystem.WithNMemoryChannels(4) ++
+  new chipyard.config.WithSystemBusWidth(128) ++
+  new RocketConfig)
+
 // DOC include start: FFTRocketConfig
 class FFTRocketConfig extends Config(
   new fftgenerator.WithFFTGenerator(numPoints=8, width=16, decPt=8) ++ // add 8-point mmio fft at the default addr (0x2400) with 16bit fixed-point numbers.

generators/chipyard/src/main/scala/config/fragments/SubsystemFragments.scala

@@ -11,3 +11,7 @@ class WithBroadcastManager extends Config((site, here, up) => {
 class WithSystemBusWidth(bitWidth: Int) extends Config((site, here, up) => {
   case SystemBusKey => up(SystemBusKey, site).copy(beatBytes=bitWidth/8)
 })
+
+class WithExtMemIdBits(n: Int) extends Config((site, here, up) => {
+    case ExtMem => up(ExtMem, site).map(x => x.copy(master = x.master.copy(idBits = n)))
+})

scripts/tutorial-patches/build.sbt.patch

@@ -1,18 +1,17 @@
 diff --git a/build.sbt b/build.sbt
-index bbbb8251..b7adcb73 100644
+index ec36a85f..e2b1bd61 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -143,8 +143,8 @@ lazy val testchipip = (project in file("generators/testchipip"))
+@@ -146,7 +146,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,
 -    sha3, // On separate line to allow for cleaner tutorial-setup patches
-+//    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, fft_generator,
-     constellation)
-   .settings(libraryDependencies ++= rocketLibDeps.value)
-@@ -189,11 +189,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+     constellation, mempress)
+@@ -204,11 +204,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
 
@@ -21,11 +20,11 @@ index bbbb8251..b7adcb73 100644
 -  .settings(libraryDependencies ++= rocketLibDeps.value)
 -  .settings(chiselTestSettings)
 -  .settings(commonSettings)
-+//lazy val sha3 = (project in file("generators/sha3"))
-+//  .dependsOn(rocketchip, midasTargetUtils)
-+//  .settings(libraryDependencies ++= rocketLibDeps.value)
-+//  .settings(chiselTestSettings)
-+//  .settings(commonSettings)
++/* lazy val sha3 = (project in file("generators/sha3")) */
++/* .dependsOn(rocketchip, midasTargetUtils) */
++/* .settings(libraryDependencies ++= rocketLibDeps.value) */
++/* .settings(chiselTestSettings) */
++/* .settings(commonSettings) */
 
  lazy val gemmini = (project in file("generators/gemmini"))
    .dependsOn(testchipip, rocketchip)