Merge pull request #381 from riscv-boom/bump-chipyard-parallel

update to newest chipyard for parallel builds
riscv-boom · Sep 2, 2019 · cae8808 · cae8808
2 parents 527c7ba + 064949a
commit cae8808
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh
@@ -17,6 +17,9 @@ clean () {
     run "rm -rf $REMOTE_WORK_DIR"
 }
 
+#make parallelism
+NPROC=8
+
 # remote variables
 REMOTE_WORK_DIR=$CI_DIR/$CIRCLE_PROJECT_REPONAME-$CIRCLE_BRANCH-$CIRCLE_SHA1-$CIRCLE_JOB
 REMOTE_RISCV_DIR=$REMOTE_WORK_DIR/riscv-tools-install

diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
@@ -31,7 +31,7 @@ copy $LOCAL_VERILATOR_DIR/ $SERVER:$REMOTE_VERILATOR_DIR
 
 # enter the verilator directory and build the specific config on remote server
 run "make -C $REMOTE_SIM_DIR clean"
-run "export RISCV=\"$REMOTE_RISCV_DIR\"; export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR/install/share/verilator; make -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR JAVA_ARGS=\"-Xmx8G -Xss8M\" ${mapping[$1]}"
+run "export RISCV=\"$REMOTE_RISCV_DIR\"; export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR/install/share/verilator; make -j$NPROC -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR JAVA_ARGS=\"-Xmx8G -Xss8M\" ${mapping[$1]}"
 run "rm -rf $REMOTE_CHIPYARD_DIR/project"
 
 # copy back the final build

diff --git a/.circleci/prepare-for-rtl-build.sh b/.circleci/prepare-for-rtl-build.sh
@@ -40,7 +40,7 @@ if [ ! -d "$LOCAL_VERILATOR_DIR" ] && [ ! -d "$LOCAL_CHIPYARD_DIR" ]; then
     run "mkdir -p $REMOTE_CHIPYARD_DIR"
     copy $LOCAL_CHIPYARD_DIR/ $SERVER:$REMOTE_CHIPYARD_DIR
 
-    run "make -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR verilator_install"
+    run "make -j$NPROC -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR verilator_install"
 
     # copy so that circleci can cache
     mkdir -p $LOCAL_CHIPYARD_DIR

diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
@@ -12,11 +12,11 @@ source $SCRIPT_DIR/defaults.sh
 export VERILATOR_ROOT=$LOCAL_VERILATOR_DIR/install/share/verilator
 
 run_bmark () {
-    make run-bmark-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
+    make -j$NPROC run-bmark-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
 }
 
 run_asm () {
-    make run-asm-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
+    make -j$NPROC run-asm-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
 }
 
 run_both () {

diff --git a/CHIPYARD.hash b/CHIPYARD.hash
@@ -1 +1 @@
-71b3d7e1e688267d175cdced81307c662fe11f03
+64d2783b5f0a3d89cb31143fdd5863f0146ec40d