diff --git a/.github/actions/build-extra-tests/action.yml b/.github/actions/build-extra-tests/action.yml
deleted file mode 100644
index 80ae8fdf..00000000
--- a/.github/actions/build-extra-tests/action.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: build-extra-tests
-description: 'Builds extra test required for some flows'
-
-inputs:
-  tools-version:
-    description: Which toolchain to build
-    required: false
-    default: 'riscv-tools'
-  cache-key:
-    description: Use this for caching
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/cache@v2
-      id: build-extra-tools-cache
-      with:
-        path: extra-tests-install
-        key: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
-        restore-keys: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
-    - name: Build extra tests if not cached
-      run: |
-        export RISCV="/__w/chipyard/chipyard/riscv-tools-install"
-        export LD_LIBRARY_PATH="$RISCV/lib"
-        export PATH="$RISCV/bin:$PATH"
-        .github/scripts/build-extra-tests.sh
-      shell: bash
-
diff --git a/.github/actions/prepare-rtl/action.yml b/.github/actions/prepare-rtl/action.yml
index ade87134..25098bfc 100644
--- a/.github/actions/prepare-rtl/action.yml
+++ b/.github/actions/prepare-rtl/action.yml
@@ -2,24 +2,13 @@ name: prepare-rtl
 description: 'Builds RTL based on parameters, caches the entire chipyard root dir when done'
 
 inputs:
-<<<<<<< HEAD
-=======
-  tools-version:
-    description: Which toolchain to build
-    required: false
-    default: 'riscv-tools'
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
   group-key:
     description: group key
     required: true
   build-script:
     description: rtl build script to use
     required: false
-<<<<<<< HEAD
     default: "remote-do-rtl-build.sh"
-=======
-    default: "do-rtl-build.sh"
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
   build-type:
     description: type of build
     required: false
@@ -28,12 +17,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-<<<<<<< HEAD
     - name: Build RISC-V toolchains
       uses: ./.github/actions/toolchain-build
 
-=======
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
     - uses: actions/cache@v2
       id: rtl-build-id
       with:
@@ -42,24 +28,13 @@ runs:
           sims/firesim/sim
           generators/gemmini/software/gemmini-rocc-tests
         key: ${{ inputs.group-key }}-${{ github.ref }}-${{ github.sha }}
-<<<<<<< HEAD
 
     - name: Run RTL build if not cached
-=======
-    - name: run rtl build script if not cached
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
       run: |
         if [[ "${{ steps.rtl-build-id.outputs.cache-hit }}" != 'true' ]]; then
           echo "Cache miss on ${{ inputs.group-key }}-${{ github.ref }}-${{ github.sha }}"
           ./.github/scripts/${{ inputs.build-script }} ${{ inputs.group-key }} ${{ inputs.build-type }}
         else
-<<<<<<< HEAD
           echo "Cache hit do not rebuild RTL for ${{ inputs.group-key }}"
         fi
       shell: bash
-=======
-          echo "cache hit do not prepare rtl"
-        fi
-      shell: bash
-
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
diff --git a/.github/actions/toolchain-build/action.yml b/.github/actions/toolchain-build/action.yml
index 95cb0a4d..c3492054 100644
--- a/.github/actions/toolchain-build/action.yml
+++ b/.github/actions/toolchain-build/action.yml
@@ -1,5 +1,4 @@
 name: toolchain-build
-<<<<<<< HEAD
 description: 'Build/cache both toolchains'
 
 runs:
@@ -50,33 +49,3 @@ runs:
     - name: Build ESP RISC-V toolchain if not cached
       run: ./.github/scripts/build-toolchains.sh esp-tools
       shell: bash
-=======
-description: 'Builds the selected toolchain'
-
-inputs:
-  tools-version:
-    description: Which toolchain to build
-    required: false
-    default: 'riscv-tools'
-  cache-key:
-    description: Use this for caching
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/cache@v2
-      id: toolchain-build-id
-      with:
-        path: ${{ inputs.tools-version }}-install
-        key: ${{ inputs.cache-key }}
-    - name: run build toolchain if not cached
-      run: |
-        if [[ "${{ steps.toolchain-build-id.outputs.cache-hit }}" != 'true' ]]; then
-          echo "Cache miss on ${{ inputs.tools-version }}-install"
-          ./.github/scripts/build-toolchains.sh ${{ inputs.tools-version }}
-        else
-          echo "cache hit do not generate build ${{ inputs.tools-version }}"
-        fi
-      shell: bash
-
->>>>>>> 52c752ba... Move Chipyard CI to Github Actions
diff --git a/.github/scripts/build-extra-tests.sh b/.github/scripts/build-extra-tests.sh
index e38b50fe..a77f5482 100755
--- a/.github/scripts/build-extra-tests.sh
+++ b/.github/scripts/build-extra-tests.sh
@@ -7,5 +7,9 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
+export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
+export LD_LIBRARY_PATH="$RISCV/lib"
+export PATH="$RISCV/bin:$PATH"
+
 make -C $LOCAL_CHIPYARD_DIR/tests clean
 make -C $LOCAL_CHIPYARD_DIR/tests
diff --git a/.github/scripts/build-toolchains.sh b/.github/scripts/build-toolchains.sh
index 160b6f5a..1f23c408 100755
--- a/.github/scripts/build-toolchains.sh
+++ b/.github/scripts/build-toolchains.sh
@@ -15,4 +15,7 @@ if [ ! -d "$HOME/$1-install" ]; then
 
     # init all submodules including the tools
     CHIPYARD_DIR="$LOCAL_CHIPYARD_DIR" NPROC=$CI_MAKE_NPROC $LOCAL_CHIPYARD_DIR/scripts/build-toolchains.sh $1
+
+    # de-init the toolchain area to save on space (forced to ignore local changes)
+    git submodule deinit --force $LOCAL_CHIPYARD_DIR/toolchains/$1
 fi
diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh
index 1b59191e..004acc5a 100755
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -9,7 +9,6 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
-# enter bhd repo
 cd $LOCAL_CHIPYARD_DIR
 
 # ignore the private vlsi submodules
diff --git a/.github/scripts/create-hash.sh b/.github/scripts/create-hash.sh
index dae9f25d..f64c0696 100755
--- a/.github/scripts/create-hash.sh
+++ b/.github/scripts/create-hash.sh
@@ -17,4 +17,4 @@ for tools in 'riscv-tools' 'esp-tools' ; do
         echo "${line#[!0-9a-f]}"
     done > "${tools}.hash"
 done
-echo "Hashfile for riscv-tools and esp-tools created in $HOME"
+echo "Hashfile for riscv-tools and esp-tools created in $PWD"
diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index cb48e932..04ccd331 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -1,20 +1,19 @@
 #!/bin/bash
 
 # make parallelism
-CI_MAKE_NPROC=4
+CI_MAKE_NPROC=8
 # chosen based on a 24c system shared with 1 other project
 REMOTE_MAKE_NPROC=4
 
 # verilator version
 VERILATOR_VERSION=v4.034
 
-# remote variables
-
+HOME=$GITHUB_WORKSPACE
 CURRENT_BRANCH=$(git branch --show-current)
 
+# remote variables
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
-HOME=`pwd`
 REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-$CURRENT_BRANCH
 REMOTE_WORK_DIR=$GITHUB_WORKSPACE
 REMOTE_RISCV_DIR=$GITHUB_WORKSPACE/riscv-tools-install
diff --git a/.github/scripts/do-rtl-build.sh b/.github/scripts/do-rtl-build.sh
deleted file mode 100755
index 1cf06978..00000000
--- a/.github/scripts/do-rtl-build.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# create the different verilator builds
-# usage:
-#   do-rtl-build.sh <make command string> sim
-#     run rtl build for simulations and copy back results
-#   do-rtl-build.sh <make command string> fpga
-#     run rtl build for fpga and don't copy back results
-
-# turn echo on and error on earliest command
-set -ex
-
-# get shared variables
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-source $SCRIPT_DIR/defaults.sh
-
-# call clean on exit
-trap clean EXIT
-
-cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh
-./scripts/init-fpga.sh
-
-TOOLS_DIR=$REMOTE_RISCV_DIR
-LD_LIB_DIR=$REMOTE_RISCV_DIR/lib
-
-if [ $1 = "group-accels" ]; then
-    export RISCV=$REMOTE_ESP_DIR
-    export LD_LIBRARY_PATH=$REMOTE_ESP_DIR/lib
-    export PATH=$RISCV/bin:$PATH
-    GEMMINI_SOFTWARE_DIR=$REMOTE_CHIPYARD_DIR/generators/gemmini/software/gemmini-rocc-tests
-    cd $GEMMINI_SOFTWARE_DIR
-    git submodule update --init --recursive gemmini-rocc-tests
-    cd gemmini-rocc-tests
-    ./build.sh
-fi
-
-# choose what make dir to use
-
-case $2 in
-    "sim")
-        REMOTE_MAKE_DIR=$REMOTE_SIM_DIR
-        ;;
-    "fpga")
-        REMOTE_MAKE_DIR=$REMOTE_FPGA_DIR
-        ;;
-esac
-
-# enter the verilator directory and build the specific config on remote server
-export RISCV=$TOOLS_DIR
-make -C $REMOTE_MAKE_DIR clean
-
-read -a keys <<< ${grouping[$1]}
-
-# need to set the PATH to use the new verilator (with the new verilator root)
-for key in "${keys[@]}"
-do
-    export RISCV=$TOOLS_DIR
-    export LD_LIBRARY_PATH=$LD_LIB_DIR
-    export PATH=$REMOTE_VERILATOR_DIR/bin:$PATH
-    export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR
-    export COURSIER_CACHE=$REMOTE_WORK_DIR/.coursier-cache
-    make -j$REMOTE_MAKE_NPROC -C $REMOTE_MAKE_DIR FIRRTL_LOGLEVEL=info JAVA_OPTS=$REMOTE_JAVA_OPTS SBT_OPTS=$REMOTE_SBT_OPTS ${mapping[$key]}
-done
-
-rm -rf $REMOTE_CHIPYARD_DIR/project
diff --git a/.github/scripts/install-verilator.sh b/.github/scripts/install-verilator.sh
deleted file mode 100755
index 1159fc47..00000000
--- a/.github/scripts/install-verilator.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# move verilator to the remote server
-
-# turn echo on and error on earliest command
-set -ex
-
-# get shared variables
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-source $SCRIPT_DIR/defaults.sh
-
-# clean older directories (delete prior directories related to this branch also)
-
-$SCRIPT_DIR/clean-old-files.sh $CI_DIR
-rm -rf $REMOTE_PREFIX*
-
-git clone http://git.veripool.org/git/verilator $REMOTE_VERILATOR_DIR
-cd $REMOTE_VERILATOR_DIR
-git checkout $VERILATOR_VERSION
-autoconf
-export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR
-./configure
-make -j$REMOTE_MAKE_NPROC
diff --git a/.github/scripts/run-firesim-scala-tests.sh b/.github/scripts/run-firesim-scala-tests.sh
deleted file mode 100755
index 9b329fa7..00000000
--- a/.github/scripts/run-firesim-scala-tests.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# create the different verilator builds
-# argument is the make command string
-
-# turn echo on and error on earliest command
-set -ex
-
-# get shared variables
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-source $SCRIPT_DIR/defaults.sh
-
-# call clean on exit
-trap clean EXIT
-
-export RISCV="$REMOTE_RISCV_DIR"
-export LD_LIBRARY_PATH="$RISCV/lib"
-export PATH="$RISCV/bin:$PATH"
-
-# Directory locations for handling firesim-local installations of libelf/libdwarf
-# This would generally be handled by build-setup.sh/firesim-setup.sh
-firesim_sysroot=lib-install
-remote_firesim_sysroot=$REMOTE_FIRESIM_DIR/$firesim_sysroot
-
-cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh
-cd $REMOTE_CHIPYARD_DIR/sims/firesim/sim/firesim-lib/src/main/cc/lib
-git submodule update --init elfutils libdwarf
-cd $REMOTE_CHIPYARD_DIR/sims/firesim
-mkdir -p $remote_firesim_sysroot
-./scripts/build-libelf.sh $remote_firesim_sysroot
-./scripts/build-libdwarf.sh $remote_firesim_sysroot
-cd $REMOTE_CHIPYARD_DIR
-
-make -C $REMOTE_CHIPYARD_DIR/tools/dromajo/dromajo-src/src
-
-TOOLS_DIR=$REMOTE_RISCV_DIR
-
-LD_LIB_DIR=$remote_firesim_sysroot/lib:$REMOTE_RISCV_DIR/lib
-
-# Run Firesim Scala Tests
-export RISCV=$TOOLS_DIR
-export LD_LIBRARY_PATH=$LD_LIB_DIR
-export FIRESIM_ENV_SOURCED=1;
-export PATH=$REMOTE_VERILATOR_DIR/bin:$PATH
-export VERILATOR_ROOT=$REMOTE_VERILATOR_DIR
-export COURSIER_CACHE=$REMOTE_WORK_DIR/.coursier-cache
-make -C $REMOTE_FIRESIM_DIR JAVA_OPTS=$REMOTE_JAVA_OPTS SBT_OPTS=$REMOTE_SBT_OPTS testOnly ${mapping[$1]}
diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh
index ab3cf5cc..ffa61db5 100755
--- a/.github/scripts/run-tests.sh
+++ b/.github/scripts/run-tests.sh
@@ -9,12 +9,18 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
+export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
+export LD_LIBRARY_PATH="$RISCV/lib"
+export PATH="$RISCV/bin:$PATH"
+
+DISABLE_SIM_PREREQ="BREAK_SIM_PREREQ=1"
+
 run_bmark () {
-    make run-bmark-tests-fast -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $@
+    make run-bmark-tests-fast -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ $@
 }
 
 run_asm () {
-    make run-asm-tests-fast -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $@
+    make run-asm-tests-fast -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ $@
 }
 
 run_both () {
@@ -23,11 +29,9 @@ run_both () {
 }
 
 run_tracegen () {
-    make tracegen -C $LOCAL_SIM_DIR $@
+    make tracegen -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ $@
 }
 
-# TODO BUG: the run-binary command forces a rebuild of the simulator in CI
-#           instead, directly run the simulator binary
 case $1 in
     chipyard-rocket)
         run_bmark ${mapping[$1]}
@@ -51,7 +55,7 @@ case $1 in
         export RISCV=$LOCAL_ESP_DIR
         export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
         export PATH=$RISCV/bin:$PATH
-        make run-rv64uv-p-asm-tests -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR ${mapping[$1]}
+        make run-rv64uv-p-asm-tests -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]}
         ;;
     chipyard-gemmini)
         export RISCV=$LOCAL_ESP_DIR
@@ -60,32 +64,32 @@ case $1 in
         GEMMINI_SOFTWARE_DIR=$LOCAL_SIM_DIR/../../generators/gemmini/software/gemmini-rocc-tests
         rm -rf $GEMMINI_SOFTWARE_DIR/riscv-tests
         cd $LOCAL_SIM_DIR
-        $LOCAL_SIM_DIR/simulator-chipyard-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/aligned-baremetal
-        $LOCAL_SIM_DIR/simulator-chipyard-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/raw_hazard-baremetal
-        $LOCAL_SIM_DIR/simulator-chipyard-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/aligned-baremetal
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/raw_hazard-baremetal
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal
         ;;
     chipyard-sha3)
         export RISCV=$LOCAL_ESP_DIR
         export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
         export PATH=$RISCV/bin:$PATH
         (cd $LOCAL_CHIPYARD_DIR/generators/sha3/software && ./build.sh)
-        $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/tests/bare/sha3-rocc.riscv
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$LOCAL_CHIPYARD_DIR/generators/sha3/software/tests/bare/sha3-rocc.riscv
         ;;
     chipyard-streaming-passthrough)
         make -C $LOCAL_CHIPYARD_DIR/tests
-        $LOCAL_SIM_DIR/simulator-chipyard-StreamingPassthroughRocketConfig $LOCAL_CHIPYARD_DIR/tests/streaming-passthrough.riscv
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$LOCAL_CHIPYARD_DIR/tests/streaming-passthrough.riscv
         ;;
     chipyard-streaming-fir)
         make -C $LOCAL_CHIPYARD_DIR/tests
-        $LOCAL_SIM_DIR/simulator-chipyard-StreamingFIRRocketConfig $LOCAL_CHIPYARD_DIR/tests/streaming-fir.riscv
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} run-binary-fast BINARY=$LOCAL_CHIPYARD_DIR/tests/streaming-fir.riscv
         ;;
     chipyard-spiflashread)
         make -C $LOCAL_CHIPYARD_DIR/tests
-        make -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashread.riscv SIM_FLAGS="+spiflash0=${LOCAL_CHIPYARD_DIR}/tests/spiflash.img" run-binary
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashread.riscv SIM_FLAGS="+spiflash0=${LOCAL_CHIPYARD_DIR}/tests/spiflash.img" run-binary-fast
         ;;
     chipyard-spiflashwrite)
         make -C $LOCAL_CHIPYARD_DIR/tests
-        make -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashwrite.riscv SIM_FLAGS="+spiflash0=${LOCAL_CHIPYARD_DIR}/tests/spiflash.img" run-binary
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashwrite.riscv SIM_FLAGS="+spiflash0=${LOCAL_CHIPYARD_DIR}/tests/spiflash.img" run-binary-fast
         [[ "`xxd $LOCAL_CHIPYARD_DIR/tests/spiflash.img  | grep 1337\ 00ff\ aa55\ face | wc -l`" == "6" ]] || false
         ;;
     tracegen)
@@ -95,20 +99,20 @@ case $1 in
         run_tracegen ${mapping[$1]}
         ;;
     chipyard-cva6)
-        make run-binary-fast -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/multiply.riscv
+        make run-binary-fast -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/multiply.riscv
         ;;
     chipyard-sodor)
         run_asm ${mapping[$1]}
         ;;
     chipyard-nvdla)
         make -C $LOCAL_CHIPYARD_DIR/tests
-        make -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/nvdla.riscv run-binary
+        make -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]} BINARY=$LOCAL_CHIPYARD_DIR/tests/nvdla.riscv run-binary-fast
         ;;
     icenet)
-        make run-binary-fast BINARY=none -C $LOCAL_SIM_DIR ${mapping[$1]}
+        make run-binary-fast BINARY=none -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]}
         ;;
     testchipip)
-        make run-binary-fast BINARY=none -C $LOCAL_SIM_DIR ${mapping[$1]}
+        make run-binary-fast BINARY=none -C $LOCAL_SIM_DIR $DISABLE_SIM_PREREQ ${mapping[$1]}
         ;;
     *)
         echo "No set of tests for $1. Did you spell it right?"
diff --git a/.github/workflows/chipyard-rocket-run-tests.yml b/.github/workflows/chipyard-rocket-run-tests.yml
deleted file mode 100644
index 74dd262c..00000000
--- a/.github/workflows/chipyard-rocket-run-tests.yml
+++ /dev/null
@@ -1,1285 +0,0 @@
-name: chipyard-ci-process
-
-on: [push]
-
-env:
-  tools-cache-version: v7
-  CI_DIR: ${{ secrets.BUILDDIR }}
-
-jobs:
-  commit-on-master-check:
-    name: commit-on-master-check
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check commits of each submodule
-        run: .github/scripts/check-commit.sh
-
-  tutorial-setup-check:
-    name: tutorial-setup-check
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check that the tutorial-setup patches apply
-        run: scripts/tutorial-setup.sh
-
-  documentation-check:
-    name: documentation-check
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check that documentation builds with no warnings/errors
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y python3-pip
-          sudo pip3 install -r docs/requirements.txt
-          make -C docs html
-      - name: Show error log from sphinx if failed
-        if: ${{ failure() }}
-        run: cat /tmp/sphinx-err*.log
-
-  make-keys:
-    name: make-keys
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Generate hashes
-        run: .github/scripts/create-hash.sh
-      - name: Generate keys
-        id: genkey
-        run: |
-          echo "::set-output name=riscvtools-cache-key::riscv-tools-installed-${{ env.tools-cache-version }}-$(shasum riscv-tools.hash | cut -d' ' -f1)"
-          echo "::set-output name=esptools-cache-key::esp-tools-installed-${{ env.tools-cache-version }}-$(shasum esp-tools.hash | cut -d' ' -f1)"
-          echo "::set-output name=extra-tests-cache-key::extra-tests-${{ github.ref }}-${{ github.sha }}"
-      - name: Show key
-        run: |
-          echo "riscvtools key is " ${{ steps.genkey.outputs.riscvtools-cache-key }}
-          echo "esptools key is " ${{ steps.genkey.outputs.esptools-cache-key }}
-          echo "extra-tests key is " ${{ steps.genkey.outputs.extra-tests-cache-key }}
-    outputs:
-      riscvtools-cache-key: ${{ steps.genkey.outputs.riscvtools-cache-key }}
-      esptools-cache-key: ${{ steps.genkey.outputs.esptools-cache-key }}
-      extra-tests-cache-key: ${{ steps.genkey.outputs.extra-tests-cache-key }}
-
-  install-riscv-toolchain:
-    needs: make-keys
-    name: install-riscv-toolchain
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-
-  install-esp-toolchain:
-    needs: make-keys
-    name: install-esp-toolchain
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Build ESP RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'esp-tools'
-          cache-key: ${{ needs.make-keys.outputs.esptools-cache-key }}
-
-  build-extra-tests:
-    name: build-extra-tests
-    needs: [make-keys, install-riscv-toolchain]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - uses: actions/cache@v2
-        id: build-extra-tools-cache
-        with:
-          path: extra-tests-install
-          key: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
-          restore-keys: ${{ needs.make-keys.outputs.extra-tests-cache-key }}
-      - name: Build extra tests if not cached
-        run: |
-          export RISCV="/__w/chipyard/chipyard/riscv-tools-install"
-          export LD_LIBRARY_PATH="$RISCV/lib"
-          export PATH="$RISCV/bin:$PATH"
-          .github/scripts/build-extra-tests.sh
-
-  install-verilator:
-    name: install-verilator
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Build verilator on remote
-        run: .github/scripts/install-verilator.sh
-
-  # Sentinel job to simplify how we specify which that basic setup is complete
-  #
-  # When adding new prep jobs, please add them to `needs` below
-  setup-complete:
-    name: "setup complete"
-    needs: [commit-on-master-check, tutorial-setup-check, documentation-check,
-            install-riscv-toolchain, install-esp-toolchain, install-verilator,
-            build-extra-tests]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up complete
-        run: echo Set up is complete!
-
-  ##########################################################################
-
-  prepare-chipyard-cores:
-    name: prepare-chipyard-cores
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-
-  prepare-chipyard-peripherals:
-    name: prepare-chipyard-peripherals
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-peripherals"
-
-  prepare-chipyard-accels:
-    name: prepare-chipyard-accels
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build ESP RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'esp-tools'
-          cache-key: ${{ needs.make-keys.outputs.esptools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-
-  prepare-chipyard-tracegen:
-    name: prepare-chipyard-tracegen
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-tracegen"
-
-  prepare-chipyard-other:
-    name: prepare-chipyard-other
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-other"
-
-  prepare-chipyard-fpga:
-    name: prepare-chipyard-fpga
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-fpga"
-          build-type: "fpga"
-
-  ##########################################################################
-
-  chipyard-rocket-run-tests:
-    name: chipyard-rocket-run-tests
-    needs: [make-keys, prepare-chipyard-cores]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-rocket"
-
-  chipyard-hetero-run-tests:
-    name: chipyard-hetero-run-tests
-    needs: [make-keys, prepare-chipyard-cores]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-hetero"
-
-  chipyard-boom-run-tests:
-    name: chipyard-boom-run-tests
-    needs: [make-keys, prepare-chipyard-cores]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-boom"
-
-  chipyard-cva6-run-tests:
-    name: chipyard-cva6-run-tests
-    needs: [make-keys, prepare-chipyard-cores]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-cva6"
-
-  chipyard-sodor-run-tests:
-    name: chipyard-sodor-run-tests
-    needs: [make-keys, prepare-chipyard-cores]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-cores"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-cores"
-          project-key: "chipyard-sodor"
-
-  chipyard-dmirocket-run-tests:
-    name: chipyard-dmirocket-run-tests
-    needs: [make-keys, prepare-chipyard-peripherals]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-peripherals"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-peripherals"
-          project-key: "chipyard-dmirocket"
-
-  chipyard-spiflashwrite-run-tests:
-    name: chipyard-spiflashwrite-run-tests
-    needs: [make-keys, prepare-chipyard-peripherals]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-peripherals"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-peripherals"
-          project-key: "chipyard-spiflashwrite"
-
-  chipyard-spiflashread-run-tests:
-    name: chipyard-spiflashread-run-tests
-    needs: [make-keys, prepare-chipyard-peripherals]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-peripherals"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-peripherals"
-          project-key: "chipyard-spiflashread"
-
-  chipyard-lbwif-run-tests:
-    name: chipyard-lbwif-run-tests
-    needs: [make-keys, prepare-chipyard-peripherals]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-peripherals"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-peripherals"
-          project-key: "chipyard-lbwif"
-
-  chipyard-sha3-run-tests:
-    name: chipyard-sha3-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build ESP RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'esp-tools'
-          cache-key: ${{ needs.make-keys.outputs.esptools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-sha3"
-
-  chipyard-streaming-fir-run-tests:
-    name: chipyard-streaming-fir-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-streaming-fir"
-
-  chipyard-streaming-passthrough-run-tests:
-    name: chipyard-streaming-passthrough-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-streaming-passthrough"
-
-  chipyard-hwacha-run-tests:
-    name: chipyard-hwacha-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build ESP RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'esp-tools'
-          cache-key: ${{ needs.make-keys.outputs.esptools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-hwacha"
-
-  chipyard-gemmini-run-tests:
-    name: chipyard-gemmini-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build ESP RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'esp-tools'
-          cache-key: ${{ needs.make-keys.outputs.esptools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-gemmini"
-
-  chipyard-nvdla-run-tests:
-    name: chipyard-nvdla-run-tests
-    needs: [make-keys, prepare-chipyard-accels]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-accels"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-accels"
-          project-key: "chipyard-nvdla"
-
-  tracegen-boom-run-tests:
-    name: tracegen-boom-run-tests
-    needs: [make-keys, prepare-chipyard-tracegen]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-tracegen"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-tracegen"
-          project-key: "tracegen-boom"
-
-  tracegen-run-tests:
-    name: tracegen-run-tests
-    needs: [make-keys, prepare-chipyard-tracegen]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-tracegen"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-tracegen"
-          project-key: "tracegen"
-
-  icenet-run-tests:
-    name: icenet-run-tests
-    needs: [make-keys, prepare-chipyard-other]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-other"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-other"
-          project-key: "icenet"
-
-  testchipip-run-tests:
-    name: testchipip-run-tests
-    needs: [make-keys, prepare-chipyard-other]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "group-other"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "group-other"
-          project-key: "testchipip"
-
-  firesim-run-tests:
-    name: firesim-run-tests
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "extra-tests"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "extra-tests"
-          project-key: "firesim"
-          run-script: "run-firesim-scala-tests.sh"
-
-  fireboom-run-tests:
-    name: fireboom-run-tests
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "extra-tests"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "extra-tests"
-          project-key: "fireboom"
-          run-script: "run-firesim-scala-tests.sh"
-
-  firesim-multiclock-run-tests:
-    name: firesim-multiclock-run-tests
-    needs: [make-keys, setup-complete]
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    env:
-      BUILDSERVER: ${{ secrets.BUILDSERVER }}
-      BUILDUSER: ${{ secrets.BUILDUSER }}
-      SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-      JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.SERVERKEY }}
-          known_hosts: ${{ secrets.BUILDSERVER }}
-      - name: Init submodules
-        run: ./scripts/init-submodules-no-riscv-tools.sh
-      - name: Check commits of each submodle
-        run: .github/scripts/check-commit.sh
-      - name: Build default RISC-V toolchain
-        uses: ./.github/actions/toolchain-build
-        with:
-          tools-version: 'riscv-tools'
-          cache-key: ${{ needs.make-keys.outputs.riscvtools-cache-key }}
-      - name: Build RTL
-        uses: ./.github/actions/prepare-rtl
-        with:
-          group-key: "extra-tests"
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          group-key: "extra-tests"
-          project-key: "firesim-multiclock"
-          run-script: "run-firesim-scala-tests.sh"
-
-  # Sentinel job to simplify how we specify which checks need to pass in branch
-  # protection and in Mergify
-  #
-  # When adding new top level jobs, please add them to `needs` below
-  all_tests_passed:
-    name: "all tests passed"
-    needs: [chipyard-rocket-run-tests, chipyard-hetero-run-tests, chipyard-boom-run-tests, chipyard-cva6-run-tests,
-            chipyard-sodor-run-tests, chipyard-dmirocket-run-tests, chipyard-spiflashwrite-run-tests,
-            chipyard-spiflashread-run-tests, chipyard-lbwif-run-tests, chipyard-sha3-run-tests,
-            chipyard-streaming-fir-run-tests, chipyard-streaming-passthrough-run-tests, chipyard-hwacha-run-tests,
-            chipyard-gemmini-run-tests, chipyard-nvdla-run-tests,
-            tracegen-boom-run-tests, tracegen-run-tests,
-            icenet-run-tests, testchipip-run-tests,
-            firesim-run-tests, fireboom-run-tests, firesim-multiclock-run-tests]
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo Success!
\ No newline at end of file
diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index fc74e3c0..c932d3e6 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -20,7 +20,6 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-<<<<<<< HEAD
   commit-on-master-check:
     name: commit-on-master-check
     runs-on: ubuntu-latest
@@ -138,7 +137,6 @@ jobs:
         run: .github/scripts/remote-install-verilator.sh
       - uses: ./.github/actions/job-end
 
-<<<<<<< HEAD
   # Sentinel job to simplify how we specify which that basic setup is complete
   #
   # When adding new prep jobs, please add them to `needs` below