Skip to content

Commit 8f8600d

Browse files
committed
Modularize saturn
1 parent b801eff commit 8f8600d

File tree

4 files changed

+18
-185
lines changed

4 files changed

+18
-185
lines changed

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ lazy val chipyard = {
181181
val includeMempress = file("generators/mempress/.git").exists()
182182
if (includeMempress) chipyard = chipyard.dependsOn(mempress)
183183

184+
val includeSaturn = file("generators/saturn/.git").exists()
185+
if (includeSaturn) chipyard = chipyard.dependsOn(saturn)
186+
184187
chipyard
185188
}
186189

common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ endif
8888
# Returns a list of files in directories $1 with *any* of the file extensions in $2
8989
lookup_srcs_by_multiple_type = $(foreach type,$(2),$(call lookup_srcs,$(1),$(type)))
9090

91-
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)"
91+
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|saturn)"
9292

9393
SCALA_EXT = scala
9494
VLOG_EXT = sv v

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

Lines changed: 0 additions & 183 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../saturn/chipyard/SaturnConfigs.scala

scripts/init-submodules-no-riscv-tools-nolog.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,18 @@ function usage
3737
echo "Options:"
3838
echo " -h Display this help message"
3939
echo " --full Initialize all submodules"
40-
echo " --ara Initialize the optional ara submodule"
40+
echo " --ara Initialize the optional ara vector-unit submodule"
4141
echo " --compressacc Initialize the optional compressor accelerator submodule"
42+
echo " --mempress Initialize the optional mempress accelerator submodule"
43+
echo " --saturn Initialize the optional saturn vector-unit submodule"
4244
echo ""
4345
}
4446

4547
ENABLE_ARA=""
4648
ENABLE_CALIPTRA=""
4749
ENABLE_COMPRESSACC=""
4850
ENABLE_MEMPRESS=""
51+
ENABLE_SATURN=""
4952

5053
while test $# -gt 0
5154
do
@@ -61,6 +64,7 @@ do
6164
ENABLE_CALIPTRA=1
6265
ENABLE_COMPRESSACC=1
6366
ENABLE_MEMPRESS=1
67+
ENABLE_SATURN=1
6468
;;
6569
--ara)
6670
ENABLE_ARA=1
@@ -74,6 +78,9 @@ do
7478
--mempress)
7579
ENABLE_MEMPRESS=1
7680
;;
81+
--saturn)
82+
ENABLE_SATURN=1
83+
;;
7784
*)
7885
echo "ERROR: bad argument $1"
7986
usage
@@ -125,6 +132,7 @@ cd "$RDIR"
125132
generators/mempress \
126133
generators/gemmini \
127134
generators/rocket-chip \
135+
generators/saturn \
128136
generators/compress-acc \
129137
generators/vexiiriscv \
130138
sims/firesim \
@@ -188,6 +196,10 @@ cd "$RDIR"
188196
if [[ "$ENABLE_MEMPRESS" -eq 1 ]] ; then
189197
git submodule update --init generators/mempress
190198
fi
199+
200+
if [[ "$ENABLE_SATURN" -eq 1 ]] ; then
201+
git submodule update --init --recursive generators/saturn
202+
fi
191203

192204
# Non-recursive clone to exclude gemmini-software
193205
submodule_name="generators/gemmini"

0 commit comments

Comments
 (0)