Merge pull request #599 from ucb-bar/dev

Chipyard 1.4.0 Release

.circleci/README.md

@@ -34,11 +34,19 @@ Here the key is built from a string where the `checksum` portion converts the fi
 This directory contains all the collateral for the Chipyard CI to work.
 The following is included:
 
-    `build-toolchains.sh` # build either riscv-tools or esp-tools
-    `create-hash.sh`      # create hashes of riscv-tools/esp-tools so circleci caching can work
-    `do-rtl-build.sh`     # use verilator to build a sim executable (remotely)
-    `config.yml`          # main circleci config script to enumerate jobs/workflows
-    `defaults.sh`         # default variables used
+    `build-toolchains.sh`        # build either riscv-tools or esp-tools
+    `create-hash.sh`             # create hashes of riscv-tools/esp-tools so circleci caching can work
+    `do-rtl-build.sh`            # use verilator to build a sim executable (remotely)
+    `config.yml`                 # main circleci config script to enumerate jobs/workflows
+    `defaults.sh`                # default variables used
+    `check-commit.sh`            # check that submodule commits are valid
+    `build-extra-tests.sh`       # build default chipyard tests located in tests/
+    `clean-old-files.sh`         # clean up build server files
+    `do-fpga-rtl-build.sh`       # similar to `do-rtl-build` but using fpga/
+    `install-verilator.sh`       # install verilator on build server
+    `run-firesim-scala-tests.sh` # run firesim scala tests
+    `run-tests.sh                # run tests for a specific set of designs
+    `images/`                    # docker image used in CI
 
 How things are setup for Chipyard
 ---------------------------------

.circleci/check-commit.sh

@@ -48,7 +48,7 @@ search () {
     done
 }
 
-submodules=("ariane" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip")
+submodules=("cva6" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor")
 dir="generators"
 if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
 then
@@ -82,7 +82,12 @@ search
 
 submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
 dir="software"
-branches=("master")
+if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
+then
+    branches=("master")
+else
+    branches=("master" "dev")
+fi
 search
 
 submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "firrtl-interpreter" "torture" "treadle")
@@ -115,23 +120,33 @@ dir="vlsi"
 branches=("master")
 search
 
+submodules=("fpga-shells")
+dir="fpga"
+branches=("master")
+search
 
 # turn off verbose printing to make this easier to read
 set +x
 
-# print all result strings
+# print 0's
 for str in "${all_names[@]}";
 do
-    echo "$str"
+    if [ 0 = $(echo "$str" | awk '{print$3}') ]; then
+        echo "$str"
+    fi
 done
 
-# check if there was a non-zero return code
+echo ""
+
+# check if there was a non-zero return code and print 1's
+EXIT=0
 for str in "${all_names[@]}";
 do
     if [ ! 0 = $(echo "$str" | awk '{print$3}') ]; then
-        exit 1
+        echo "$str"
+        EXIT=1
     fi
 done
 
 echo "Done checking all submodules"
-
+exit $EXIT