Skip to content

Commit

Permalink
Add logs and reduce console output
Browse files Browse the repository at this point in the history
  • Loading branch information
jordancarlin committed Jul 23, 2024
1 parent 8a715e4 commit f990dd4
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions bin/wally-tool-chain-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain
git reset --hard && git clean -f && git checkout master && git pull
git pull
./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
make -j ${NUM_THREADS} > /dev/null
make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/riscv-gnu-toolchain.log | grep -iE "(warning|error|fail|success|stamp)"
if [ "$clean" ]; then
cd "$RISCV"
rm -rf riscv-gnu-toolchain
Expand All @@ -237,7 +237,7 @@ if git_check "elf2hex" "https://github.com/sifive/elf2hex.git" "$RISCV/bin/riscv
git reset --hard && git clean -f && git checkout master && git pull
autoreconf -i
./configure --target=riscv64-unknown-elf --prefix="$RISCV"
make
make
make install
if [ "$clean" ]; then
cd "$RISCV"
Expand All @@ -259,8 +259,8 @@ if git_check "qemu" "https://github.com/qemu/qemu" "$RISCV/include/qemu-plugin.h
git reset --hard && git clean -f && git checkout master && git pull --recurse-submodules -j ${NUM_THREADS}
git submodule update --init --recursive
./configure --target-list=riscv64-softmmu --prefix="$RISCV"
make -j ${NUM_THREADS}
make install
make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/qemu.log | grep -iE "(warning|error|fail|success)"
make install 2>&1 | tee -a "$RISCV"/logs/qemu.log | grep -iE "(warning|error|fail|success)"
if [ "$clean" ]; then
cd "$RISCV"
rm -rf qemu
Expand All @@ -282,8 +282,8 @@ if git_check "riscv-isa-sim" "https://github.com/riscv-software-src/riscv-isa-si
mkdir -p build
cd build
../configure --prefix="$RISCV"
make -j ${NUM_THREADS}
make install
make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/spike.log | grep -iE "(warning|error|fail|success)"
make install 2>&1 | tee -a "$RISCV"/logs/spike.log | grep -iE "(warning|error|fail|success)"
if [ "$clean" ]; then
cd "$RISCV"
rm -rf riscv-isa-sim
Expand All @@ -307,8 +307,8 @@ if git_check "verilator" "https://github.com/verilator/verilator" "$RISCV/share/
git reset --hard && git clean -f && git checkout master && git pull
autoconf
./configure --prefix="$RISCV"
make -j ${NUM_THREADS}
make install
make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/verilator.log | grep -iE "(warning|error|fail|success)"
make install 2>&1 | tee -a "$RISCV"/logs/verilator.log | grep -iE "(warning|error|fail|success)"
if [ "$clean" ]; then
cd "$RISCV"
rm -rf verilator
Expand Down Expand Up @@ -362,8 +362,8 @@ if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/
cd sail-riscv
git reset --hard && git clean -f && git checkout master && git pull
export OPAMCLI=2.0 # Sail is not compatible with opam 2.1 as of 4/16/24
ARCH=RV64 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV64
ARCH=RV32 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV32
ARCH=RV64 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV64 2>&1 | tee "$RISCV"/logs/sail_model.log | grep -iE "(warning|error|fail|success)"
ARCH=RV32 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV32 2>&1 | tee -a "$RISCV"/logs/sail_model.log | grep -iE "(warning|error|fail|success)"
cp -f c_emulator/riscv_sim_RV64 "$RISCV"/bin/riscv_sim_RV64
cp -f c_emulator/riscv_sim_RV32 "$RISCV"/bin/riscv_sim_RV32
if [ "$clean" ]; then
Expand Down Expand Up @@ -416,4 +416,8 @@ else
echo -e "You may need to manually update it if there were changes upstream.${ENDC}"
fi

if [ "$clean" ]; then
rm -rf "$RISCV"/logs
fi

echo -e "${SUCCESS_COLOR}${BOLD}\n\nINSTALLATION SUCCESSFUL\n\n${ENDC}"

0 comments on commit f990dd4

Please sign in to comment.