modular mempress

Author: jerryz123

build.sbt

@@ -158,7 +158,7 @@ lazy val chipyard = {
     .dependsOn(testchipip, rocketchip, boom, rocketchip_blocks, rocketchip_inclusive_cache,
       dsptools, rocket_dsp_utils,
       radiance, gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
-      constellation, mempress, barf, shuttle, rerocc,
+      constellation, barf, shuttle, rerocc,
       saturn, firrtl2_bridge, vexiiriscv, tacit)
     .settings(libraryDependencies ++= rocketLibDeps.value)
     .settings(
@@ -178,6 +178,9 @@ lazy val chipyard = {
   val includeCompressAcc = file("generators/compress-acc/.git").exists()
   if (includeCompressAcc) chipyard = chipyard.dependsOn(compressacc)
 
+  val includeMempress = file("generators/mempress/.git").exists()
+  if (includeMempress) chipyard = chipyard.dependsOn(mempress)
+
   chipyard
 }
 

common.mk

@@ -88,7 +88,7 @@ endif
 # Returns a list of files in directories $1 with *any* of the file extensions in $2
 lookup_srcs_by_multiple_type = $(foreach type,$(2),$(call lookup_srcs,$(1),$(type)))
 
-CHECK_SUBMODULES_COMMAND = echo "Checking required submodules in generators/ are initialized. Uninitialized submodules will be displayed" ; ! git submodule status $(base_dir)/generators | grep '^-.*' | grep -vE "(ara|caliptra|compress)"
+CHECK_SUBMODULES_COMMAND = echo "Checking required submodules in generators/ are initialized. Uninitialized submodules will be displayed" ; ! git submodule status $(base_dir)/generators | grep '^-.*' | grep -vE "(ara|caliptra|compress|mempress)"
 
 SCALA_EXT = scala
 VLOG_EXT = sv v

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

@@ -0,0 +1 @@
+../../../../../mempress/chipyard/MempressConfigs.scala

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

@@ -32,16 +32,6 @@ class LeanGemminiPrintfRocketConfig extends Config(
   new chipyard.config.WithSystemBusWidth(128) ++
   new chipyard.config.AbstractConfig)
 
-class MempressRocketConfig extends Config(
-  new mempress.WithMemPress ++                                    // use Mempress (memory traffic generation) accelerator
-  new chipyard.config.WithExtMemIdBits(7) ++                      // use 7 bits for tl like request id
-  new chipyard.config.WithSystemBusWidth(128) ++
-  new freechips.rocketchip.subsystem.WithNBanks(8) ++
-  new freechips.rocketchip.subsystem.WithInclusiveCache(nWays=16, capacityKB=2048) ++
-  new freechips.rocketchip.subsystem.WithNMemoryChannels(4) ++
-  new freechips.rocketchip.rocket.WithNHugeCores(1) ++
-  new chipyard.config.AbstractConfig)
-
 class ReRoCCTestConfig extends Config(
   new rerocc.WithReRoCC ++
   new chipyard.config.WithCharacterCountRoCC ++                // rerocc tile4 is charcnt

generators/mempress

@@ -29,6 +29,7 @@ function usage
 ENABLE_ARA=""
 ENABLE_CALIPTRA=""
 ENABLE_COMPRESSACC=""
+ENABLE_MEMPRESS=""
 
 while test $# -gt 0
 do
@@ -43,6 +44,7 @@ do
 	    ENABLE_ARA=1
 	    ENABLE_CALIPTRA=1
 	    ENABLE_COMPRESSACC=1
+	    ENABLE_MEMPRESS=1
 	    ;;
 	--ara)
 	    ENABLE_ARA=1
@@ -53,6 +55,9 @@ do
 	--compressacc)
 	    ENABLE_COMPRESSACC=1
 	    ;;
+	--mempress)
+	    ENABLE_MEMPRESS=1
+	    ;;
         *)
             echo "ERROR: bad argument $1"
             usage
@@ -95,12 +100,13 @@ cd "$RDIR"
         # path to temporarily exclude during the recursive update
         for name in \
             toolchains/*-tools/* \
-            generators/cva6 \
+	    toolchains/libgloss \
+	    generators/cva6 \
             generators/ara \
 	    generators/caliptra-aes-acc \
 	    generators/compress-acc \
             generators/nvdla \
-            toolchains/libgloss \
+	    generators/mempress \
             generators/gemmini \
             generators/rocket-chip \
             generators/compress-acc \
@@ -159,6 +165,10 @@ cd "$RDIR"
 	git submodule update --init generators/compress-acc
     fi
 
+    if [[ "$ENABLE_MEMPRESS" -eq 1 ]] ; then
+	git submodule update --init generators/mempress
+    fi
+    
     # Non-recursive clone to exclude gemmini-software
     git submodule update --init generators/gemmini
     git -C generators/gemmini/ submodule update --init --recursive software/gemmini-rocc-tests