Skip to content

Commit e529ec6

Browse files
committed
Modularize saturn
1 parent 1e45551 commit e529ec6

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
@@ -21,15 +21,18 @@ function usage
2121
echo "Options:"
2222
echo " -h Display this help message"
2323
echo " --full Initialize all submodules"
24-
echo " --ara Initialize the optional ara submodule"
24+
echo " --ara Initialize the optional ara vector-unit submodule"
2525
echo " --compressacc Initialize the optional compressor accelerator submodule"
26+
echo " --mempress Initialize the optional mempress accelerator submodule"
27+
echo " --saturn Initialize the optional saturn vector-unit submodule"
2628
echo ""
2729
}
2830

2931
ENABLE_ARA=""
3032
ENABLE_CALIPTRA=""
3133
ENABLE_COMPRESSACC=""
3234
ENABLE_MEMPRESS=""
35+
ENABLE_SATURN=""
3336

3437
while test $# -gt 0
3538
do
@@ -45,6 +48,7 @@ do
4548
ENABLE_CALIPTRA=1
4649
ENABLE_COMPRESSACC=1
4750
ENABLE_MEMPRESS=1
51+
ENABLE_SATURN=1
4852
;;
4953
--ara)
5054
ENABLE_ARA=1
@@ -58,6 +62,9 @@ do
5862
--mempress)
5963
ENABLE_MEMPRESS=1
6064
;;
65+
--saturn)
66+
ENABLE_SATURN=1
67+
;;
6168
*)
6269
echo "ERROR: bad argument $1"
6370
usage
@@ -109,6 +116,7 @@ cd "$RDIR"
109116
generators/mempress \
110117
generators/gemmini \
111118
generators/rocket-chip \
119+
generators/saturn \
112120
generators/compress-acc \
113121
generators/vexiiriscv \
114122
sims/firesim \
@@ -169,6 +177,10 @@ cd "$RDIR"
169177
if [[ "$ENABLE_MEMPRESS" -eq 1 ]] ; then
170178
git submodule update --init generators/mempress
171179
fi
180+
181+
if [[ "$ENABLE_SATURN" -eq 1 ]] ; then
182+
git submodule update --init --recursive generators/saturn
183+
fi
172184

173185
# Non-recursive clone to exclude gemmini-software
174186
git submodule update --init generators/gemmini

0 commit comments

Comments
 (0)