wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove need for conda in build-toolchains-extra.sh

Browse Source
This commit is contained in:
abejgonzalez
2022-12-12 10:56:54 -08:00
parent a8d99eb6f7
commit a0ad9d2055
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/create-conda-env/action.yml vendored
View File

@@ -23,10 +23,10 @@ runs:
if [[ "${{ inputs.install-collateral }}" == 'true' ]]; then if [[ "${{ inputs.install-collateral }}" == 'true' ]]; then
echo "Add extra toolchain collateral to RISC-V install area" 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 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 ./scripts/build-toolchain-extra.sh riscv-tools -p $CONDA_PREFIX/riscv-tools
conda deactivate conda deactivate
conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools 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 ./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
conda deactivate conda deactivate
fi fi
fi fi

11
scripts/build-setup.sh
View File

@@ -117,7 +117,16 @@ if do_skip "2"; then
fi fi
if do_skip "3"; then if do_skip "3"; then
$RDIR/scripts/build-toolchain-extra.sh $FORCE_FLAG $TOOLCHAIN_TYPE if do_skip "1"; then
PREFIX=$CONDA_PREFIX/$TOOLCHAIN_TYPE
else
if [ -z "$RISCV" ] ; then
error "ERROR: If conda initialization skipped, \$RISCV variable must be defined."
exit 1
fi
PREFIX=$RISCV
fi
$RDIR/scripts/build-toolchain-extra.sh $TOOLCHAIN_TYPE -p $PREFIX
fi fi
if do_skip "4"; then if do_skip "4"; then

19
scripts/build-toolchain-extra.sh
View File

@@ -23,11 +23,8 @@ usage() {
echo " esp-tools: if set, builds esp-tools toolchain used for the hwacha vector accelerator" echo " esp-tools: if set, builds esp-tools toolchain used for the hwacha vector accelerator"
echo "" echo ""
echo "Options" echo "Options"
echo " --prefix PREFIX : Install destination. If unset, defaults to $CONDA_PREFIX/riscv-tools" echo " --prefix -p PREFIX : Install destination."
echo " or $CONDA_PREFIX/esp-tools"
echo " --clean-after-install : Run make clean in calls to module_make and module_build" 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" echo " --help -h : Display this message"
exit "$1" exit "$1"
} }
@@ -50,9 +47,6 @@ do
CLEANAFTERINSTALL="true" ;; CLEANAFTERINSTALL="true" ;;
riscv-tools | esp-tools) riscv-tools | esp-tools)
TOOLCHAIN=$1 ;; TOOLCHAIN=$1 ;;
--force | -f | --skip-validate)
FORCE=true;
;;
* ) * )
error "invalid option $1" error "invalid option $1"
usage 1 ;; usage 1 ;;
@@ -60,15 +54,8 @@ do
shift shift
done 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 if [ -z "$RISCV" ] ; then
RISCV="$CONDA_PREFIX/$TOOLCHAIN" error "ERROR: Prefix not given. If conda is sourced, do you mean $CONDA_PREFIX/$TOOLCHAIN?"
fi fi
XLEN=64 XLEN=64
@@ -108,7 +95,7 @@ echo '==> Installing espresso logic minimizer'
git submodule update --init --checkout generators/constellation git submodule update --init --checkout generators/constellation
cd generators/constellation cd generators/constellation
scripts/install-espresso.sh $RISCV scripts/install-espresso.sh $RISCV
) )
# Common tools (not in any particular toolchain dir) # Common tools (not in any particular toolchain dir)