Merge branch 'main' of https://github.com/ucb-bar/chipyard into openroad

.gitattributes

@@ -0,0 +1,2 @@
+conda-requirements-esp-tools-linux-64.conda-lock.yml linguist-generated=true
+conda-requirements-riscv-tools-linux-64.conda-lock.yml linguist-generated=true

.github/CI_README.md

@@ -22,7 +22,7 @@ For example:
 This specifies that the `prepare-chipyard-cores` job needs the both the `make-keys` and the `setup-complete` steps to
 be completed before it can run.
 
-Chipyard runs its CI using a docker image created from `dockerfiles/Dockerfile`.
+Chipyard runs its CI using a docker image created from `dockerfiles/Dockerfile` and on Berkeley's compute infrastructure.
 See its [README](../dockerfiles/README.md) for more details.
 
 Finally, within each job's `steps:` section, the steps are run sequentially and state persists throughout a job.
@@ -71,9 +71,7 @@ Our own composite actions are defined in the `.github/actions/<ActionName>/actio
 This directory contains most the collateral for the Chipyard CI to work.
 The following is included in `.github/scripts/: directory
 
-    `build-toolchains.sh`        # build either riscv-tools or esp-tools
+    `remote-do-rtl-build.sh`     # use verilator to build a sim executable (remotely)
-    `create-hash.sh`             # create hashes of riscv-tools/esp-tools to use as hash keys
-    `remote-do-rtl-build.sh`            # use verilator to build a sim executable (remotely)
     `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/
@@ -101,21 +99,9 @@ To get the CI to work correctly you need to create the following GH Repository S
 
 | Secret | Value |
 | -------| ------------- |
-| BUILDSERVER | the hostname of the remote build server (likely be a millennium machine) |
-| BUILDUSER | the login to use on the build server |
 | BUILDDIR | the directory to use on the build server |
-| SERVERKEY | a private key to access the build server |
 
-The main workflow also constructs and places in the environment a SERVER and a work directyory on that server env using the above secrets.
+Additionally, you need to install conda on the build servers that exist.
-The SERVER is constructed like this:
-```bash
-SERVER = ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
-```
-
-Additionally, you need to add under the "PERMISSIONS" "SSH Permissions" section a private key that is on the build server that you are using.
-After adding a private key, it will show a fingerprint that should be added under the jobs that need to be run.
-
-Note: On the remote server you need to have the `*.pub` key file added to the `authorized_keys` file.
 
 Notes on CIRCLE CI
 ------------------

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -31,7 +31,7 @@ body:
       description: OS setup for reproducibility
       placeholder: OS information
       value: |
-        Ex: Output of `uname -a` and `lsb_release -a`
+        Ex: Output of `uname -a` + `lsb_release -a` + `printenv` + `conda list`
     validations:
       required: true
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,6 +37,7 @@ Provide a brief description of the PR immediately below this comment, if the tit
 - [ ] Did you state the type-of-change/impact?
 - [ ] Did you delete any extraneous prints/debugging code?
 - [ ] Did you mark the PR with a `changelog:` label?
+- [ ] (If applicable) Did you update the conda `.conda-lock.yml` file if you updated the conda requirements file?
 - [ ] (If applicable) Did you add documentation for the feature?
 - [ ] (If applicable) Did you add a test demonstrating the PR?
 <!-- Do this if this PR is a bugfix that should be applied to the latest release -->

.github/actions/cleanup-conda/action.yml

@@ -0,0 +1,28 @@
+name: cleanup-conda
+description: 'Remove extra conda environments'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Remove extra conda environments
+      run: |
+        CONDA_REMOVE_NAMES=$(conda env list | awk '{print $1}' | tail -n +3 | grep "${{ env.conda-env-name-no-time }}" || true)
+        if [ -z "$CONDA_REMOVE_NAMES" ]; then
+          echo "No matching conda environments for ${{ env.conda-env-name-no-time }}. Skip removal."
+        else
+          echo "Removing $CONDA_REMOVE_NAMES conda environments."
+          for env in $CONDA_REMOVE_NAMES; do
+            conda env remove -n $env
+          done
+        fi
+        conda env list | awk '{print $1}' | tail -n +4 | while read envname; do
+          ENV_DATE=$(echo $envname | sed "s/cy-[[:digit:]]\+-\(.*\)-\(riscv\|esp\)-tools/\1/")
+          NUM_DIFF=$(( ( $(date +%s) - $(date --date="$ENV_DATE" +%s) )/(60*60*24) ))
+          if (( $NUM_DIFF > 7 )); then
+            echo "Removing $envname since it is $NUM_DIFF days old."
+            conda env remove -n $envname
+          else
+            echo "Skipping removal of $envname since it is $NUM_DIFF days old."
+          fi
+        done
+      shell: bash -leo pipefail {0}

.github/actions/create-conda-env/action.yml

@@ -0,0 +1,33 @@
+name: create-conda-env
+description: 'Create conda environments if they dont exist'
+inputs:
+  install-collateral:
+    description: 'Install Spike/Libgloss/etc'
+    required: false
+    default: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Create conda environments
+      run: |
+        if conda env list | grep -q "envs/${{ env.conda-env-name-no-time }}"; then
+          echo "Using pre-existing conda environments with prefix ${{ env.conda-env-name-no-time }}"
+        else
+          echo "Creating a conda environment for each toolchain with the toolchain installed"
+          conda activate base
+          conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools ./conda-requirements-riscv-tools-linux-64.conda-lock.yml
+          conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools ./conda-requirements-esp-tools-linux-64.conda-lock.yml
+          conda deactivate
+
+          if [[ "${{ inputs.install-collateral }}" == 'true' ]]; then
+            echo "Add extra toolchain collateral to RISC-V install area"
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
+            ./scripts/build-toolchain-extra.sh riscv-tools
+            conda deactivate
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools
+            ./scripts/build-toolchain-extra.sh esp-tools
+            conda deactivate
+          fi
+        fi
+      shell: bash -leo pipefail {0}

.github/actions/git-workaround/action.yml

@@ -0,0 +1,15 @@
+name: git-workaround
+description: 'Workaround https://github.com/actions/checkout/issues/766'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Workaround
+      run: |
+        if git config --global -l | grep -q "safe.directory=$GITHUB_WORKSPACE"; then
+            echo "Skip adding safe directory"
+        else
+            echo "Add $GITHUB_WORKSPACE to global git config"
+            git config --global --add safe.directory "$GITHUB_WORKSPACE"
+        fi
+      shell: bash -leo pipefail {0}

.github/actions/prepare-rtl/action.yml

@@ -13,28 +13,30 @@ inputs:
     description: type of build
     required: false
     default: "sim"
+  toolchain:
+    description: toolchain to use
+    required: false
+    default: "riscv-tools"
 
 runs:
   using: "composite"
   steps:
-    - name: Build RISC-V toolchains
+    - uses: actions/cache@v3
-      uses: ./.github/actions/toolchain-build
-
-    - uses: actions/cache@v2
       id: rtl-build-id
       with:
         path: |
           sims/verilator
           sims/firesim/sim
           generators/gemmini/software/gemmini-rocc-tests
-        key: ${{ inputs.group-key }}-${{ github.ref }}-${{ github.sha }}
+        key: ${{ inputs.group-key }}-${{ github.sha }}
 
     - name: Run RTL build if not cached
       run: |
+        conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
         if [[ "${{ steps.rtl-build-id.outputs.cache-hit }}" != 'true' ]]; then
-          echo "Cache miss on ${{ inputs.group-key }}-${{ github.ref }}-${{ github.sha }}"
+          echo "Cache miss on ${{ inputs.group-key }}-${{ github.sha }}"
           ./.github/scripts/${{ inputs.build-script }} ${{ inputs.group-key }} ${{ inputs.build-type }}
         else
           echo "Cache hit do not rebuild RTL for ${{ inputs.group-key }}"
         fi
-      shell: bash
+      shell: bash -leo pipefail {0}

.github/actions/run-tests/action.yml

@@ -12,20 +12,29 @@ inputs:
     description: rtl build script to use
     required: false
     default: "run-tests.sh"
+  toolchain:
+    description: toolchain to use
+    required: false
+    default: "riscv-tools"
 
 runs:
   using: "composite"
   steps:
     - name: Init submodules (since only the RTL is cached)
-      run: ./scripts/init-submodules-no-riscv-tools.sh --skip-validate
+      run: |
-      shell: bash
+        conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
+        ./scripts/init-submodules-no-riscv-tools.sh --force
+      shell: bash -leo pipefail {0}
 
     # Note: You shouldn't need the other inputs since it shouldn't build RTL from scratch
     - name: Build RTL
       uses: ./.github/actions/prepare-rtl
       with:
         group-key: ${{ inputs.group-key }}
+        toolchain: ${{ inputs.toolchain }}
 
     - name: Run RTL tests
-      run: ./.github/scripts/${{ inputs.run-script }} ${{ inputs.project-key }}
+      run: |
-      shell: bash
+        conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
+        ./.github/scripts/${{ inputs.run-script }} ${{ inputs.project-key }}
+      shell: bash -leo pipefail {0}

.github/actions/toolchain-build/action.yml

@@ -1,51 +0,0 @@
-name: toolchain-build
-description: 'Build/cache both toolchains'
-
-runs:
-  using: "composite"
-  steps:
-    - name: Generate hashes
-      run: .github/scripts/create-hash.sh
-      shell: bash
-
-    # since "hashFiles" function differs on self-hosted vs GH-A machines
-    # make sure to cache the GH-A hashFiles result so that self-hosted can use it
-    - run: |
-        echo "${{ hashFiles('**/riscv-tools.hash') }}" > riscv-tools.hashFilesOutput
-        echo "${{ hashFiles('**/esp-tools.hash') }}" > esp-tools.hashFilesOutput
-      shell: bash
-
-    - name: Cache hashFiles outputs
-      uses: actions/cache@v2
-      with:
-        path: |
-          riscv-tools.hashFilesOutput
-          esp-tools.hashFilesOutput
-        key: hashFiles-${{ github.sha }}
-
-    - name: Generate cache keys based off hashFiles output
-      id: genkey
-      run: |
-        echo "::set-output name=riscv-tools-cache-key::$(cat riscv-tools.hashFilesOutput)"
-        echo "::set-output name=esp-tools-cache-key::$(cat esp-tools.hashFilesOutput)"
-      shell: bash
-
-    - name: Cache riscv-tools
-      uses: actions/cache@v2
-      with:
-        path: riscv-tools-install
-        key: riscv-tools-installed-${{ env.tools-cache-version }}-${{ steps.genkey.outputs.riscv-tools-cache-key }}
-
-    - name: Cache esp-tools
-      uses: actions/cache@v2
-      with:
-        path: esp-tools-install
-        key: esp-tools-installed-${{ env.tools-cache-version }}-${{ steps.genkey.outputs.esp-tools-cache-key }}
-
-    - name: Build RISC-V toolchain if not cached
-      run: ./.github/scripts/build-toolchains.sh riscv-tools
-      shell: bash
-
-    - name: Build ESP RISC-V toolchain if not cached
-      run: ./.github/scripts/build-toolchains.sh esp-tools
-      shell: bash

.github/scripts/build-extra-tests.sh

@@ -7,9 +7,5 @@ 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

.github/scripts/build-toolchains.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# create the riscv tools/esp tools binaries
-# passed in as <riscv-tools or esp-tools>
-
-# turn echo on and error on earliest command
-set -ex
-
-# get shared variables
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-source $SCRIPT_DIR/defaults.sh
-
-if [ ! -d "$HOME/$1-install" ]; then
-    cd $HOME
-
-    # 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

.github/scripts/check-commit.sh

@@ -52,13 +52,22 @@ dir="generators"
 branches=("master" "main" "dev")
 search
 
-submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests")
+submodules=("esp-tools-feedstock")
+dir="toolchains/esp-tools"
+branches=("main")
+search
+
+submodules=("riscv-isa-sim" "riscv-pk" "riscv-tests")
 dir="toolchains/esp-tools"
 branches=("master")
 search
 
+submodules=("riscv-tools-feedstock")
+dir="toolchains/riscv-tools"
+branches=("main")
+search
 
-submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests")
+submodules=("riscv-isa-sim" "riscv-pk" "riscv-tests")
 dir="toolchains/riscv-tools"
 branches=("master")
 search
@@ -69,7 +78,7 @@ dir="toolchains/riscv-tools"
 branches=("riscv")
 search
 
-submodules=("qemu" "libgloss")
+submodules=("libgloss")
 dir="toolchains"
 branches=("master")
 search
@@ -84,11 +93,6 @@ dir="tools"
 branches=("master" "dev")
 search
 
-submodules=("dromajo-src")
-dir="tools/dromajo"
-branches=("master")
-search
-
 submodules=("firesim")
 dir="sims"
 branches=("master" "main" "dev" "1.13.x")

.github/scripts/create-hash.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# get the hash of riscv-tools
-
-# turn echo on and error on earliest command
-set -ex
-set -o pipefail
-
-# get shared variables
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-source $SCRIPT_DIR/defaults.sh
-
-# Use normalized output of git-submodule status as hashfile
-for tools in 'riscv-tools' 'esp-tools' ; do
-    git submodule status "toolchains/${tools}" 'toolchains/libgloss' 'toolchains/qemu' |
-    while read -r line ; do
-        echo "${line#[!0-9a-f]}"
-    done > "${tools}.hash"
-done
-echo "Hashfile for riscv-tools and esp-tools created in $PWD"

.github/scripts/defaults.sh

@@ -5,18 +5,11 @@ 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
-
-HOME=$GITHUB_WORKSPACE
-
 # remote variables
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
 REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
 REMOTE_WORK_DIR=$GITHUB_WORKSPACE
-REMOTE_RISCV_DIR=$GITHUB_WORKSPACE/riscv-tools-install
-REMOTE_ESP_DIR=$GITHUB_WORKSPACE/esp-tools-install
 REMOTE_CHIPYARD_DIR=$GITHUB_WORKSPACE
 REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
 REMOTE_FIRESIM_DIR=$REMOTE_CHIPYARD_DIR/sims/firesim/sim
@@ -24,13 +17,9 @@ REMOTE_FPGA_DIR=$REMOTE_CHIPYARD_DIR/fpga
 REMOTE_JAVA_OPTS="-Xmx10G -Xss8M"
 # Disable the supershell to greatly improve the readability of SBT output when captured by Circle CI
 REMOTE_SBT_OPTS="-Dsbt.ivy.home=$REMOTE_WORK_DIR/.ivy2 -Dsbt.supershell=false -Dsbt.global.base=$REMOTE_WORK_DIR/.sbt -Dsbt.boot.directory=$REMOTE_WORK_DIR/.sbt/boot"
-REMOTE_VERILATOR_DIR=$REMOTE_PREFIX-$GITHUB_SHA-verilator-install
 
 # local variables (aka within the docker container)
-LOCAL_CHECKOUT_DIR=$HOME/project
+LOCAL_CHIPYARD_DIR=$GITHUB_WORKSPACE
-LOCAL_RISCV_DIR=$HOME/riscv-tools-install
-LOCAL_ESP_DIR=$HOME/esp-tools-install
-LOCAL_CHIPYARD_DIR=$HOME
 LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verilator
 LOCAL_FIRESIM_DIR=$LOCAL_CHIPYARD_DIR/sims/firesim/sim
 

.github/scripts/install-conda.sh

@@ -0,0 +1,181 @@
+#!/bin/bash
+
+CONDA_INSTALL_PREFIX=/opt/conda
+CONDA_INSTALLER_VERSION=4.12.0-0
+CONDA_INSTALLER="https://github.com/conda-forge/miniforge/releases/download/${CONDA_INSTALLER_VERSION}/Miniforge3-${CONDA_INSTALLER_VERSION}-Linux-x86_64.sh"
+CONDA_CMD="conda" # some installers install mamba or micromamba
+
+DRY_RUN_OPTION=""
+DRY_RUN_ECHO=()
+REINSTALL_CONDA=0
+
+usage()
+{
+    echo "Usage: $0 [options]"
+    echo
+    echo "Options:"
+    echo "[--help]                  List this help"
+    echo "[--prefix <prefix>]       Install prefix for conda. Defaults to /opt/conda."
+    echo "                          If <prefix>/bin/conda already exists, it will be used and install is skipped."
+    echo "[--dry-run]               Pass-through to all conda commands and only print other commands."
+    echo "                          NOTE: --dry-run will still install conda to --prefix"
+    echo "[--reinstall-conda]       Repairs a broken base environment by reinstalling."
+    echo "                          NOTE: will only reinstall conda and exit"
+    echo
+    echo "Examples:"
+    echo "  % $0"
+    echo "     Install into default system-wide prefix (using sudo if needed) and add install to system-wide /etc/profile.d"
+    echo "  % $0 --prefix ~/conda"
+    echo "     Install into $HOME/conda"
+}
+
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --help)
+            usage
+            exit 1
+            ;;
+        --prefix)
+            shift
+            CONDA_INSTALL_PREFIX="$1"
+            shift
+            ;;
+        --dry-run)
+            shift
+            DRY_RUN_OPTION="--dry-run"
+            DRY_RUN_ECHO=(echo "Would Run:")
+            ;;
+        --reinstall-conda)
+            shift
+            REINSTALL_CONDA=1
+            ;;
+        *)
+            echo "Invalid Argument: $1"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+if [[ $REINSTALL_CONDA -eq 1 && -n "$DRY_RUN_OPTION" ]]; then
+    echo "::ERROR:: --dry-run and --reinstall-conda are mutually exclusive.  Pick one or the other."
+fi
+
+set -ex
+set -o pipefail
+
+# uname options are not portable so do what https://www.gnu.org/software/coreutils/faq/coreutils-faq.html#uname-is-system-specific
+# suggests and iteratively probe the system type
+if ! type uname >&/dev/null; then
+    echo "::ERROR:: need 'uname' command available to determine if we support this sytem"
+    exit 1
+fi
+
+if [[ "$(uname)" != "Linux" ]]; then
+    echo "::ERROR:: $0 only supports 'Linux' not '$(uname)'"
+    exit 1
+fi
+
+if [[ "$(uname -mo)" != "x86_64 GNU/Linux" ]]; then
+    echo "::ERROR:: $0 only supports 'x86_64 GNU/Linux' not '$(uname -io)'"
+    exit 1
+fi
+
+if [[ ! -r /etc/os-release ]]; then
+    echo "::ERROR:: $0 depends on /etc/os-release for distro-specific setup and it doesn't exist here"
+    exit 1
+fi
+
+OS_FLAVOR=$(grep '^ID=' /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+OS_VERSION=$(grep '^VERSION_ID=' /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+
+# platform-specific setup
+case "$OS_FLAVOR" in
+    ubuntu)
+        ;;
+    centos)
+        ;;
+    *)
+        echo "::ERROR:: Unknown OS flavor '$OS_FLAVOR'. Unable to do platform-specific setup."
+        exit 1
+        ;;
+esac
+
+
+# everything else is platform-agnostic and could easily be expanded to Windows and/or OSX
+
+SUDO=""
+prefix_parent=$(dirname "$CONDA_INSTALL_PREFIX")
+if [[ ! -e "$prefix_parent" ]]; then
+    mkdir -p "$prefix_parent" || SUDO=sudo
+elif [[ ! -w "$prefix_parent" ]]; then
+    SUDO=sudo
+fi
+
+if [[ -n "$SUDO" ]]; then
+    echo "::INFO:: using 'sudo' to install conda"
+    # ensure files are read-execute for everyone
+    umask 022
+fi
+
+if [[ -n "$SUDO"  || "$(id -u)" == 0 ]]; then
+    INSTALL_TYPE=system
+else
+    INSTALL_TYPE=user
+fi
+
+# to enable use of sudo and avoid modifying 'secure_path' in /etc/sudoers, we specify the full path to conda
+CONDA_EXE="${CONDA_INSTALL_PREFIX}/bin/$CONDA_CMD"
+
+if [[ -x "$CONDA_EXE" && $REINSTALL_CONDA -eq 0 ]]; then
+    echo "::INFO:: '$CONDA_EXE' already exists, skipping conda install"
+else
+    wget -O install_conda.sh "$CONDA_INSTALLER"  || curl -fsSLo install_conda.sh "$CONDA_INSTALLER"
+    if [[ $REINSTALL_CONDA -eq 1 ]]; then
+        conda_install_extra="-u"
+        echo "::INFO:: RE-installing conda to '$CONDA_INSTALL_PREFIX'"
+    else
+        conda_install_extra=""
+        echo "::INFO:: installing conda to '$CONDA_INSTALL_PREFIX'"
+    fi
+    # -b for non-interactive install
+    $SUDO bash ./install_conda.sh -b -p "$CONDA_INSTALL_PREFIX" $conda_install_extra
+    rm ./install_conda.sh
+
+    # see https://conda-forge.org/docs/user/tipsandtricks.html#multiple-channels
+    # for more information on strict channel_priority
+    "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set channel_priority strict
+    # By default, don't mess with people's PS1, I personally find it annoying
+    "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set changeps1 false
+    # don't automatically activate the 'base' environment when intializing shells
+    "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set auto_activate_base false
+    # don't automatically update conda to avoid https://github.com/conda-forge/conda-libmamba-solver-feedstock/issues/2
+    "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set auto_update_conda false
+
+    # conda-build is a special case and must always be installed into the base environment
+    $SUDO "$CONDA_EXE" install $DRY_RUN_OPTION -y -n base conda-build
+
+    # conda-libmamba-solver is a special case and must always be installed into the base environment
+    # see https://www.anaconda.com/blog/a-faster-conda-for-a-growing-community
+    $SUDO "$CONDA_EXE" install $DRY_RUN_OPTION -y -n base conda-libmamba-solver
+
+    # conda-lock is a special case and must always be installed into the base environment
+    $SUDO "$CONDA_EXE" install $DRY_RUN_OPTION -y -n base conda-lock
+
+    # Use the fast solver by default
+    "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set experimental_solver libmamba
+
+    conda_init_extra_args=()
+    if [[ "$INSTALL_TYPE" == system ]]; then
+        # if we're installing into a root-owned directory using sudo, or we're already root
+        # initialize conda in the system-wide rcfiles
+        conda_init_extra_args=(--no-user --system)
+    fi
+    $SUDO "${CONDA_EXE}" init $DRY_RUN_OPTION "${conda_init_extra_args[@]}" bash
+
+    if [[ $REINSTALL_CONDA -eq 1 ]]; then
+        echo "::INFO:: Done reinstalling conda. Exiting"
+        exit 0
+    fi
+fi

.github/scripts/remote-do-rtl-build.sh

@@ -15,16 +15,10 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
 cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh --skip-validate
+./scripts/init-submodules-no-riscv-tools.sh --force
 ./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
     pushd $REMOTE_CHIPYARD_DIR/generators/gemmini/software
     git submodule update --init --recursive gemmini-rocc-tests
     pushd gemmini-rocc-tests
@@ -44,7 +38,6 @@ case $2 in
 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]}
@@ -52,10 +45,6 @@ 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

.github/scripts/remote-install-verilator.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# install verilator
-
-# 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

.github/scripts/remote-run-firesim-scala-tests.sh

@@ -10,35 +10,10 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
-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
-REMOTE_FIRESIM_SYSROOT=$REMOTE_FIRESIM_DIR/lib-install
-
 cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh --skip-validate
+./scripts/init-submodules-no-riscv-tools.sh --force
-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]}

.github/scripts/run-tests.sh

@@ -9,10 +9,6 @@ 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 () {
@@ -52,15 +48,9 @@ case $1 in
         run_bmark ${mapping[$1]}
         ;;
     chipyard-hwacha)
-        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 $DISABLE_SIM_PREREQ ${mapping[$1]}
         ;;
     chipyard-gemmini)
-        export RISCV=$LOCAL_ESP_DIR
-        export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
-        export PATH=$RISCV/bin:$PATH
         GEMMINI_SOFTWARE_DIR=$LOCAL_SIM_DIR/../../generators/gemmini/software/gemmini-rocc-tests
         rm -rf $GEMMINI_SOFTWARE_DIR/riscv-tests
         cd $LOCAL_SIM_DIR
@@ -69,9 +59,6 @@ case $1 in
         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)
         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
         ;;

.github/workflows/chipyard-run-tests.yml

@@ -7,13 +7,17 @@ on:
       - main
       - '1.[0-9]*.x'
 
+defaults:
+  run:
+    shell: bash -leo pipefail {0}
+
 env:
-  tools-cache-version: v14
+  tools-cache-version: v17
-  BUILDSERVER: ${{ secrets.BUILDSERVER }}
-  BUILDUSER: ${{ secrets.BUILDUSER }}
-  SERVER: ${{ secrets.BUILDUSER }}@${{ secrets.BUILDSERVER }}
   CI_DIR: ${{ secrets.BUILDDIR }}
   JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
+  conda-env-name-no-time: cy-${{ github.run_id }}
+  workflow-timestamp: ${{ github.event.pull_request.updated_at }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   cancel-prior-workflows:
@@ -36,7 +40,9 @@ jobs:
       needs-rtl: ${{ steps.filter.outputs.all_count != steps.filter.outputs.skip-rtl_count }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -62,7 +68,7 @@ jobs:
     if: needs.change-filters.outputs.needs-rtl == 'true'
     runs-on: ubuntu-latest
     container:
-      image: ucbbar/chipyard-ci-image:554b436
+      image: ucbbar/chipyard-ci-image:3f9150
       options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
@@ -72,9 +78,17 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+        with:
+          install-collateral: false
       - name: Check commits of each submodule
-        run: .github/scripts/check-commit.sh
+        run: |
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
+            .github/scripts/check-commit.sh
 
   tutorial-setup-check:
     name: tutorial-setup-check
@@ -82,7 +96,7 @@ jobs:
     if: needs.change-filters.outputs.needs-rtl == 'true'
     runs-on: ubuntu-latest
     container:
-      image: ucbbar/chipyard-ci-image:554b436
+      image: ucbbar/chipyard-ci-image:3f9150
       options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
@@ -92,16 +106,24 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+        with:
+          install-collateral: false
       - name: Check that the tutorial-setup patches apply
-        run: scripts/tutorial-setup.sh
+        run: |
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
+            scripts/tutorial-setup.sh
 
   documentation-check:
     name: documentation-check
     needs: change-filters
     runs-on: ubuntu-latest
     container:
-      image: ucbbar/chipyard-ci-image:554b436
+      image: ucbbar/chipyard-ci-image:3f9150
       options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
@@ -111,44 +133,28 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+        with:
+          install-collateral: false
       - name: Check that documentation builds with no warnings/errors
         run: |
-          sudo apt-get update -y
+          conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
-          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
 
-  install-toolchains:
-    name: install-toolchains
-    needs: change-filters
-    if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build RISC-V toolchains
-        uses: ./.github/actions/toolchain-build
-
   build-extra-tests:
     name: build-extra-tests
-    needs: [change-filters, install-toolchains]
+    needs: [change-filters]
     if: needs.change-filters.outputs.needs-rtl == 'true'
     runs-on: ubuntu-latest
     container:
-      image: ucbbar/chipyard-ci-image:554b436
+      image: ucbbar/chipyard-ci-image:3f9150
       options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
@@ -158,24 +164,28 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-      - name: Build RISC-V toolchains
+      - name: Git workaround
-        uses: ./.github/actions/toolchain-build
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Generate keys
         id: genkey
         run: |
-          echo "::set-output name=extra-tests-cache-key::extra-tests-${{ github.ref }}-${{ github.sha }}"
+          echo "::set-output name=extra-tests-cache-key::extra-tests-${{ github.sha }}"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: build-extra-tools-cache
         with:
           path: extra-tests-install
           key: ${{ steps.genkey.outputs.extra-tests-cache-key }}
           restore-keys: ${{ steps.genkey.outputs.extra-tests-cache-key }}
       - name: Build extra tests
-        run: .github/scripts/build-extra-tests.sh
+        run: |
+            conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
+            .github/scripts/build-extra-tests.sh
 
-  install-verilator-knight:
+  create-conda-env-knight:
-    name: install-verilator-knight
+    name: create-conda-env-knight
     needs: [change-filters, cancel-prior-workflows]
     if: needs.change-filters.outputs.needs-rtl == 'true'
     runs-on: knight
@@ -187,12 +197,16 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-      - name: Build verilator on knight CI machine
+      - name: Git workaround
-        run: .github/scripts/remote-install-verilator.sh
+        uses: ./.github/actions/git-workaround
+      - name: Cleanup conda
+        uses: ./.github/actions/cleanup-conda
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
 
-  install-verilator-ferry:
+  create-conda-env-ferry:
-    name: install-verilator-ferry
+    name: create-conda-env-ferry
     needs: [change-filters, cancel-prior-workflows]
     if: needs.change-filters.outputs.needs-rtl == 'true'
     runs-on: ferry
@@ -204,16 +218,20 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-      - name: Build verilator on ferry CI machine
+      - name: Git workaround
-        run: .github/scripts/remote-install-verilator.sh
+        uses: ./.github/actions/git-workaround
+      - name: Cleanup conda
+        uses: ./.github/actions/cleanup-conda
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
 
   # 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: [install-toolchains, install-verilator-knight, install-verilator-ferry, build-extra-tests]
+    needs: [create-conda-env-knight, create-conda-env-ferry, build-extra-tests]
     runs-on: ubuntu-latest
     steps:
       - name: Set up complete
@@ -233,7 +251,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
@@ -251,7 +273,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
@@ -269,11 +295,16 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
           group-key: "group-accels"
+          toolchain: "esp-tools"
 
   prepare-chipyard-tracegen:
     name: prepare-chipyard-tracegen
@@ -287,7 +318,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
@@ -305,7 +340,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
@@ -323,7 +362,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Build RTL on self-hosted
         uses: ./.github/actions/prepare-rtl
         with:
@@ -335,10 +378,7 @@ jobs:
   chipyard-rocket-run-tests:
     name: chipyard-rocket-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -347,7 +387,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -357,10 +401,7 @@ jobs:
   chipyard-hetero-run-tests:
     name: chipyard-hetero-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -369,7 +410,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -379,10 +424,7 @@ jobs:
   chipyard-boom-run-tests:
     name: chipyard-boom-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -391,7 +433,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -401,10 +447,7 @@ jobs:
   chipyard-cva6-run-tests:
     name: chipyard-cva6-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -413,7 +456,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -423,10 +470,7 @@ jobs:
   chipyard-ibex-run-tests:
     name: chipyard-ibex-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -435,7 +479,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -445,10 +493,7 @@ jobs:
   chipyard-sodor-run-tests:
     name: chipyard-sodor-run-tests
     needs: prepare-chipyard-cores
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -457,7 +502,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -467,10 +516,7 @@ jobs:
   chipyard-fftgenerator-run-tests:
     name: chipyard-fftgenerator-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -479,7 +525,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -489,10 +539,7 @@ jobs:
   chipyard-dmirocket-run-tests:
     name: chipyard-dmirocket-run-tests
     needs: prepare-chipyard-peripherals
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -501,7 +548,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -511,10 +562,7 @@ jobs:
   chipyard-spiflashwrite-run-tests:
     name: chipyard-spiflashwrite-run-tests
     needs: prepare-chipyard-peripherals
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -523,7 +571,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -533,10 +585,7 @@ jobs:
   chipyard-spiflashread-run-tests:
     name: chipyard-spiflashread-run-tests
     needs: prepare-chipyard-peripherals
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -545,7 +594,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -555,10 +608,7 @@ jobs:
   chipyard-lbwif-run-tests:
     name: chipyard-lbwif-run-tests
     needs: prepare-chipyard-peripherals
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -567,7 +617,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -577,10 +631,7 @@ jobs:
   chipyard-sha3-run-tests:
     name: chipyard-sha3-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -589,20 +640,22 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
           group-key: "group-accels"
           project-key: "chipyard-sha3"
+          toolchain: "esp-tools"
 
   chipyard-streaming-fir-run-tests:
     name: chipyard-streaming-fir-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -611,7 +664,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -621,10 +678,7 @@ jobs:
   chipyard-streaming-passthrough-run-tests:
     name: chipyard-streaming-passthrough-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -633,7 +687,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -643,10 +701,7 @@ jobs:
   chipyard-hwacha-run-tests:
     name: chipyard-hwacha-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -655,20 +710,22 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
           group-key: "group-accels"
           project-key: "chipyard-hwacha"
+          toolchain: "esp-tools"
 
   chipyard-gemmini-run-tests:
     name: chipyard-gemmini-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -677,20 +734,22 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
           group-key: "group-accels"
           project-key: "chipyard-gemmini"
+          toolchain: "esp-tools"
 
   chipyard-nvdla-run-tests:
     name: chipyard-nvdla-run-tests
     needs: prepare-chipyard-accels
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -699,7 +758,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -709,10 +772,7 @@ jobs:
   tracegen-boom-run-tests:
     name: tracegen-boom-run-tests
     needs: prepare-chipyard-tracegen
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -721,7 +781,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -731,10 +795,7 @@ jobs:
   tracegen-run-tests:
     name: tracegen-run-tests
     needs: prepare-chipyard-tracegen
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -743,7 +804,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -753,10 +818,7 @@ jobs:
   icenet-run-tests:
     name: icenet-run-tests
     needs: prepare-chipyard-other
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -765,7 +827,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -775,10 +841,7 @@ jobs:
   testchipip-run-tests:
     name: testchipip-run-tests
     needs: prepare-chipyard-other
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
-    container:
-      image: ucbbar/chipyard-ci-image:554b436
-      options: --entrypoint /bin/bash
     steps:
       - name: Delete old checkout
         run: |
@@ -787,33 +850,40 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
           group-key: "group-other"
           project-key: "testchipip"
 
-# TODO: Determine why elfutils is failing here
+  firesim-run-tests:
-#  firesim-run-tests:
+    name: firesim-run-tests
-#    name: firesim-run-tests
+    needs: setup-complete
-#    needs: setup-complete
+    runs-on: self-hosted
-#    runs-on: self-hosted
+    steps:
-#    steps:
+      - name: Delete old checkout
-#      - name: Delete old checkout
+        run: |
-#        run: |
+            ls -alh .
-#            ls -alh .
+            rm -rf ${{ github.workspace }}/* || true
-#            rm -rf ${{ github.workspace }}/* || true
+            rm -rf ${{ github.workspace }}/.* || true
-#            rm -rf ${{ github.workspace }}/.* || true
+            ls -alh .
-#            ls -alh .
+      - name: Checkout
-#      - name: Checkout
+        uses: actions/checkout@v3
-#        uses: actions/checkout@v2
+      - name: Git workaround
-#      - name: Run tests on self-hosted
+        uses: ./.github/actions/git-workaround
-#        uses: ./.github/actions/run-tests
+      - name: Create conda env
-#        with:
+        uses: ./.github/actions/create-conda-env
-#          group-key: "extra-tests"
+      - name: Run tests on self-hosted
-#          project-key: "firesim"
+        uses: ./.github/actions/run-tests
-#          run-script: "remote-run-firesim-scala-tests.sh"
+        with:
+          group-key: "extra-tests"
+          project-key: "firesim"
+          run-script: "remote-run-firesim-scala-tests.sh"
 
   fireboom-run-tests:
     name: fireboom-run-tests
@@ -827,7 +897,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests on self-hosted
         uses: ./.github/actions/run-tests
         with:
@@ -847,7 +921,11 @@ jobs:
             rm -rf ${{ github.workspace }}/.* || true
             ls -alh .
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: Git workaround
+        uses: ./.github/actions/git-workaround
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
       - name: Run tests on self-hosted
         uses: ./.github/actions/run-tests
         with:

.gitignore

@@ -20,3 +20,4 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
+.conda-env/

.gitmodules

@@ -28,40 +28,6 @@
 [submodule "generators/block-inclusivecache-sifive"]
 	path = generators/sifive-cache
 	url = https://github.com/chipsalliance/rocket-chip-inclusive-cache.git
-[submodule "toolchains/riscv-tools/riscv-gnu-toolchain"]
-	path = toolchains/riscv-tools/riscv-gnu-toolchain
-	url = https://github.com/riscv/riscv-gnu-toolchain.git
-[submodule "toolchains/riscv-tools/riscv-gnu-toolchain-prebuilt"]
-	path = toolchains/riscv-tools/riscv-gnu-toolchain-prebuilt
-	url = https://github.com/ucb-bar/chipyard-toolchain-prebuilt.git
-	shallow = true
-[submodule "toolchains/riscv-tools/riscv-isa-sim"]
-	path = toolchains/riscv-tools/riscv-isa-sim
-	url = https://github.com/riscv/riscv-isa-sim.git
-[submodule "toolchains/riscv-tools/riscv-pk"]
-	path = toolchains/riscv-tools/riscv-pk
-	url = https://github.com/riscv/riscv-pk.git
-[submodule "toolchains/riscv-tools/riscv-tests"]
-	path = toolchains/riscv-tools/riscv-tests
-	url = https://github.com/riscv/riscv-tests.git
-[submodule "toolchains/riscv-tools/riscv-openocd"]
-	path = toolchains/riscv-tools/riscv-openocd
-	url = https://github.com/riscv/riscv-openocd.git
-[submodule "toolchains/esp-tools/riscv-gnu-toolchain"]
-	path = toolchains/esp-tools/riscv-gnu-toolchain
-	url = https://github.com/ucb-bar/esp-gnu-toolchain.git
-[submodule "toolchains/esp-tools/riscv-isa-sim"]
-	path = toolchains/esp-tools/riscv-isa-sim
-	url = https://github.com/ucb-bar/esp-isa-sim.git
-[submodule "toolchains/esp-tools/riscv-pk"]
-	path = toolchains/esp-tools/riscv-pk
-	url = https://github.com/riscv/riscv-pk.git
-[submodule "toolchains/esp-tools/riscv-tests"]
-	path = toolchains/esp-tools/riscv-tests
-	url = https://github.com/ucb-bar/esp-tests.git
-[submodule "toolchains/libgloss"]
-	path = toolchains/libgloss
-	url = https://github.com/ucb-bar/libgloss-htif.git
 [submodule "vlsi/hammer"]
 	path = vlsi/hammer
 	url = https://github.com/ucb-bar/hammer.git
@@ -83,9 +49,6 @@
 [submodule "vlsi/hammer-mentor-plugins"]
 	path = vlsi/hammer-mentor-plugins
 	url = https://github.com/ucb-bar/hammer-mentor-plugins.git
-[submodule "toolchains/qemu"]
-	path = toolchains/qemu
-	url = https://github.com/qemu/qemu.git
 [submodule "tools/axe"]
 	path = tools/axe
 	url = https://github.com/CTSRD-CHERI/axe.git
@@ -134,3 +97,33 @@
 [submodule "generators/fft-generator"]
 	path = generators/fft-generator
 	url = https://github.com/ucb-bar/FFTGenerator.git
+[submodule "toolchains/riscv-tools/riscv-tests"]
+	path = toolchains/riscv-tools/riscv-tests
+	url = https://github.com/riscv-software-src/riscv-tests.git
+[submodule "toolchains/riscv-tools/riscv-pk"]
+	path = toolchains/riscv-tools/riscv-pk
+	url = https://github.com/riscv-software-src/riscv-pk.git
+[submodule "toolchains/riscv-tools/riscv-openocd"]
+	path = toolchains/riscv-tools/riscv-openocd
+	url = https://github.com/riscv/riscv-openocd.git
+[submodule "toolchains/riscv-tools/riscv-isa-sim"]
+	path = toolchains/riscv-tools/riscv-isa-sim
+	url = https://github.com/riscv-software-src/riscv-isa-sim.git
+[submodule "toolchains/riscv-tools/riscv-tools-feedstock"]
+	path = toolchains/riscv-tools/riscv-tools-feedstock
+	url = https://github.com/ucb-bar/riscv-tools-feedstock.git
+[submodule "toolchains/esp-tools/esp-tools-feedstock"]
+	path = toolchains/esp-tools/esp-tools-feedstock
+	url = https://github.com/ucb-bar/esp-tools-feedstock.git
+[submodule "toolchains/esp-tools/riscv-isa-sim"]
+	path = toolchains/esp-tools/riscv-isa-sim
+	url = https://github.com/ucb-bar/esp-isa-sim.git
+[submodule "toolchains/esp-tools/riscv-pk"]
+	path = toolchains/esp-tools/riscv-pk
+	url = https://github.com/riscv-software-src/riscv-pk.git
+[submodule "toolchains/esp-tools/riscv-tests"]
+	path = toolchains/esp-tools/riscv-tests
+	url = https://github.com/ucb-bar/esp-tests.git
+[submodule "toolchains/libgloss"]
+	path = toolchains/libgloss
+	url = https://github.com/ucb-bar/libgloss-htif.git

.readthedocs.yml

@@ -3,13 +3,12 @@ version: 2
 build:
     os: ubuntu-20.04
     tools:
-        python: "3.6"
+        python: "mambaforge-4.10"
 
 formats: all
 
 sphinx:
     configuration: docs/conf.py
 
-python:
+conda:
-    install:
+    environment: conda-requirements-riscv-tools.yaml
-        - requirements: docs/requirements.txt

build-setup.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+# exit script if any command fails
+set -e
+set -o pipefail
+
+RDIR=$(git rev-parse --show-toplevel)
+
+# get helpful utilities
+source $RDIR/scripts/utils.sh
+
+common_setup
+
+usage() {
+    echo "Usage: ${0} [OPTIONS] [riscv-tools | esp-tools]"
+    echo ""
+    echo "Helper script to initialize repository that wraps other scripts."
+    echo "Sets up conda environment, initializes submodules, and installs toolchain collateral."
+    echo ""
+    echo "Installation Types"
+    echo "  riscv-tools: if set, builds the riscv toolchain (this is also the default)"
+    echo "  esp-tools: if set, builds esp-tools toolchain used for the hwacha vector accelerator"
+    echo ""
+    echo "Options"
+    echo "  --help -h              : Display this message"
+    echo "  --unpinned-deps -ud    : Use unpinned conda environment"
+    echo "  --force -f             : Skip prompt checking for tagged release/conda"
+    echo "  --skip-validate        : DEPRECATED: Same functionality as --force"
+    echo "  --skip-conda           : Skip conda env creation"
+    echo "  --skip-toolchain-extra : Skip building extra RISC-V toolchain collateral (Spike, PK, tests, libgloos)"
+    exit "$1"
+}
+
+TOOLCHAIN="riscv-tools"
+USE_PINNED_DEPS=true
+FORCE_FLAG=""
+SKIP_CONDA=false
+SKIP_TOOLCHAIN=false
+
+# getopts does not support long options, and is inflexible
+while [ "$1" != "" ];
+do
+    case $1 in
+        -h | --help )
+            usage 3 ;;
+        riscv-tools | esp-tools)
+            TOOLCHAIN=$1 ;;
+        -ud | --unpinned-deps )
+            USE_PINNED_DEPS=false ;;
+        --force | -f | --skip-validate)
+            FORCE_FLAG=$1 ;;
+        --skip-conda)
+            SKIP_CONDA=true ;;
+        --skip-toolchain-extra)
+            SKIP_TOOLCHAIN=true ;;
+        * )
+            error "invalid option $1"
+            usage 1 ;;
+    esac
+    shift
+done
+
+if [ "$SKIP_CONDA" = false ]; then
+    # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154
+    LOCKFILE=$RDIR/conda-requirements-$TOOLCHAIN-linux-64.conda-lock.yml
+    YAMLFILE=$RDIR/conda-requirements-$TOOLCHAIN.yaml
+
+    if [ "$USE_PINNED_DEPS" = false ]; then
+        # auto-gen the lockfile
+        conda-lock -f $YAMLFILE -p linux-64 --lockfile $LOCKFILE
+    fi
+
+    # use conda-lock to create env
+    conda-lock install -p $RDIR/.conda-env $LOCKFILE
+
+    source $RDIR/.conda-env/etc/profile.d/conda.sh
+    conda activate $RDIR/.conda-env
+fi
+
+if [ -z "$FORCE_FLAG" ]; then
+    if [ -z ${CONDA_DEFAULT_ENV+x} ]; then
+        error "ERROR: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate base')?"
+        exit 1
+    fi
+fi
+
+$RDIR/scripts/init-submodules-no-riscv-tools.sh $FORCE_FLAG
+
+if [ "$SKIP_TOOLCHAIN" = false ]; then
+    $RDIR/scripts/build-toolchain-extra.sh $FORCE_FLAG $TOOLCHAIN
+fi
+
+$RDIR/scripts/gen-tags.sh
+
+cat << EOT >> env.sh
+# line auto-generated by $0
+conda activate $RDIR/.conda-env
+EOT

build.sbt

@@ -60,7 +60,7 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
-val chiselVersion = "3.5.1"
+val chiselVersion = "3.5.2"
 
 lazy val chiselSettings = Seq(
   libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion,

conda-requirements-esp-tools.yaml

@@ -0,0 +1,132 @@
+channels:
+    - ucb-bar
+    - conda-forge
+    - nodefaults
+
+dependencies:
+    # https://conda-forge.org/feedstock-outputs/
+    #   filterable list of all conda-forge packages
+    # https://conda-forge.org/#contribute
+    #   instructions on adding a recipe
+    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
+    #   documentation on package_spec syntax for constraining versions
+
+
+    # handy tool for introspecting package relationships and file ownership
+    # see https://github.com/rvalieris/conda-tree
+    - conda-tree
+
+    # bundle FireSim driver with deps into installer shell-script
+    - constructor
+
+    - gcc
+    - gxx
+    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
+    - conda-gcc-specs
+    - binutils
+
+    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
+    - esp-tools # from ucb-bar channel - https://github.com/ucb-bar/esp-tools-feedstock
+
+    # firemarshal deps
+    - python>=3.8
+    - bc
+    - patch
+    - which
+    - diffutils
+    - bash
+    - gzip
+    - bzip2
+    - perl
+    - tar
+    - file
+    - findutils
+    - rsync
+    - psutil
+    - doit=0.35.0
+    - gitpython
+    - humanfriendly
+    - e2fsprogs
+    - ctags
+    - bison
+    - flex
+    - expat
+    - make
+    - pyyaml
+    - unzip
+    - readline
+    - coreutils
+    - lzop
+    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
+
+    - bash-completion
+    - sbt
+    - ca-certificates
+    - mosh
+    - gmp
+    - mpfr
+    - mpc
+    - zlib
+    - vim
+    - git
+    - openjdk
+    - gengetopt
+    - libffi
+    - expat
+    - libusb1
+    - ncurses
+    - cmake
+    - graphviz
+    - expect
+    - dtc
+    - verilator==4.226
+    - screen
+    - elfutils
+    - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
+    - conda-lock>=1
+    - wget
+    - sed
+    - autoconf
+
+    # clang-format for driver coding style enforcement.
+    - clang-format
+    - clang-tools
+
+    # python packages
+    # While it is possible to install using pip after creating the
+    # conda environment, pip's dependency resolution can conflict with
+    # conda and create broken environments.  It's best to use the conda
+    # packages so that the environment is consistent
+    - boto3==1.20.21
+    - colorama==0.4.3
+    - argcomplete==1.12.3
+    - python-graphviz==0.19
+    - pyparsing==3.0.6
+    - numpy==1.19.5
+    - kiwisolver==1.3.1
+    - matplotlib-base==3.3.4
+    - pandas==1.1.5
+    - awscli==1.22.21
+    - pytest==6.2.5
+    - pytest-dependency==0.5.1
+    - pytest-mock==3.7.0
+    - moto==3.1.0
+    - pyyaml==5.4.1
+    - mypy==0.931
+    - types-pyyaml==6.0.4
+    - boto3-stubs==1.21.6
+    - botocore-stubs==1.24.7
+    - mypy-boto3-s3==1.21.0
+    - pip
+    - pip:
+        - fab-classic==1.19.1
+        - mypy-boto3-ec2==1.21.9
+        - sure==2.0.0
+        - pylddwrap==1.2.1
+
+    # doc requirements
+    - sphinx
+    - pygments
+    - sphinx-autobuild
+    - sphinx_rtd_theme
+    - docutils

conda-requirements-riscv-tools.yaml

@@ -0,0 +1,132 @@
+channels:
+    - ucb-bar
+    - conda-forge
+    - nodefaults
+
+dependencies:
+    # https://conda-forge.org/feedstock-outputs/
+    #   filterable list of all conda-forge packages
+    # https://conda-forge.org/#contribute
+    #   instructions on adding a recipe
+    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
+    #   documentation on package_spec syntax for constraining versions
+
+
+    # handy tool for introspecting package relationships and file ownership
+    # see https://github.com/rvalieris/conda-tree
+    - conda-tree
+
+    # bundle FireSim driver with deps into installer shell-script
+    - constructor
+
+    - gcc
+    - gxx
+    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
+    - conda-gcc-specs
+    - binutils
+
+    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
+    - riscv-tools # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
+
+    # firemarshal deps
+    - python>=3.8
+    - bc
+    - patch
+    - which
+    - diffutils
+    - bash
+    - gzip
+    - bzip2
+    - perl
+    - tar
+    - file
+    - findutils
+    - rsync
+    - psutil
+    - doit=0.35.0
+    - gitpython
+    - humanfriendly
+    - e2fsprogs
+    - ctags
+    - bison
+    - flex
+    - expat
+    - make
+    - pyyaml
+    - unzip
+    - readline
+    - coreutils
+    - lzop
+    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
+
+    - bash-completion
+    - sbt
+    - ca-certificates
+    - mosh
+    - gmp
+    - mpfr
+    - mpc
+    - zlib
+    - vim
+    - git
+    - openjdk
+    - gengetopt
+    - libffi
+    - expat
+    - libusb1
+    - ncurses
+    - cmake
+    - graphviz
+    - expect
+    - dtc
+    - verilator==4.226
+    - screen
+    - elfutils
+    - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
+    - conda-lock>=1
+    - wget
+    - sed
+    - autoconf
+
+    # clang-format for driver coding style enforcement.
+    - clang-format
+    - clang-tools
+
+    # python packages
+    # While it is possible to install using pip after creating the
+    # conda environment, pip's dependency resolution can conflict with
+    # conda and create broken environments.  It's best to use the conda
+    # packages so that the environment is consistent
+    - boto3==1.20.21
+    - colorama==0.4.3
+    - argcomplete==1.12.3
+    - python-graphviz==0.19
+    - pyparsing==3.0.6
+    - numpy==1.19.5
+    - kiwisolver==1.3.1
+    - matplotlib-base==3.3.4
+    - pandas==1.1.5
+    - awscli==1.22.21
+    - pytest==6.2.5
+    - pytest-dependency==0.5.1
+    - pytest-mock==3.7.0
+    - moto==3.1.0
+    - pyyaml==5.4.1
+    - mypy==0.931
+    - types-pyyaml==6.0.4
+    - boto3-stubs==1.21.6
+    - botocore-stubs==1.24.7
+    - mypy-boto3-s3==1.21.0
+    - pip
+    - pip:
+        - fab-classic==1.19.1
+        - mypy-boto3-ec2==1.21.9
+        - sure==2.0.0
+        - pylddwrap==1.2.1
+
+    # doc requirements
+    - sphinx
+    - pygments
+    - sphinx-autobuild
+    - sphinx_rtd_theme
+    - docutils

dockerfiles/Dockerfile

@@ -2,59 +2,49 @@
 
 # BUILD BASE FOR CI
 
-FROM ubuntu:18.04 as base
+FROM ubuntu:20.04 as base
 ARG CHIPYARD_HASH
 
 MAINTAINER https://groups.google.com/forum/#!forum/chipyard
 
-SHELL ["/bin/bash", "-c"] 
+SHELL ["/bin/bash", "-c"]
 
 # Install dependencies for ubuntu-req.sh
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-               curl \
+    curl \
-               git \
+    wget \
-               sudo \
+    git \
-               ca-certificates \
+    sudo \
-               keyboard-configuration \
+    ca-certificates \
-               console-setup \
+    keyboard-configuration \
-               bc \
+    console-setup \
-               unzip
+    bc \
+    unzip
 
 WORKDIR /root
 
 # Install Chipyard and run ubuntu-req.sh to install necessary dependencies
 RUN git clone https://github.com/ucb-bar/chipyard.git && \
         cd chipyard && \
-        git checkout $CHIPYARD_HASH && \
+        git checkout $CHIPYARD_HASH
-        ./scripts/ubuntu-req.sh 1>/dev/null && \
-        sudo rm -rf /var/lib/apt/lists/*
 
-# Update PATH for RISCV toolchain (note: hardcoded for CircleCI)
+RUN ./chipyard/.github/scripts/install-conda.sh
-ENV RISCV="/root/riscv-tools-install"
-ENV LD_LIBRARY_PATH="$RISCV/lib"
-ENV PATH="$RISCV/bin:$PATH"
 
 # BUILD IMAGE WITH TOOLCHAINS
 
 # Use above build as base
 FROM base as base-with-tools
 
-# Init submodules
+SHELL ["/bin/bash", "-cl"]
+
+# Initialize repo
 RUN cd chipyard && \
         export MAKEFLAGS=-"j $(nproc)" && \
-        ./scripts/init-submodules-no-riscv-tools.sh 1>/dev/null
+        conda activate base && \
-
+        ./setup.sh --env-name chipyard --skip-validate
-# Install riscv-tools
-RUN cd chipyard && \
-        export MAKEFLAGS=-"j $(nproc)" && \
-        ./scripts/build-toolchains.sh riscv-tools 1>/dev/null
-
-# Install esp-tools
-RUN cd chipyard && \
-        export MAKEFLAGS=-"j $(nproc)" && \
-        ./scripts/build-toolchains.sh esp-tools 1>/dev/null
 
+SHELL ["/opt/conda/bin/conda", "run", "-n", "chipyard", "/bin/bash", "-cl"]
 
 # Set up FireMarshal. Building and cleaning br-base.json builds the underlying
 # buildroot image (which takes a long time) but doesn't keep all the br-base
@@ -64,9 +54,8 @@ RUN cd chipyard && \
         cd software/firemarshal && \
         ./init-submodules.sh && \
         pip3 install -r python-requirements.txt && \
-        marshal build br-base.json && \
+        ./marshal build br-base.json && \
-        marshal clean br-base.json
+        ./marshal clean br-base.json
-        
 
 # Run script to set environment variables on entry
 ENTRYPOINT ["chipyard/scripts/entrypoint.sh"]

docs/Chipyard-Basics/Initial-Repo-Setup.rst

@@ -1,33 +1,58 @@
 Initial Repository Setup
 ========================================================
 
-Requirements
+Prerequisites
 -------------------------------------------
 
 Chipyard is developed and tested on Linux-based systems.
 
-.. Warning:: It is possible to use this on macOS or other BSD-based systems, although GNU tools will need to be installed; it is also recommended to install the RISC-V toolchain from ``brew``.
+.. Warning:: It is possible to use this on macOS or other BSD-based systems, although GNU tools will need to be installed;
+    it is also recommended to install the RISC-V toolchain from ``brew``.
 
 .. Warning:: Working under Windows is not recommended.
 
+Running on AWS EC2 with FireSim
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In CentOS-based platforms, we recommend installing the following dependencies:
+If you plan on using Chipyard alongside FireSim on AWS EC2 instances, you should refer to the :fsim_doc:`FireSim documentation <>`.
+Specifically, you should follow the :fsim_doc:`Initial Setup/Installation <Initial-Setup/index.html>`
+section of the docs up until :fsim_doc:`Setting up the FireSim Repo <Initial-Setup/Setting-up-your-Manager-Instance.html#setting-up-the-firesim-repo>`.
+At that point, instead of cloning FireSim you can clone Chipyard by following :ref:`Chipyard-Basics/Initial-Repo-Setup:Setting up the Chipyard Repo`.
 
-.. include:: /../scripts/centos-req.sh
+Default Requirements Installation
-   :code: bash
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In Ubuntu/Debian-based platforms (Ubuntu), we recommend installing the following dependencies.
+In Chipyard, we use the `Conda <https://docs.conda.io/en/latest/>`__ package manager to help manage system dependencies.
-These dependencies were written based on Ubuntu 16.04 LTS and 18.04 LTS - If they don't work for you, you can try out the Docker image (:ref:`Chipyard-Basics/Initial-Repo-Setup:Pre-built Docker Image`) before manually installing or removing dependencies:
+Conda allows users to create an "environment" that holds system dependencies like ``make``, ``gcc``, etc.
 
-.. include:: /../scripts/ubuntu-req.sh
+.. Note:: Chipyard can also run on systems without a Conda installation. However, users on these systems must manually install toolchains and dependencies.
-   :code: bash
 
-.. Note:: When running on an Amazon Web Services EC2 FPGA-development instance (for FireSim), FireSim includes a machine setup script that will install all of the aforementioned dependencies (and some additional ones).
+First, Chipyard requires Conda to be installed on the system.
+Please refer to the `Conda installation instructions <https://github.com/conda-forge/miniforge/#download>`__ on how to install Conda with the **Miniforge** installer.
+Afterwards, verify that Conda is a sufficient version (we test on version 4.12.0 but higher is most likely fine).
+
+.. Note:: If you have installed conda separately from this documentation (i.e. from miniconda or full Anaconda), please ensure you follow https://conda-forge.org/docs/user/introduction.html#how-can-i-install-packages-from-conda-forge to use ``conda-forge`` packages without any issues.
+
+.. code-block:: shell
+
+    conda --version # must be version 4.12.0 or higher
+
+After Conda is installed and is on your ``PATH``, we need to install a version of ``git`` to initially checkout the repository.
+For this you can use the system package manager like ``yum`` or ``apt`` to install ``git``.
+This ``git`` is only used to first checkout the repository, we will later install a newer version of ``git`` with Conda.
+
+Finally we need to install ``conda-lock`` into the ``base`` conda environment.
+This is done by the following:
+
+.. code-block:: shell
+
+    conda install -n base conda-lock
+    conda activate base
 
 Setting up the Chipyard Repo
 -------------------------------------------
 
-Start by fetching Chipyard's sources. Run:
+Start by checking out the proper Chipyard version. Run:
 
 .. parsed-literal::
 
@@ -36,40 +61,60 @@ Start by fetching Chipyard's sources. Run:
     # checkout latest official chipyard release
     # note: this may not be the latest release if the documentation version != "stable"
     git checkout |version|
-    ./scripts/init-submodules-no-riscv-tools.sh
 
-This will initialize and checkout all of the necessary git submodules.
+Next run the following script to create Chipyard's Conda environment including a pre-built RISC-V toolchain.
-This will also validate that you are on a tagged branch, otherwise it will prompt for confirmation.
+There are two toolchains, one for normal RISC-V programs called ``riscv-tools`` which is the one needed for most Chipyard use-cases, and another for Hwacha/Gemmini called ``esp-tools``.
-
+Run the following script based off which compiler you would like to use.
-When updating Chipyard to a new version, you will also want to rerun this script to update the submodules.
-Using git directly will try to initialize all submodules; this is not recommended unless you expressly desire this behavior.
-
-.. _build-toolchains:
-
-Building a Toolchain
-------------------------
-
-The `toolchains` directory contains toolchains that include a cross-compiler toolchain, frontend server, and proxy kernel, which you will need in order to compile code to RISC-V instructions and run them on your design.
-Currently there are two toolchains, one for normal RISC-V programs, and another for Hwacha (``esp-tools``).
-For custom installations, Each tool within the toolchains contains individual installation procedures within its README file.
-To get a basic installation (which is the only thing needed for most Chipyard use-cases), just the following steps are necessary.
-This will take about 20-30 minutes. You can expedite the process by setting a ``make`` environment variable to use parallel cores: ``export MAKEFLAGS=-j8``.
 
 .. code-block:: shell
 
-    ./scripts/build-toolchains.sh riscv-tools # for a normal risc-v toolchain
+    ./build-setup.sh riscv-tools # or esp-tools
 
-.. Note:: If you are planning to use the Hwacha vector unit, or other RoCC-based accelerators, you should build the esp-tools toolchain by adding the ``esp-tools`` argument to the script above.
+This script wraps around the conda environment initialization process and also runs the ``init-submodules-no-riscv-tools.sh`` and ``build-toolchain-extra.sh`` scripts.
-  If you are running on an Amazon Web Services EC2 instance, intending to use FireSim, you can also use the ``--ec2fast`` flag for an expedited installation of a pre-compiled toolchain.
 
-Once the script is run, a ``env.sh`` file is emitted that sets the ``PATH``, ``RISCV``, and ``LD_LIBRARY_PATH`` environment variables.
+The ``init-subodules-no-riscv-tools.sh`` script will initialize and checkout all of the necessary git submodules.
-You can put this in your ``.bashrc`` or equivalent environment setup file to get the proper variables, or directly include it in your current environment:
+This will also validate that you are on a tagged branch, otherwise it will prompt for confirmation.
+When updating Chipyard to a new version, you will also want to rerun this script to update the submodules.
+Using ``git`` directly will try to initialize all submodules; this is not recommended unless you expressly desire this behavior.
+
+The ``build-toolchain-extra.sh`` script will install extra toolchain utilities/tests used by Chipyard.
+This command builds utilities like Spike, RISC-V Proxy Kernel, libgloss, and RISC-V tests from source for a specific toolchain type.
+
+.. Note:: By default, the ``build-toolchain-extra.sh`` script installs to ``$CONDA_PREFIX/<toolchain-type>``. Thus, if you uninstall the compiler using ``conda remove`` these utilities/tests will also have to be re-installed/built.
+
+.. Note:: If you already have a working conda environment setup, separate Chipyard clones can use that pre-used environment in combination with running the aforementioned scripts yourself (``init-submodules...`` and ``build-toolchain...``).
+
+.. Note:: If you are a power user and would like to build your own compiler/toolchain, you can refer to the https://github.com/ucb-bar/riscv-tools-feedstock and https://github.com/ucb-bar/esp-tools-feedstock repositories (submoduled in the ``toolchains/*`` directories) on how to build the compiler yourself.
+
+By running the following command you should see a environment listed with the path ``$CHIPYARD_DIRECTORY/.conda-env``.
+
+.. code-block:: shell
+
+    conda env list
+
+.. Note:: Refer to FireSim's :fsim_doc:`Conda documentation <Advanced-Usage/Conda.html>` on more information
+    on how to use Conda and some of its benefits.
+
+Sourcing ``env.sh``
+-------------------
+
+Once setup is complete, an emitted ``env.sh`` file should exist in the top-level repository.
+This file activates the conda environment created in ``build-setup.sh`` and sets up necessary environment variables needed for future Chipyard steps (needed for the ``make`` system to work properly).
+Once the script is run, the ``PATH``, ``RISCV``, and ``LD_LIBRARY_PATH`` environment variables will be set properly for the toolchain requested.
+You can source this file in your ``.bashrc`` or equivalent environment setup file to get the proper variables, or directly include it in your current environment:
 
 .. code-block:: shell
 
     source ./env.sh
 
-These variables need to be set for the ``make`` system to work properly.
+.. Warning:: This ``env.sh`` file should always be sourced before running any ``make`` commands.
+
+.. Note:: You can deactivate/activate a compiler/toolchain (but keep it installed) by running ``source $CONDA_PREFIX/etc/conda/deactivate.d/deactivate-${PKG_NAME}.sh`` or ``$CONDA_PREFIX/etc/conda/activate.d/activate-${PKG_NAME}.sh`` (``PKG_NAME`` for example is ``ucb-bar-riscv-tools``). This will modify the aforementioned 3 environment variables.
+
+.. Warning:: ``env.sh`` files are generated per-Chipyard repository.
+    In a multi-Chipyard repository setup, it is possible to source multiple ``env.sh`` files (in any order).
+    However, it is recommended that the final ``env.sh`` file sourced is the ``env.sh`` located in the
+    Chipyard repo that you expect to run ``make`` commands in.
 
 Pre-built Docker Image
 -------------------------------------------
@@ -115,20 +160,22 @@ In order to upgrade between Chipyard versions, we recommend using a fresh clone
 
 
 Chipyard is a complex framework that depends on a mix of build systems and scripts. Specifically, it relies on git submodules, on sbt build files, and on custom written bash scripts and generated files.
-For this reason, upgrading between Chipyard versions is **not** as trivial as just running ``git submodule update -recursive``. This will result in recursive cloning of large submodules that are not necessarily used within your specific Chipyard environments. Furthermore, it will not resolve the status of stale state generated files which may not be compatible between release versions.
+For this reason, upgrading between Chipyard versions is **not** as trivial as just running ``git submodule update --recursive``. This will result in recursive cloning of large submodules that are not necessarily used within your specific Chipyard environments.
+Furthermore, it will not resolve the status of stale state generated files which may not be compatible between release versions.
 
 
-If you are an advanced git user, an alternative approach to a fresh repository clone may be to run ``git clean -dfx``, and then run the standard Chipyard setup sequence. This approach is dangerous, and **not-recommended** for users who are not deeply familiar with git, since it "blows up" the repository state and removes all untracked and modified files without warning. Hence, if you were working on custom un-committed changes, you would lose them.
+If you are an advanced git user, an alternative approach to a fresh repository clone may be to run ``git clean -dfx``, and then run the standard Chipyard setup sequence.
+This approach is dangerous, and **not-recommended** for users who are not deeply familiar with git, since it "blows up" the repository state and removes all untracked and modified files without warning.
+Hence, if you were working on custom un-committed changes, you would lose them.
 
 If you would still like to try to perform an in-place manual version upgrade (**not-recommended**), we recommend at least trying to resolve stale state in the following areas:
 
 * Delete stale ``target`` directories generated by sbt.
 
-* Delete jar collateral generated by FIRRTL (``lib/firrtl.jar``)
-
 * Re-generate generated scripts and source files (for example, ``env.sh``)
 
 * Re-generating/deleting target software state (Linux kernel binaries, Linux images) within FireMarshal
 
 
-This is by no means a comprehensive list of potential stale state within Chipyard. Hence, as mentioned earlier, the recommended method for a Chipyard version upgrade is a fresh clone (or a merge, and then a fresh clone).
+This is by no means a comprehensive list of potential stale state within Chipyard.
+Hence, as mentioned earlier, the recommended method for a Chipyard version upgrade is a fresh clone (or a merge, and then a fresh clone).

docs/Customization/Boot-Process.rst

@@ -74,6 +74,6 @@ mode, thus starting userspace execution.
 The easiest way to build a BBL image that boots Linux is to use the FireMarshal
 tool that lives in the `firesim-software <https://github.com/firesim/firesim-software>`_
 repository. Directions on how to use FireMarshal can be found in the
-`FireSim documentation <https://docs.fires.im/en/latest/Advanced-Usage/FireMarshal/index.html>`_.
+:fsim_doc:`FireSim documentation <Advanced-Usage/FireMarshal/index.html>`.
 Using FireMarshal, you can add custom kernel configurations and userspace software
 to your workload.

docs/Simulation/FPGA-Accelerated-Simulation.rst

@@ -6,30 +6,28 @@ FPGA-Accelerated Simulation
 FireSim
 -----------------------
 
-`FireSim <https://fires.im/>`__ is an open-source cycle-accurate FPGA-accelerated full-system hardware simulation platform that runs on cloud FPGAs (Amazon EC2 F1).
+`FireSim <https://fires.im/>`__ is an open-source cycle-accurate FPGA-accelerated full-system hardware simulation platform that runs on FPGAs (Amazon EC2 F1 FPGAs and local FPGAs).
 FireSim allows RTL-level simulation at orders-of-magnitude faster speeds than software RTL simulators.
 FireSim also provides additional device models to allow full-system simulation, including memory models and network models.
 
-FireSim currently supports running only on Amazon EC2 F1 FPGA-enabled virtual instances.
+FireSim supports running on Amazon EC2 F1 FPGA-enabled cloud instances and on locally managed Linux machines with FPGAs attached.
-In order to simulate your Chipyard design using FireSim, if you have not
+The rest of this documentation assumes you are running on an Amazon EC2 F1 FPGA-enabled virtual instance.
-already, follow the initial EC2 setup instructions as detailed in the `FireSim
+In order to simuate your Chipyard design using FireSim, make sure to follow the repository setup as described by
-documentation  <http://docs.fires.im/en/latest/Initial-Setup/index.html>`__.
+:ref:`Chipyard-Basics/Initial-Repo-Setup:Initial Repository Setup`, if you have not already.
-Then clone Chipyard onto your FireSim manager
-instance, and setup your Chipyard repository as you would normally.
 
 Next, initalize FireSim as a library in Chipyard by running:
 
 .. code-block:: shell
 
     # At the root of your chipyard repo
-    ./scripts/firesim-setup.sh --fast
+    ./scripts/firesim-setup.sh
 
 ``firesim-setup.sh`` initializes additional submodules and then invokes
-firesim's ``build-setup.sh`` script adding ``--library`` to properly
+FireSim's ``build-setup.sh`` script adding ``--library`` to properly
-initialize FireSim as a library submodule in chipyard. You may run
+initialize FireSim as a library submodule in Chipyard. You may run
 ``./sims/firesim/build-setup.sh --help`` to see more options.
 
-Finally, source the following environment at the root of the firesim directory:
+Finally, source the following environment at the root of the FireSim directory:
 
 .. code-block:: shell
 
@@ -40,13 +38,13 @@ Finally, source the following environment at the root of the firesim directory:
 .. Note:: Every time you want to use FireSim with a fresh shell, you must source this ``sourceme-f1-manager.sh``
 
 At this point you're ready to use FireSim with Chipyard. If you're not already
-familiar with FireSim, please return to the `FireSim Docs
+familiar with FireSim, please return to the :fsim_doc:`FireSim Docs <Initial-Setup/Setting-up-your-Manager-Instance.html#completing-setup-using-the-manager>`,
-<https://docs.fires.im/en/latest/Initial-Setup/Setting-up-your-Manager-Instance.html#completing-setup-using-the-manager>`__,
 and proceed with the rest of the tutorial.
 
 Running your Design in FireSim
 ------------------------------
-Converting a Chipyard config (one in ``chipyard/src/main/scala`` to run in FireSim is simple, and can be done either through the traditional configuration system or through FireSim's build-recipes scheme. 
+
+Converting a Chipyard config (one in ``chipyard/src/main/scala`` to run in FireSim is simple, and can be done either through the traditional configuration system or through FireSim's build-recipes scheme.
 
 A FireSim simulation requires 3 additional config fragments:
 

docs/conf.py

@@ -32,14 +32,17 @@ import subprocess
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc',
+extensions = [
+    'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.mathjax',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
-    'sphinx.ext.autosectionlabel']
+    'sphinx.ext.autosectionlabel',
+    'sphinx.ext.extlinks',
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -67,6 +70,8 @@ if on_rtd:
     for item, value in os.environ.items():
         print("[READTHEDOCS] {} = {}".format(item, value))
 
+# default to latest for non rtd builds (this will be overridden on rtd)
+rtd_version = "latest"
 if on_rtd:
     rtd_version = os.environ.get("READTHEDOCS_VERSION")
     if rtd_version == "latest":
@@ -93,7 +98,7 @@ release = version
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -227,3 +232,8 @@ intersphinx_mapping = {'python' : ('https://docs.python.org/', None),
 
 # resolve label conflict between documents
 autosectionlabel_prefix_document = True
+
+# shorten FireSim references
+extlinks = {
+    'fsim_doc' : ('https://docs.fires.im/en/' + rtd_version + '/%s', 'fsim_doc %s')
+}

docs/requirements.txt

@@ -1,5 +0,0 @@
-Sphinx==1.8.5
-Pygments==2.7.4
-sphinx-autobuild
-sphinx_rtd_theme==0.2.5b1
-docutils==0.16

generators/chipyard/src/main/scala/CustomBusTopologies.scala

@@ -1,82 +0,0 @@
-
-package chipyard
-
-import freechips.rocketchip.config.{Field, Config, Parameters}
-import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.tilelink._
-import freechips.rocketchip.util.{Location, Symmetric}
-import freechips.rocketchip.subsystem._
-
-// I'm putting this code here temporarily as I think it should be a candidate
-// for upstreaming based on input from Henry Cook, but don't wnat to deal with
-// an RC branch just yet.
-
-// For subsystem/BusTopology.scala
-
-// Biancolin: This, modified from Henry's email
-/** Parameterization of a topology containing a banked coherence manager and a bus for attaching memory devices. */
-case class CoherentMulticlockBusTopologyParams(
-  sbus: SystemBusParams, // TODO remove this after better width propagation
-  mbus: MemoryBusParams,
-  l2: BankedL2Params,
-  sbusToMbusXType: ClockCrossingType = NoCrossing
-) extends TLBusWrapperTopology(
-  instantiations = (if (l2.nBanks == 0) Nil else List(
-    (MBUS, mbus),
-    (L2, CoherenceManagerWrapperParams(mbus.blockBytes, mbus.beatBytes, l2.nBanks, L2.name)(l2.coherenceManager)))),
-  connections = if (l2.nBanks == 0) Nil else List(
-    (SBUS, L2,   TLBusWrapperConnection(xType = NoCrossing, driveClockFromMaster = Some(true), nodeBinding = BIND_STAR)()),
-    (L2,  MBUS,  TLBusWrapperConnection.crossTo(
-      xType = sbusToMbusXType,
-      driveClockFromMaster = None,
-      nodeBinding = BIND_QUERY))
-  )
-)
-
-// This differs from upstream only in that it does not use the legacy crossTo
-// and crossFrom functions, and it ensures driveClockFromMaster = None
-case class HierarchicalMulticlockBusTopologyParams(
-  pbus: PeripheryBusParams,
-  fbus: FrontBusParams,
-  cbus: PeripheryBusParams,
-  xTypes: SubsystemCrossingParams
-) extends TLBusWrapperTopology(
-  instantiations = List(
-    (PBUS, pbus),
-    (FBUS, fbus),
-    (CBUS, cbus)),
-  connections = List(
-    (SBUS, CBUS, TLBusWrapperConnection.  crossTo(xType = xTypes.sbusToCbusXType, driveClockFromMaster = None)),
-    (CBUS, PBUS, TLBusWrapperConnection.  crossTo(xType = xTypes.cbusToPbusXType, driveClockFromMaster = None)),
-    (FBUS, SBUS, TLBusWrapperConnection.crossFrom(xType = xTypes.fbusToSbusXType, driveClockFromMaster = None)))
-)
-
-// For subsystem/Configs.scala
-
-class WithMulticlockCoherentBusTopology extends Config((site, here, up) => {
-  case TLNetworkTopologyLocated(InSubsystem) => List(
-    JustOneBusTopologyParams(sbus = site(SystemBusKey)),
-    HierarchicalMulticlockBusTopologyParams(
-      pbus = site(PeripheryBusKey),
-      fbus = site(FrontBusKey),
-      cbus = site(ControlBusKey),
-      xTypes = SubsystemCrossingParams(
-        sbusToCbusXType = site(SbusToCbusXTypeKey),
-        cbusToPbusXType = site(CbusToPbusXTypeKey),
-        fbusToSbusXType = site(FbusToSbusXTypeKey))),
-    CoherentMulticlockBusTopologyParams(
-      sbus = site(SystemBusKey),
-      mbus = site(MemoryBusKey),
-      l2 = site(BankedL2Key),
-      sbusToMbusXType = site(SbusToMbusXTypeKey)))
-})
-
-class WithMulticlockIncoherentBusTopology extends Config((site, here, up) => {
-  case TLNetworkTopologyLocated(InSubsystem) => List(
-    JustOneBusTopologyParams(sbus = site(SystemBusKey)),
-    HierarchicalMulticlockBusTopologyParams(
-      pbus = site(PeripheryBusKey),
-      fbus = site(FrontBusKey),
-      cbus = site(ControlBusKey),
-      xTypes = SubsystemCrossingParams()))
-})

generators/chipyard/src/main/scala/Subsystem.scala

@@ -13,8 +13,6 @@ import freechips.rocketchip.config.{Field, Parameters}
 import freechips.rocketchip.devices.tilelink._
 import freechips.rocketchip.devices.debug.{HasPeripheryDebug, HasPeripheryDebugModuleImp, ExportDebug, DebugModuleKey}
 import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.diplomaticobjectmodel.model.{OMInterrupt}
-import freechips.rocketchip.diplomaticobjectmodel.logicaltree.{RocketTileLogicalTreeNode, LogicalModuleTree}
 import freechips.rocketchip.tile._
 import freechips.rocketchip.tilelink._
 import freechips.rocketchip.interrupts._

generators/chipyard/src/main/scala/System.scala

@@ -60,7 +60,7 @@ trait CanHaveMasterTLMemPort { this: BaseSubsystem =>
   private val device = new MemoryDevice
   private val idBits = memPortParamsOpt.map(_.master.idBits).getOrElse(1)
 
-  val memTLNode = TLManagerNode(memPortParamsOpt.map({ case MemoryPortParams(memPortParams, nMemoryChannels) =>
+  val memTLNode = TLManagerNode(memPortParamsOpt.map({ case MemoryPortParams(memPortParams, nMemoryChannels, _) =>
     Seq.tabulate(nMemoryChannels) { channel =>
       val base = AddressSet.misaligned(memPortParams.base, memPortParams.size)
       val filter = AddressSet(channel * mbus.blockBytes, ~((nMemoryChannels-1) * mbus.blockBytes))

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

@@ -41,20 +41,21 @@ class AbstractConfig extends Config(
   new chipyard.iobinders.WithCustomBootPin ++
   new chipyard.iobinders.WithDividerOnlyClockGenerator ++
 
-  new testchipip.WithSerialTLWidth(32) ++                        // fatten the serialTL interface to improve testing performance
+  new testchipip.WithSerialTLWidth(32) ++                           // fatten the serialTL interface to improve testing performance
-  new testchipip.WithDefaultSerialTL ++                          // use serialized tilelink port to external serialadapter/harnessRAM
+  new testchipip.WithDefaultSerialTL ++                             // use serialized tilelink port to external serialadapter/harnessRAM
-  new chipyard.config.WithBootROM ++                             // use default bootrom
+  new chipyard.config.WithBootROM ++                                // use default bootrom
-  new chipyard.config.WithUART ++                                // add a UART
+  new chipyard.config.WithUART ++                                   // add a UART
-  new chipyard.config.WithL2TLBs(1024) ++                        // use L2 TLBs
+  new chipyard.config.WithL2TLBs(1024) ++                           // use L2 TLBs
-  new chipyard.config.WithNoSubsystemDrivenClocks ++             // drive the subsystem diplomatic clocks from ChipTop instead of using implicit clocks
+  new chipyard.config.WithNoSubsystemDrivenClocks ++                // drive the subsystem diplomatic clocks from ChipTop instead of using implicit clocks
-  new chipyard.config.WithInheritBusFrequencyAssignments ++      // Unspecified clocks within a bus will receive the bus frequency if set
+  new chipyard.config.WithInheritBusFrequencyAssignments ++         // Unspecified clocks within a bus will receive the bus frequency if set
-  new chipyard.config.WithPeripheryBusFrequencyAsDefault ++      // Unspecified frequencies with match the pbus frequency (which is always set)
+  new chipyard.config.WithPeripheryBusFrequencyAsDefault ++         // Unspecified frequencies with match the pbus frequency (which is always set)
-  new chipyard.config.WithMemoryBusFrequency(100.0) ++           // Default 100 MHz mbus
+  new chipyard.config.WithMemoryBusFrequency(100.0) ++              // Default 100 MHz mbus
-  new chipyard.config.WithPeripheryBusFrequency(100.0) ++        // Default 100 MHz pbus
+  new chipyard.config.WithPeripheryBusFrequency(100.0) ++           // Default 100 MHz pbus
-  new freechips.rocketchip.subsystem.WithJtagDTM ++              // set the debug module to expose a JTAG port
+  new freechips.rocketchip.subsystem.WithJtagDTM ++                 // set the debug module to expose a JTAG port
-  new freechips.rocketchip.subsystem.WithNoMMIOPort ++           // no top-level MMIO master port (overrides default set in rocketchip)
+  new freechips.rocketchip.subsystem.WithNoMMIOPort ++              // no top-level MMIO master port (overrides default set in rocketchip)
-  new freechips.rocketchip.subsystem.WithNoSlavePort ++          // no top-level MMIO slave port (overrides default set in rocketchip)
+  new freechips.rocketchip.subsystem.WithNoSlavePort ++             // no top-level MMIO slave port (overrides default set in rocketchip)
-  new freechips.rocketchip.subsystem.WithInclusiveCache ++       // use Sifive L2 cache
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++          // use Sifive L2 cache
-  new freechips.rocketchip.subsystem.WithNExtTopInterrupts(0) ++ // no external interrupts
+  new freechips.rocketchip.subsystem.WithNExtTopInterrupts(0) ++    // no external interrupts
-  new chipyard.WithMulticlockCoherentBusTopology ++              // hierarchical buses including mbus+l2
+  new freechips.rocketchip.subsystem.WithDontDriveBusClocksFromSBus ++ // leave the bus clocks undriven by sbus
-  new freechips.rocketchip.system.BaseConfig)                    // "base" rocketchip system
+  new freechips.rocketchip.subsystem.WithCoherentBusTopology ++     // hierarchical buses including sbus/mbus/pbus/fbus/cbus/l2
+  new freechips.rocketchip.system.BaseConfig)                       // "base" rocketchip system

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

@@ -15,7 +15,7 @@ class TinyRocketConfig extends Config(
   new chipyard.config.WithTLSerialLocation(
     freechips.rocketchip.subsystem.FBUS,
     freechips.rocketchip.subsystem.PBUS) ++                       // attach TL serial adapter to f/p busses
-  new chipyard.WithMulticlockIncoherentBusTopology ++             // use incoherent bus topology
+  new freechips.rocketchip.subsystem.WithIncoherentBusTopology ++ // use incoherent bus topology
   new freechips.rocketchip.subsystem.WithNBanks(0) ++             // remove L2$
   new freechips.rocketchip.subsystem.WithNoMemPort ++             // remove backing memory
   new freechips.rocketchip.subsystem.With1TinyCore ++             // single tiny rocket-core

generators/chipyard/src/main/scala/example/TutorialTile.scala

@@ -7,7 +7,6 @@ import freechips.rocketchip.config._
 import freechips.rocketchip.subsystem._
 import freechips.rocketchip.devices.tilelink._
 import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.diplomaticobjectmodel.logicaltree.{LogicalTreeNode}
 import freechips.rocketchip.rocket._
 import freechips.rocketchip.subsystem.{RocketCrossingParams}
 import freechips.rocketchip.tilelink._

generators/firechip/src/main/scala/FireSim.scala

@@ -262,9 +262,7 @@ class FireSim(implicit val p: Parameters) extends RawModule with HasHarnessSigna
     // instantiation of the dut, otherwise the initial instance will be
     // reused across each node
     import freechips.rocketchip.subsystem.AsyncClockGroupsKey
-    val lazyModule = LazyModule(p(BuildTop)(p.alterPartial({
+    val lazyModule = LazyModule(p(BuildTop)(p))
-      case AsyncClockGroupsKey => p(AsyncClockGroupsKey).copy
-    })))
     val module = Module(lazyModule.module)
 
     lazyModule match { case d: HasIOBinders =>

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.3")

scripts/build-toolchain-extra.sh

@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+
+# exit script if any command fails
+set -e
+set -o pipefail
+
+RDIR=$(git rev-parse --show-toplevel)
+
+# get helpful utilities
+source $RDIR/scripts/utils.sh
+
+common_setup
+
+# Allow user to override MAKE
+[ -n "${MAKE:+x}" ] || MAKE=$(command -v gnumake || command -v gmake || command -v make)
+readonly MAKE
+
+usage() {
+    echo "usage: ${0} [OPTIONS] [riscv-tools | esp-tools]"
+    echo ""
+    echo "Installation Types"
+    echo "   riscv-tools: if set, builds the riscv toolchain (this is also the default)"
+    echo "   esp-tools: if set, builds esp-tools toolchain used for the hwacha vector accelerator"
+    echo ""
+    echo "Options"
+    echo "   --prefix PREFIX       : Install destination. If unset, defaults to $CONDA_PREFIX/riscv-tools"
+    echo "                           or $CONDA_PREFIX/esp-tools"
+    echo "   --clean-after-install : Run make clean in calls to module_make and module_build"
+    echo "   --force -f            : Skip prompt checking for conda"
+    echo "   --skip-validate       : DEPRECATED: Same functionality as --force"
+    echo "   --help -h             : Display this message"
+    exit "$1"
+}
+
+TOOLCHAIN="riscv-tools"
+CLEANAFTERINSTALL=""
+RISCV=""
+FORCE=false
+
+# getopts does not support long options, and is inflexible
+while [ "$1" != "" ];
+do
+    case $1 in
+        -h | -H | --help | help )
+            usage 3 ;;
+        -p | --prefix )
+            shift
+            RISCV=$(realpath $1) ;;
+        --clean-after-install )
+            CLEANAFTERINSTALL="true" ;;
+        riscv-tools | esp-tools)
+            TOOLCHAIN=$1 ;;
+        --force | -f | --skip-validate)
+            FORCE=true;
+            ;;
+        * )
+            error "invalid option $1"
+            usage 1 ;;
+    esac
+    shift
+done
+
+if [ "$FORCE" = false ]; then
+    if [ -z ${CONDA_DEFAULT_ENV+x} ]; then
+        error "ERROR: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate chipyard')?"
+        exit 1
+    fi
+fi
+
+if [ -z "$RISCV" ] ; then
+    RISCV="$CONDA_PREFIX/$TOOLCHAIN"
+fi
+
+XLEN=64
+
+echo "Installing extra toolchain utilities/tests to $RISCV"
+
+# install risc-v tools
+export RISCV="$RISCV"
+
+cd "${RDIR}"
+
+SRCDIR="$(pwd)/toolchains/${TOOLCHAIN}"
+[ -d "${SRCDIR}" ] || die "unsupported toolchain: ${TOOLCHAIN}"
+. ./scripts/build-util.sh
+
+echo '==>  Installing Spike'
+# disable boost explicitly for https://github.com/riscv-software-src/riscv-isa-sim/issues/834
+# since we don't have it in our requirements
+module_all riscv-isa-sim --prefix="${RISCV}" --with-boost=no --with-boost-asio=no --with-boost-regex=no
+# build static libfesvr library for linking into firesim driver (or others)
+echo '==>  Installing libfesvr static library'
+OLDCLEANAFTERINSTALL=$CLEANAFTERINSTALL
+CLEANAFTERINSTALL=""
+module_make riscv-isa-sim libfesvr.a
+cp -p "${SRCDIR}/riscv-isa-sim/build/libfesvr.a" "${RISCV}/lib/"
+CLEANAFTERINSTALL=$OLDCLEANAFTERINSTALL
+
+echo '==>  Installing Proxy Kernel'
+CC= CXX= module_all riscv-pk --prefix="${RISCV}" --host=riscv${XLEN}-unknown-elf
+
+echo '==>  Installing RISC-V tests'
+module_all riscv-tests --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --with-xlen=${XLEN}
+
+# Common tools (not in any particular toolchain dir)
+
+echo '==>  Installing libgloss'
+CC= CXX= SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --host=riscv${XLEN}-unknown-elf
+
+echo "Extra Toolchain Utilities/Tests Build Complete!"

scripts/build-toolchains.sh

@@ -1,227 +0,0 @@
-#!/usr/bin/env bash
-
-#this script is based on the firesim build toolchains script
-
-# exit script if any command fails
-set -e
-set -o pipefail
-
-# On macOS, use GNU readlink from 'coreutils' package in Homebrew/MacPorts
-if [ "$(uname -s)" = "Darwin" ] ; then
-    READLINK=greadlink
-else
-    READLINK=readlink
-fi
-
-# If BASH_SOURCE is undefined, we may be running under zsh, in that case
-# provide a zsh-compatible alternative
-DIR="$(dirname "$($READLINK -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
-CHIPYARD_DIR="$(dirname "$DIR")"
-
-# Allow user to override MAKE
-[ -n "${MAKE:+x}" ] || MAKE=$(command -v gnumake || command -v gmake || command -v make)
-readonly MAKE
-
-usage() {
-    echo "usage: ${0} [OPTIONS] [riscv-tools | esp-tools | ec2fast]"
-    echo ""
-    echo "Installation Types"
-    echo "   riscv-tools: if set, builds the riscv toolchain (this is also the default)"
-    echo "   esp-tools: if set, builds esp-tools toolchain used for the hwacha vector accelerator"
-    echo "   ec2fast: if set, pulls in a pre-compiled RISC-V toolchain for an EC2 manager instance"
-    echo ""
-    echo "Options"
-    echo "   --prefix PREFIX       : Install destination. If unset, defaults to $(pwd)/riscv-tools-install"
-    echo "                           or $(pwd)/esp-tools-install"
-    echo "   --ignore-qemu         : Ignore installing QEMU"
-    echo "   --clean-after-install : Run make clean in calls to module_make and module_build"
-    echo "   --arch -a             : Architecture (e.g., rv64gc)"
-    echo "   --help -h             : Display this message"
-    exit "$1"
-}
-
-error() {
-    echo "${0##*/}: ${1}" >&2
-}
-die() {
-    error "$1"
-    exit "${2:--1}"
-}
-
-TOOLCHAIN="riscv-tools"
-EC2FASTINSTALL="false"
-IGNOREQEMU=""
-CLEANAFTERINSTALL=""
-RISCV=""
-ARCH=""
-
-# getopts does not support long options, and is inflexible
-while [ "$1" != "" ];
-do
-    case $1 in
-        -h | --help | help )
-            usage 3 ;;
-        -p | --prefix )
-            shift
-            RISCV=$(realpath $1) ;;
-        --ignore-qemu )
-            IGNOREQEMU="true" ;;
-        -a | --arch )
-            shift
-            ARCH=$1 ;;
-        --clean-after-install )
-            CLEANAFTERINSTALL="true" ;;
-        riscv-tools | esp-tools)
-            TOOLCHAIN=$1 ;;
-        ec2fast )
-            EC2FASTINSTALL="true" ;;
-        * )
-            error "invalid option $1"
-            usage 1 ;;
-    esac
-    shift
-done
-
-if [ -z "$RISCV" ] ; then
-      INSTALL_DIR="$TOOLCHAIN-install"
-      RISCV="$(pwd)/$INSTALL_DIR"
-fi
-
-if [ -z "$ARCH" ] ; then
-    XLEN=64
-elif [[ "$ARCH" =~ ^rv(32|64)((i?m?a?f?d?|g?)c?)$ ]]; then
-    XLEN=${BASH_REMATCH[1]}
-else
-    error "invalid arch $ARCH"
-    usage 1
-fi
-
-echo "Installing toolchain to $RISCV"
-
-# install risc-v tools
-export RISCV="$RISCV"
-
-cd "${CHIPYARD_DIR}"
-
-SRCDIR="$(pwd)/toolchains/${TOOLCHAIN}"
-[ -d "${SRCDIR}" ] || die "unsupported toolchain: ${TOOLCHAIN}"
-. ./scripts/build-util.sh
-
-
-if [ "${EC2FASTINSTALL}" = true ] ; then
-    [ "${TOOLCHAIN}" = 'riscv-tools' ] ||
-        die "unsupported precompiled toolchain: ${TOOLCHAIN}"
-
-    echo '=>  Fetching pre-built toolchain'
-    module=toolchains/riscv-tools/riscv-gnu-toolchain-prebuilt
-    git config --unset submodule."${module}".update || :
-    git submodule update --init --depth 1 "${module}"
-
-    echo '==>  Verifying toolchain version hash'
-    # Find commit hash without initializing the submodule
-    hashsrc="$(git ls-tree -d HEAD "${SRCDIR}/riscv-gnu-toolchain" | {
-        unset IFS && read -r _ type obj _ &&
-        test -n "${obj}" && test "${type}" = 'commit' && echo "${obj}"
-    }; )" ||
-        die 'failed to obtain riscv-gnu-toolchain submodule hash' "$?"
-
-    read -r hashbin < "${module}/HASH" ||
-        die 'failed to obtain riscv-gnu-toolchain-prebuilt hash' "$?"
-
-    echo "==>  ${hashsrc}"
-    [ "${hashsrc}" = "${hashbin}" ] ||
-        die "pre-built version mismatch: ${hashbin}"
-
-    echo '==>  Installing pre-built toolchain'
-    "${MAKE}" -C "${module}" DESTDIR="${RISCV}" install
-    git submodule deinit "${module}" || :
-
-else
-    MAKE_VER=$("${MAKE}" --version) || true
-    case ${MAKE_VER} in
-        'GNU Make '[4-9]\.*)
-            ;;
-        'GNU Make '[1-9][0-9])
-            ;;
-        *)
-            die 'obsolete make version; need GNU make 4.x or later'
-            ;;
-    esac
-
-    module_prepare riscv-gnu-toolchain qemu
-    module_build riscv-gnu-toolchain --prefix="${RISCV}" --with-cmodel=medany ${ARCH:+--with-arch=${ARCH}}
-    echo '==>  Building GNU/Linux toolchain'
-    module_make riscv-gnu-toolchain linux
-fi
-
-# disable boost explicitly for https://github.com/riscv-software-src/riscv-isa-sim/issues/834
-# since we don't have it in our requirements
-module_all riscv-isa-sim --prefix="${RISCV}" --with-boost=no --with-boost-asio=no --with-boost-regex=no
-# build static libfesvr library for linking into firesim driver (or others)
-echo '==>  Installing libfesvr static library'
-module_make riscv-isa-sim libfesvr.a
-cp -p "${SRCDIR}/riscv-isa-sim/build/libfesvr.a" "${RISCV}/lib/"
-
-CC= CXX= module_all riscv-pk --prefix="${RISCV}" --host=riscv${XLEN}-unknown-elf
-module_all riscv-tests --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --with-xlen=${XLEN}
-
-# Common tools (not in any particular toolchain dir)
-
-CC= CXX= SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --host=riscv${XLEN}-unknown-elf
-
-if [ -z "$IGNOREQEMU" ] ; then
-    echo "=>  Starting qemu build"
-    dir="$(pwd)/toolchains/qemu"
-    echo "==>   Initializing qemu submodule"
-    #since we don't want to use the global config we init passing rewrite config in to the command
-    git -c url.https://github.com/qemu.insteadOf=https://git.qemu.org/git submodule update --init --recursive "$dir"
-    echo "==>  Applying url-rewriting to avoid git.qemu.org"
-    # and once the clones exist, we recurse through them and set the rewrite
-    # in the local config so that any further commands by the user have the rewrite. uggh. git, why you so ugly?
-    git -C "$dir" config --local url.https://github.com/qemu.insteadOf https://git.qemu.org/git
-    git -C "$dir" submodule foreach --recursive 'git config --local url.https://github.com/qemu.insteadOf https://git.qemu.org/git'
-
-    # check to see whether the rewrite rules are needed any more
-    # If you find git.qemu.org in any .gitmodules file below qemu, you still need them
-    # the /dev/null redirection in the submodule grepping is to quiet non-existance of further .gitmodules
-    ! grep -q 'git\.qemu\.org' "$dir/.gitmodules" && \
-    git -C "$dir" submodule foreach --quiet --recursive '! grep -q "git\.qemu\.org" .gitmodules 2>/dev/null' && \
-    echo "==>  PLEASE REMOVE qemu URL-REWRITING from scripts/build-toolchains.sh. It is no longer needed!" && exit 1
-
-    (
-    # newer version of BFD-based ld has made '-no-pie' an error because it renamed to '--no-pie'
-    # meanwhile, ld.gold will still accept '-no-pie'
-    # QEMU 5.0 still uses '-no-pie' in it's linker options
-
-    # default LD to ld if it isn't set
-    if ( set +o pipefail; ${LD:-ld} -no-pie |& grep 'did you mean --no-pie' >/dev/null); then
-	echo "==>  LD doesn't like '-no-pie'"
-	# LD has the problem, look for ld.gold
-	if type ld.gold >&/dev/null; then
-	    echo "==>  Using ld.gold to link QEMU"
-	    export LD=ld.gold
-	fi
-    fi
-
-    # now actually do the build
-    SRCDIR="$(pwd)/toolchains" module_build qemu --prefix="${RISCV}" --target-list=riscv${XLEN}-softmmu --disable-werror
-    )
-fi
-
-# make Dromajo
-git submodule update --init $CHIPYARD_DIR/tools/dromajo/dromajo-src
-make -C $CHIPYARD_DIR/tools/dromajo/dromajo-src/src
-
-# create specific env.sh
-cat > "$CHIPYARD_DIR/env-$TOOLCHAIN.sh" <<EOF
-# auto-generated by build-toolchains.sh
-export CHIPYARD_TOOLCHAIN_SOURCED=1
-export RISCV=$(printf '%q' "$RISCV")
-export PATH=\${RISCV}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${RISCV}/lib\${LD_LIBRARY_PATH:+":\${LD_LIBRARY_PATH}"}
-EOF
-
-# create general env.sh
-echo "# line auto-generated by build-toolchains.sh" >> env.sh
-echo "source $(printf '%q' "$CHIPYARD_DIR/env-$TOOLCHAIN.sh")" >> env.sh
-echo "Toolchain Build Complete!"

scripts/centos-req.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-sudo yum groupinstall -y "Development tools"
-sudo yum install -y gmp-devel mpfr-devel libmpc-devel zlib-devel vim git java java-devel
-
-# Install SBT https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html#Red+Hat+Enterprise+Linux+and+other+RPM-based+distributions
-# sudo rm -f /etc/yum.repos.d/bintray-rpm.repo
-# Use rm above if sbt installed from bintray before.
-curl -L https://www.scala-sbt.org/sbt-rpm.repo > sbt-rpm.repo
-sudo mv sbt-rpm.repo /etc/yum.repos.d/
-
-sudo yum install -y sbt texinfo gengetopt
-sudo yum install -y expat-devel libusb1-devel ncurses-devel cmake "perl(ExtUtils::MakeMaker)"
-# deps for poky
-sudo yum install -y python38 patch diffstat texi2html texinfo subversion chrpath git wget
-# deps for qemu
-sudo yum install -y gtk3-devel
-# deps for firemarshal
-sudo yum install -y python38-pip python38-devel rsync libguestfs-tools makeinfo expat ctags
-# Install GNU make 4.x (needed to cross-compile glibc 2.28+)
-sudo yum install -y centos-release-scl
-sudo yum install -y devtoolset-8-make
-# install DTC
-sudo yum install -y dtc
-sudo yum install -y python
-
-# install verilator
-git clone http://git.veripool.org/git/verilator
-cd verilator
-git checkout v4.034
-autoconf && ./configure && make -j$(nproc) && sudo make install

scripts/check-tracegen.sh

@@ -7,17 +7,24 @@ AXE_DIR=$(realpath ${SCRIPT_DIR}/../tools/axe)
 ROCKET_DIR=$(realpath ${SCRIPT_DIR}/../generators/rocket-chip)
 
 TO_AXE=${ROCKET_DIR}/scripts/toaxe.py
+TO_AXE_PY3=/tmp/toaxe.py
 AXE=${AXE_DIR}/src/axe
 AXE_SHRINK=${AXE_DIR}/src/axe-shrink.py
+AXE_SHRINK_PY3=/tmp/axe-shrink.py
+
+# TODO: convert scripts to py3 in src
+2to3 $TO_AXE -o /tmp -n -w
+sed -i '30d' $TO_AXE_PY3 # remove import sets
+2to3 $AXE_SHRINK -o /tmp -n -w
 
 PATH=$PATH:${AXE_DIR}/src
 
 grep '.*:.*#.*@' $1 > /tmp/clean-trace.txt
-python2 "$TO_AXE" /tmp/clean-trace.txt > /tmp/trace.axe
+python "$TO_AXE_PY3" /tmp/clean-trace.txt > /tmp/trace.axe
 result=$("$AXE" check wmo /tmp/trace.axe)
 
 if [ "$result" != OK ]; then
-    "$AXE_SHRINK" wmo /tmp/trace.axe
+    "$AXE_SHRINK_PY3" wmo /tmp/trace.axe
 else
     echo OK
 fi

scripts/firesim-setup.sh

@@ -5,13 +5,12 @@
 set -e
 set -o pipefail
 
-RDIR=$(pwd)
+RDIR=$(git rev-parse --show-toplevel)
-scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
 
-cd "${scripts_dir}/.."
+cd "$RDIR"
 
 # Reenable the FireSim submodule
 git config --unset submodule.sims/firesim.update || true
-cd sims/firesim
+pushd sims/firesim
 ./build-setup.sh "$@" --library --skip-validate
-cd "$RDIR"
+popd

scripts/init-fpga.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 # exit script if any command fails
 set -e
 set -o pipefail

scripts/init-software.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 # exit script if any command fails
 set -e
 set -o pipefail

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

@@ -4,27 +4,35 @@
 set -e
 set -o pipefail
 
-SKIP_VALIDATE=false
+RDIR=$(git rev-parse --show-toplevel)
+
+# get helpful utilities
+source $RDIR/scripts/utils.sh
+
+common_setup
 
 function usage
 {
-    echo "Usage: $0 [--skip-validate]"
+    echo "Usage: $0 [--force]"
     echo "Initialize Chipyard submodules and setup initial env.sh script."
     echo ""
-    echo "  --skip-validate    Skip prompt checking for tagged release"
+    echo "  --force -f      : Skip prompt checking for tagged release"
+    echo "  --skip-validate : DEPRECATED: Same functionality as --force"
 }
 
+FORCE=false
 while test $# -gt 0
 do
    case "$1" in
-        --skip-validate)
+        --force | -f | --skip-validate)
-            SKIP_VALIDATE=true;
+            FORCE=true;
             ;;
-        -h | -H | --help)
+        -h | -H | --help | help)
             usage
             exit 1
             ;;
-        *) echo "ERROR: bad argument $1"
+        *)
+            echo "ERROR: bad argument $1"
             usage
             exit 2
             ;;
@@ -32,47 +40,52 @@ do
     shift
 done
 
-# Check that git version is at least 1.7.8
+# check that git version is at least 1.7.8
 MYGIT=$(git --version)
 MYGIT=${MYGIT#'git version '} # Strip prefix
 case ${MYGIT} in
-[1-9]*) ;;
+    [1-9]*)
-*) echo 'warning: unknown git version' ;;
+        ;;
+    *)
+        echo "WARNING: unknown git version"
+        ;;
 esac
 MINGIT="1.8.5"
 if [ "$MINGIT" != "$(echo -e "$MINGIT\n$MYGIT" | sort -V | head -n1)" ]; then
   echo "This script requires git version $MINGIT or greater. Exiting."
-  false
+  exit 4
 fi
 
 # before doing anything verify that you are on a release branch/tag
+save_bash_options
 set +e
-tag=$(git describe --exact-match --tags)
+git_tag=$(git describe --exact-match --tags)
-tag_ret_code=$?
+git_tag_rc=$?
-set -e
+restore_bash_options
-if [ $tag_ret_code -ne 0 ]; then
+if [ "$git_tag_rc" -ne 0 ]; then
-    if [ "$SKIP_VALIDATE" = false ]; then
+    if [ "$FORCE" == false ]; then
-        read -p "WARNING: You are not on an official release of Chipyard."$'\n'"Type \"y\" to continue if this is intended, otherwise see https://chipyard.readthedocs.io/en/stable/Chipyard-Basics/Initial-Repo-Setup.html#setting-up-the-chipyard-repo: " validate
+        while true; do
-        [[ $validate == [yY] ]] || exit 3
+            read -p "WARNING: You are not on an official release of Chipyard."$'\n'"Type \"y\" to continue if this is intended or \"n\" if not: " validate
-        echo "Setting up non-official Chipyard release"
+            case "$validate" in
+                y | Y)
+                    echo "Continuing on to setting up non-official Chipyard release repository"
+                    break
+                    ;;
+                n | N)
+                    error "See https://chipyard.readthedocs.io/en/stable/Chipyard-Basics/Initial-Repo-Setup.html#setting-up-the-chipyard-repo for setting up an official release of Chipyard. "
+                    exit 3
+                    ;;
+                *)
+                    error "Invalid response. Please type \"y\" or \"n\""
+                    ;;
+            esac
+        done
     fi
 else
-    echo "Setting up official Chipyard release: $tag"
+    echo "Setting up official Chipyard release: $git_tag"
 fi
 
-# On macOS, use GNU readlink from 'coreutils' package in Homebrew/MacPorts
+cd "$RDIR"
-if [ "$(uname -s)" = "Darwin" ] ; then
-    READLINK=greadlink
-else
-    READLINK=readlink
-fi
-
-# If BASH_SOURCE is undefined we may be running under zsh, in that case
-# provide a zsh-compatible alternative
-DIR="$(dirname "$($READLINK -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
-CHIPYARD_DIR="$(dirname "$DIR")"
-
-cd "$CHIPYARD_DIR"
 
 (
     # Blocklist of submodules to initially skip:
@@ -84,9 +97,8 @@ cd "$CHIPYARD_DIR"
         # Call the given subcommand (shell function) on each submodule
         # path to temporarily exclude during the recursive update
         for name in \
-            toolchains/*-tools/*/ \
+            toolchains/*-tools/* \
             toolchains/libgloss \
-            toolchains/qemu \
             generators/sha3 \
             generators/gemmini \
             sims/firesim \
@@ -107,36 +119,40 @@ cd "$CHIPYARD_DIR"
     _unskip() { git config --local --unset-all "submodule.${1}.update" || : ; }
 
     trap 'git_submodule_exclude _unskip' EXIT INT TERM
-    set -x
+    (
-    git_submodule_exclude _skip
+        set -x
-    git submodule update --init --recursive #--jobs 8
+        git_submodule_exclude _skip
-    set +x
+        git submodule update --init --recursive #--jobs 8
+    )
 )
 
-set -x
+(
+    # Non-recursive clone to exclude riscv-linux
+    git submodule update --init generators/sha3
 
-# Non-recursive clone to exclude riscv-linux
+    # Non-recursive clone to exclude gemmini-software
-git submodule update --init generators/sha3
+    git submodule update --init generators/gemmini
+    git -C generators/gemmini/ submodule update --init --recursive software/gemmini-rocc-tests
 
-# Non-recursive clone to exclude gemmini-software
+    # Minimal non-recursive clone to initialize sbt dependencies
-git submodule update --init generators/gemmini
+    git submodule update --init sims/firesim
-git -C generators/gemmini/ submodule update --init --recursive software/gemmini-rocc-tests
+    git config --local submodule.sims/firesim.update none
 
-# Minimal non-recursive clone to initialize sbt dependencies
+    # Only shallow clone needed for basic SW tests
-git submodule update --init sims/firesim
+    git submodule update --init software/firemarshal
-git config --local submodule.sims/firesim.update none
+)
-
-# Only shallow clone needed for basic SW tests
-git submodule update --init software/firemarshal
-
-set +x
 
 # Configure firemarshal to know where our firesim installation is
 if [ ! -f ./software/firemarshal/marshal-config.yaml ]; then
   echo "firesim-dir: '../../sims/firesim/'" > ./software/firemarshal/marshal-config.yaml
 fi
 
-echo "# line auto-generated by init-submodules-no-riscv-tools.sh" >> env.sh
+cat << EOT >> env.sh
-echo '__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"' >> env.sh
+# line auto-generated by init-submodules-no-riscv-tools.sh
-echo "PATH=\$__DIR/bin:\$PATH" >> env.sh
+__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
-echo "PATH=\$__DIR/software/firemarshal:\$PATH" >> env.sh
+PATH=\$__DIR/bin:\$PATH
+PATH=\$__DIR/software/firemarshal:\$PATH
+if [ -z \${CONDA_DEFAULT_ENV+x} ]; then
+    echo "WARNING: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate chipyard')?"
+fi
+EOT

scripts/init-vlsi.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 # exit script if any command fails
 set -e
 set -o pipefail

scripts/repo-clean.sh

@@ -3,19 +3,9 @@
 set -e
 
 # this should be run from chipyard repo top
-TOPDIR=$(pwd)
+RDIR=$(git rev-parse --show-toplevel)
 
-cd generators/cva6/src/main/resources/vsrc
+cd $RDIR/libgloss
-git submodule deinit cva6
-
-cd $TOPDIR
-
-cd toolchains/qemu/roms/
-git submodule deinit edk2
-cd ../
-rm -rf build
-
-cd ../libgloss
 rm -rf build.log
 
 cd ../riscv-tools/riscv-isa-sim/
@@ -27,6 +17,5 @@ rm -rf build.log
 cd ../riscv-tests
 rm -rf build.log
 
-cd $TOPDIR
+cd $RDIR/tools/api-config-chipsalliance
-cd tools/api-config-chipsalliance
 git config --local status.showUntrackedFiles no

scripts/tutorial-setup.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-set -e -x
+set -ex
+
+RDIR=$(git rev-parse --show-toplevel)
+
+cd $RDIR
 
 git rm generators/chipyard/src/main/scala/config/RocketSha3Configs.scala
 git rm -rf generators/sha3

scripts/ubuntu-req.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-sudo apt-get install -y build-essential bison flex software-properties-common curl
-sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim default-jdk default-jre
-# install sbt: https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions
-echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
-curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add
-sudo apt-get update
-sudo apt-get install -y sbt
-sudo apt-get install -y texinfo gengetopt
-sudo apt-get install -y libexpat1-dev libusb-dev libncurses5-dev cmake
-# deps for poky
-sudo apt-get install -y python3.8 patch diffstat texi2html texinfo subversion chrpath wget
-# deps for qemu
-sudo apt-get install -y libgtk-3-dev gettext
-# deps for firemarshal
-sudo apt-get install -y python3-pip python3.8-dev rsync libguestfs-tools expat ctags
-# install DTC
-sudo apt-get install -y device-tree-compiler
-sudo apt-get install -y python
-# install git >= 2.17
-sudo add-apt-repository ppa:git-core/ppa -y
-sudo apt-get update
-sudo apt-get install git -y
-
-# install verilator
-sudo apt-get install -y autoconf
-git clone http://git.veripool.org/git/verilator
-cd verilator
-git checkout v4.034
-autoconf && ./configure && make -j$(nproc) && sudo make install

scripts/utils.sh

@@ -0,0 +1,55 @@
+#/usr/bin/env bash
+
+#######################################
+# Common setup. Init MacOS compatibility
+# variables.
+# Globals:
+#   READLINK
+#######################################
+function common_setup
+{
+    # On macOS, use GNU readlink from 'coreutils' package in Homebrew/MacPorts
+    if [ "$(uname -s)" = "Darwin" ] ; then
+        READLINK=greadlink
+    else
+        READLINK=readlink
+    fi
+}
+
+#######################################
+# Error echo wrapper
+#######################################
+function error
+{
+    echo "${0##*/}: ${1}" >&2
+}
+
+#######################################
+# Error then exit wrapper
+# Arguments:
+#   string to print before exit
+#   (optional) int error code
+#######################################
+function die
+{
+    error "$1"
+    exit "${2:--1}"
+}
+
+#######################################
+# Save bash options. Must be called
+# before a corresponding `restore_bash_options`.
+#######################################
+function save_bash_options
+{
+    OLDSTATE=$(set +o)
+}
+
+#######################################
+# Restore bash options. Must be called
+# after a corresponding `save_bash_options`.
+#######################################
+function restore_bash_options
+{
+    set +vx; eval "$OLDSTATE"
+}

tools/dromajo/dromajo.mk

@@ -4,7 +4,7 @@
 
 DROMAJO_DIR = $(base_dir)/tools/dromajo/dromajo-src/src
 DROMAJO_LIB_NAME = dromajo_cosim
-DROMAJO_LIB = $(DROMAJO_DIR)/lib$(DROMAJO_LIB_NAME).a
+DROMAJO_LIB = $(CONDA_PREFIX)/lib/lib$(DROMAJO_LIB_NAME).a
 
 # Dromajo assumes using the default bootrom
 DROMAJO_ROM = $(build_dir)/bootrom.rv64.img

variables.mk

@@ -179,7 +179,7 @@ SBT_CLIENT_FLAG = --client
 endif
 
 # passes $(JAVA_TOOL_OPTIONS) from env to java
-SBT_BIN ?= java -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS)
+SBT_BIN ?= sbt
 SBT = $(SBT_BIN) $(SBT_CLIENT_FLAG)
 SBT_NON_THIN = $(subst $(SBT_CLIENT_FLAG),,$(SBT))