Merge pull request #1749 from ucb-bar/remove-skip-validate

Remove skip-validate option

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

@@ -23,7 +23,7 @@ runs:
     - name: Init submodules (since only the RTL is cached)
       run: |
         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
+        ./scripts/init-submodules-no-riscv-tools.sh
       shell: bash -leo pipefail {0}
 
     # Note: You shouldn't need the other inputs since it shouldn't build RTL from scratch

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

@@ -15,7 +15,7 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
 cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh --force
+./scripts/init-submodules-no-riscv-tools.sh
 
 # Constellation can run without espresso, but this improves
 # elaboration time drastically

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

@@ -11,7 +11,7 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
 cd $REMOTE_CHIPYARD_DIR
-./scripts/init-submodules-no-riscv-tools.sh --force
+./scripts/init-submodules-no-riscv-tools.sh
 
 # Run Firesim Scala Tests
 export FIRESIM_ENV_SOURCED=1

.github/workflows/chipyard-full-flow.yml

@@ -83,7 +83,7 @@ jobs:
           eval "$(conda shell.bash hook)"
           mkdir ${{ env.JAVA_TMP_DIR }}
           export MAKEFLAGS="-j32"
-          ./build-setup.sh -f -v
+          ./build-setup.sh -v
 
   run-cfg-finder:
     name: run-cfg-finder

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

@@ -377,7 +377,7 @@ jobs:
       - name: Build Gemmini FireMarshal
         run: |
           conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
-          cd ${{ github.workspace }} && ./scripts/init-submodules-no-riscv-tools.sh --force
+          cd ${{ github.workspace }} && ./scripts/init-submodules-no-riscv-tools.sh
           cd ${{ github.workspace }} && source ./scripts/fix-open-files.sh
           git submodule update --init software/firemarshal && cd software/firemarshal && ./init-submodules.sh
           cd ${{ github.workspace }}/generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d build gemmini-smoke.json

scripts/build-setup.sh

@@ -36,10 +36,7 @@ usage() {
     echo ""
     echo "Options"
     echo "  --help -h               : Display this message"
-
-    echo "  --force -f              : Skip all prompts and checks"
     echo "  --verbose -v            : Verbose printout"
-
     echo "  --use-unpinned-deps -ud : Use unpinned conda environment"
 
     echo "  --skip -s N             : Skip step N in the list above. Use multiple times to skip multiple steps ('-s N -s M ...')."
@@ -57,7 +54,6 @@ usage() {
 }
 
 TOOLCHAIN_TYPE="riscv-tools"
-FORCE_FLAG=""
 VERBOSE=false
 VERBOSE_FLAG=""
 USE_UNPINNED_DEPS=false
@@ -71,8 +67,6 @@ do
             usage 3 ;;
         riscv-tools | esp-tools)
             TOOLCHAIN_TYPE=$1 ;;
-        --force | -f | --skip-validate)
-            FORCE_FLAG=$1 ;;
         --verbose | -v)
             VERBOSE_FLAG=$1
             set -x ;;
@@ -99,6 +93,8 @@ do
             SKIP_LIST+=(10) ;;
         --skip-clean)
             SKIP_LIST+=(11) ;;
+        --force | -f | --skip-validate) # Deprecated flags
+            ;;
         * )
             error "invalid option $1"
             usage 1 ;;
@@ -201,17 +197,14 @@ source $CYDIR/scripts/fix-open-files.sh"
 
 fi
 
-if [ -z "$FORCE_FLAG" ]; then
+if [ -z ${CONDA_DEFAULT_ENV+x} ]; then
-    if [ -z ${CONDA_DEFAULT_ENV+x} ]; then
+    echo "!!!!! WARNING: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate base')?"
-        error "ERROR: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate base')?"
-        exit 1
-    fi
 fi
 
 # initialize all submodules (without the toolchain submodules)
 if run_step "2"; then
     begin_step "2" "Initializing Chipyard submodules"
-    $CYDIR/scripts/init-submodules-no-riscv-tools.sh $FORCE_FLAG
+    $CYDIR/scripts/init-submodules-no-riscv-tools.sh
     exit_if_last_command_failed
 fi
 

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

@@ -13,24 +13,20 @@ common_setup
 
 function usage
 {
-    echo "Usage: $0 [--force]"
+    echo "Usage: $0"
     echo "Initialize Chipyard submodules and setup initial env.sh script."
     echo ""
-    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
-        --force | -f | --skip-validate)
-            FORCE=true;
-            ;;
         -h | -H | --help | help)
             usage
             exit 1
             ;;
+        --force | -f | --skip-validate) # Deprecated flags
+            ;;
         *)
             echo "ERROR: bad argument $1"
             usage
@@ -59,32 +55,6 @@ fi
 # before doing anything verify that you are on a release branch/tag
 save_bash_options
 set +e
-git_tag=$(git describe --exact-match --tags)
-git_tag_rc=$?
-restore_bash_options
-if [ "$git_tag_rc" -ne 0 ]; then
-    if [ "$FORCE" == false ]; then
-        while true; do
-            printf '\033[2J'
-            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
-            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: $git_tag"
-fi
 
 cd "$RDIR"