Modularize compressacc

Author: jerryz123

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)"
+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)"
 
 SCALA_EXT = scala
 VLOG_EXT = sv v

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

@@ -0,0 +1 @@
+../../../../../compress-acc/chipyard/CompressAccConfigs.scala

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

@@ -61,7 +61,3 @@ class ReRoCCManyGemminiConfig extends Config(
   new freechips.rocketchip.rocket.WithNHugeCores(4) ++           // 4 rocket cores
   new chipyard.config.AbstractConfig)
 
-class ZstdCompressorRocketConfig extends Config(
-  new compressacc.WithZstdCompressor ++
-  new freechips.rocketchip.rocket.WithNHugeCores(1) ++
-  new chipyard.config.AbstractConfig)

generators/compress-acc

@@ -19,14 +19,16 @@ function usage
     echo "Enable other submodules with the --full or submodule-specific flags"
     echo ""
     echo "Options:"
-    echo "  -h      Display this help message"
-    echo "  --full  Initialize all submodules"
-    echo "  --ara   Initialize the ara submodule"
+    echo "  -h            Display this help message"
+    echo "  --full        Initialize all submodules"
+    echo "  --ara         Initialize the optional ara submodule"
+    echo "  --compressacc Initialize the optional compressor accelerator submodule"
     echo ""
 }
 
 ENABLE_ARA=""
 ENABLE_CALIPTRA=""
+ENABLE_COMPRESSACC=""
 
 while test $# -gt 0
 do
@@ -47,6 +49,9 @@ do
 	--caliptra)
 	    ENABLE_CALIPTRA=1
 	    ;;
+	--compressacc)
+	    ENABLE_COMPRESSACC=1
+	    ;;
         *)
             echo "ERROR: bad argument $1"
             usage
@@ -92,6 +97,7 @@ cd "$RDIR"
             generators/cva6 \
             generators/ara \
 	    generators/caliptra-aes-acc \
+	    generators/compress-acc \
             generators/nvdla \
             toolchains/libgloss \
             generators/gemmini \
@@ -138,7 +144,7 @@ cd "$RDIR"
     git submodule update --init generators/nvdla
     git -C generators/nvdla submodule update --init src/main/resources/hw
 
-    # Non-recursive clone to exclude ara submods
+    # Optional clones
     if [[ "$ENABLE_ARA" -eq 1 ]] ; then
 	git submodule update --init generators/ara
 	git -C generators/ara submodule update --init ara
@@ -148,15 +154,17 @@ cd "$RDIR"
 	git submodule update --init generators/caliptra-aes-acc
     fi
 
+    if [[ "$ENABLE_COMPRESSACC" -eq 1]] ; then
+	git submodule update --init generators/compress-acc
+    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
 
     # Non-recursive clone
     git submodule update --init generators/rocket-chip
 
-    # Non-recursive clone
-    git submodule update --init generators/compress-acc
 
     # Non-recursive clone
     git submodule update --init generators/vexiiriscv