From d2e606b41bd35d037cfa840ab271db0d6ce3f33e Mon Sep 17 00:00:00 2001 From: Thomas Kidd Date: Thu, 1 Feb 2024 09:23:15 -0600 Subject: [PATCH] Revert "updated install tool chain file to use verilator v5.016" This reverts commit 3168859268dfa125d79f35cabb9c1b86feaa363f. --- bin/wally-tool-chain-install.sh | 13 ++++++------- tests/riscof/Makefile | 5 ++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 473bc074b..ca8a28c05 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -40,7 +40,7 @@ set -e # break on error NUM_THREADS=8 # for >= 32GiB #NUM_THREADS=16 # for >= 64GiB -#sudo mkdir -p $RISCV +sudo mkdir -p $RISCV # *** need to update permissions to local user # Update and Upgrade tools (see https://itsfoss.com/apt-update-vs-upgrade/) @@ -48,13 +48,13 @@ sudo apt update -y sudo apt upgrade -y sudo apt install -y git gawk make texinfo bison flex build-essential python3 libz-dev libexpat-dev autoconf device-tree-compiler ninja-build libpixman-1-dev ncurses-base ncurses-bin libncurses5-dev dialog curl wget ftp libgmp-dev libglib2.0-dev python3-pip pkg-config opam z3 zlib1g-dev automake autotools-dev libmpc-dev libmpfr-dev gperf libtool patchutils bc # Other python libraries used through the book. -# sudo pip3 install sphinx sphinx_rtd_theme matplotlib scipy scikit-learn adjustText lief +sudo pip3 install sphinx sphinx_rtd_theme matplotlib scipy scikit-learn adjustText lief # needed for Ubuntu 22.04, gcc cross compiler expects python not python2 or python3. if ! command -v python &> /dev/null then echo "WARNING: python3 was installed as python3 rather than python. Creating symlink." - sudo ln -sf /bin/python3 /usr/bin/python + sudo ln -sf /usr/bin/python3 /usr/bin/python fi # gcc cross-compiler (https://github.com/riscv-collab/riscv-gnu-toolchain) @@ -72,8 +72,8 @@ cd riscv-gnu-toolchain # Temporarily use the following commands until gcc-13 is part of riscv-gnu-toolchain (issue #1249) #git clone https://github.com/gcc-mirror/gcc -b releases/gcc-13 gcc-13 #./configure --prefix=/opt/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--;" --with-gcc-src=`pwd`/gcc-13 -#./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} +./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} # elf2hex (https://github.com/sifive/elf2hex) #The elf2hex utility to converts executable files into hexadecimal files for Verilog simulation. @@ -125,8 +125,7 @@ git clone https://github.com/verilator/verilator # Only first time unset VERILATOR_ROOT # For bash cd verilator git pull # Make sure git repository is up-to-date -git checkout v5.016 # Use development branch (e.g. recent bug fixes) -#git checkout master # Use development branch (e.g. recent bug fixes) +git checkout master # Use development branch (e.g. recent bug fixes) autoconf # Create ./configure script ./configure # Configure and create Makefile make -j ${NUM_THREADS} # Build Verilator itself (if error, try just 'make') diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile index 1a55f953f..a9855d41f 100644 --- a/tests/riscof/Makefile +++ b/tests/riscof/Makefile @@ -8,9 +8,8 @@ wally_workdir = $(work)/wally-riscv-arch-test current_dir = $(shell pwd) #XLEN ?= 64 -#all: root arch32 wally32 arch32e arch64 wally64 -#wally-riscv-arch-test: root wally32 wally64 -all: root wally32 wally64 +all: root arch32 wally32 arch32e arch64 wally64 +wally-riscv-arch-test: root wally32 wally64 root: mkdir -p $(work_dir)