Merge branch 'main' of https://github.com/openhwgroup/cvw

bin/wally-package-install.sh

@@ -55,10 +55,9 @@ if [ "$FAMILY" == rhel ]; then
     SPIKE_PACKAGES+=(dtc boost-regex boost-system)
     VERILATOR_PACKAGES+=(help2man perl clang ccache gperftools numactl mold)
     BUILDROOT_PACKAGES+=(ncurses-base ncurses ncurses-libs ncurses-devel gcc-gfortran cpio) # gcc-gfortran is only needed for compiling spec benchmarks on buildroot linux
-    # Extra packages not availale in rhel8, nice for Verilator and needed for sail respectively
+    # Extra packages not availale in rhel8, nice for Verilator
     if (( RHEL_VERSION >= 9 )); then
         VERILATOR_PACKAGES+=(perl-doc)
-        SAIL_PACKAGES=(z3)
     fi
     # A newer version of gcc is required for qemu
     OTHER_PACKAGES=(gcc-toolset-13)
@@ -80,7 +79,6 @@ elif [ "$FAMILY" == ubuntu ]; then
     QEMU_PACKAGES+=(libfdt-dev libpixman-1-dev)
     SPIKE_PACKAGES+=(device-tree-compiler libboost-regex-dev libboost-system-dev)
     VERILATOR_PACKAGES+=(help2man perl g++ clang ccache libunwind-dev libgoogle-perftools-dev numactl perl-doc libfl2 libfl-dev zlib1g)
-    SAIL_PACKAGES+=(opam z3)
     BUILDROOT_PACKAGES+=(ncurses-base ncurses-bin libncurses-dev gfortran cpio) # gfortran is only needed for compiling spec benchmarks on buildroot linux
     VIVADO_PACKAGES+=(libncurses*) # Vivado hangs on the third stage of installation without this
 fi
@@ -90,11 +88,11 @@ fi
 if [ "${1}" == "--check" ]; then
     section_header "Checking Dependencies from Package Manager"
     if [ "$FAMILY" == rhel ]; then
-        for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${SAIL_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
+        for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
             rpm -q "$pack" > /dev/null || (echo -e "${FAIL_COLOR}Missing packages detected (${WARNING_COLOR}$pack${FAIL_COLOR}). Run as root to auto-install or run wally-package-install.sh first.${ENDC}" && exit 1)
         done
     elif [ "$FAMILY" == ubuntu ]; then
-        for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${SAIL_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
+        for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
             dpkg -l "$pack" | grep "ii" > /dev/null || (echo -e "${FAIL_COLOR}Missing packages detected (${WARNING_COLOR}$pack${FAIL_COLOR}). Run as root to auto-install or run wally-package-install.sh first." && exit 1)
         done
     fi
@@ -124,6 +122,6 @@ else
     # Update and Upgrade tools
     eval "$UPDATE_COMMAND"
     # Install packages listed above using appropriate package manager
-    sudo $PACKAGE_MANAGER install -y "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${SAIL_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}" "${VIVADO_PACKAGES[@]}"
+    sudo $PACKAGE_MANAGER install -y "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}" "${VIVADO_PACKAGES[@]}"
     echo -e "${SUCCESS_COLOR}Packages successfully installed.${ENDC}"
 fi

bin/wally-tool-chain-install.sh

@@ -7,6 +7,7 @@
 ## Modified: 22 January 2023
 ## Modified: 23 March 2023
 ## Modified: 30 June 2024, Jordan Carlin jcarlin@hmc.edu
+## Modified: 1 September 2024
 ##
 ## Purpose: Open source tool chain installation script
 ##
@@ -148,11 +149,6 @@ source "$RISCV"/riscv-python/bin/activate # activate python virtual environment
 STATUS="python packages"
 pip install --upgrade pip && pip install -r "$dir"/requirements.txt
 
-# z3 is needed for sail and not availabe from dnf for rhel 8
-if (( RHEL_VERSION == 8 )); then
-    pip install -U z3-solver
-fi
-
 source "$RISCV"/riscv-python/bin/activate # reload python virtual environment
 echo -e "${SUCCESS_COLOR}Python environment successfully configured!${ENDC}"
 
@@ -166,9 +162,7 @@ if (( RHEL_VERSION == 8 )) || (( UBUNTU_VERSION == 20 )); then
         section_header "Installing glib"
         pip install -U meson # Meson is needed to build glib
         cd "$RISCV"
-        wget https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz
+        curl --location https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz | tar xJ
-        tar -xJf glib-2.70.5.tar.xz
-        rm glib-2.70.5.tar.xz
         cd glib-2.70.5
         meson setup _build --prefix="$RISCV"
         meson compile -C _build
@@ -185,9 +179,7 @@ if (( RHEL_VERSION == 8 )); then
     if [ ! -e "$RISCV"/include/gmp.h ]; then
         section_header "Installing gmp"
         cd "$RISCV"
-        wget https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz
+        curl --location https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz | tar xJ
-        tar -xJf gmp-6.3.0.tar.xz
-        rm gmp-6.3.0.tar.xz
         cd gmp-6.3.0
         ./configure --prefix="$RISCV"
         make -j "${NUM_THREADS}"
@@ -322,40 +314,20 @@ else
 fi
 
 
-# Install opam from binary disribution on rhel as it is not available from dnf
-# Opam is needed to install the sail compiler
-if [ "$FAMILY" == rhel ]; then
-    section_header "Installing/Updating Opam"
-    STATUS="Opam"
-    export OPAMROOTISOK=1 # Silence warnings about running opam as root
-    cd "$RISCV"
-    mkdir -p opam
-    cd opam
-    wget https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh
-    printf '%s\n' "$RISCV"/bin Y | sh install.sh # the print command provides $RISCV/bin as the installation path when prompted
-    cd "$RISCV"
-    rm -rf opam
-    echo -e "${SUCCESS_COLOR}Opam successfully installed/updated!${ENDC}"
-fi
-
 # Sail Compiler (https://github.com/rems-project/sail)
 # Sail is a formal specification language designed for describing the semantics of an ISA.
 # It is used to generate the RISC-V Sail Model, which is the golden reference model for RISC-V.
 # The Sail Compiler is written in OCaml, which is an object-oriented extension of ML, which in turn
-# is a functional programming language suited to formal verification. The Sail compiler is installed
+# is a functional programming language suited to formal verification.
-# with the opam OCaml package manager. It has so many dependencies that it can be difficult to install,
-# but a binary release of it should be available soon, removing the need to use opam.
 section_header "Installing/Updating Sail Compiler"
 STATUS="Sail Compiler"
-export OPAMROOTISOK=1 # Silence warnings about running opam as root
+if [ ! -e "$RISCV"/bin/sail ]; then
-export OPAMROOT="$RISCV"/opam
     cd "$RISCV"
-opam init -y --disable-sandboxing --no-setup --compiler=5.1.0
+    curl --location https://github.com/rems-project/sail/releases/latest/download/sail.tar.gz | tar xvz --directory="$RISCV" --strip-components=1
-eval "$(opam config env)"
-opam update -y
-opam upgrade -y
-opam install sail -y
     echo -e "${SUCCESS_COLOR}Sail Compiler successfully installed/updated!${ENDC}"
+else
+    echo -e "${SUCCESS_COLOR}Sail Compiler already installed.${ENDC}"
+fi
 
 # RISC-V Sail Model (https://github.com/riscv/sail-riscv)
 # The RISC-V Sail Model is the golden reference model for RISC-V. It is written in Sail (described above)
@@ -364,7 +336,6 @@ STATUS="RISC-V Sail Model"
 if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_RV32"; then
     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  2>&1 | logger sailModel; [ "${PIPESTATUS[0]}" == 0 ]
     ARCH=RV32 make -j "${NUM_THREADS}" c_emulator/riscv_sim_RV32 2>&1 | logger sailModel; [ "${PIPESTATUS[0]}" == 0 ]
     cp -f c_emulator/riscv_sim_RV64 "$RISCV"/bin/riscv_sim_RV64
@@ -372,7 +343,6 @@ if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf sail-riscv
-        rm -rf opam
     fi
     echo -e "${SUCCESS_COLOR}RISC-V Sail Model successfully installed/updated!${ENDC}"
 else

bugs.txt

@@ -1,2 +0,0 @@
-1. [ ] AMO should always generate store faults never load faults.  We are generating both.
-

fpga/debug_notes.org

@@ -1,16 +0,0 @@
-* December 12, 2021
-Indefinite lockup in the dcache with STATE_PTW_FAULT_CPU_BUSY
-InstrM = f884_3803
-PCM = ffff_ffff_8030_8004
-
-Indefinite lockup in the dcache with STATE_PTW_FAULT_CPU_BUSY
-InstrM = 0207_ba03
-PCM = ffff_ffff_8034_89fe
-
-Indefinite lockup in the dcache with STATE_PTW_FAULT_CPU_BUSY
-InstrM = 0016_c383
-PCM = ffff_ffff_8030_7504
-
-Indefinite lockup in the dcache with STATE_PTW_FAULT_CPU_BUSY
-InstrM = 0006_a703
-PCM = ffff_ffff_8028_fa02

setup.imperas.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-IMP_HASH=56b1479
-
-REPO=davidharrishmc
-REPO=eroom1966
-git clone https://github.com/${REPO}/riscv-wally -b imperas
-
-cd riscv-wally
-WALLY=$(dirname ${BASH_SOURCE[0]:-$0})
-export WALLY=$(cd "$WALLY" && pwd)
-
-# clone the Imperas repo
-if [ ! -d external ]; then
-    mkdir -p external
-fi
-pushd external
-    if [ ! -f ImperasDV-HMC ]; then
-        git clone git@github.com:Imperas/ImperasDV-HMC.git
-    fi
-    pushd ImperasDV-HMC
-        git checkout $IMP_HASH
-    popd
-popd
-
-# Setup Imperas
-source ${WALLY}/external/ImperasDV-HMC/Imperas/bin/setup.sh
-setupImperas ${WALLY}/external/ImperasDV-HMC/Imperas
-export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
-
-# setup QUESTA (Imperas only command, YMMV)
-svsetup -questa
-
-pushd sim
-    # With IDV
-    IMPERAS_TOOLS=$(pwd)/imperas.ic \
-        OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
-        TESTDIR=${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S  \
-        vsim -c -do "do wally-imperas.do rv64gc"
-popd
-
-# notes
-# run the pushd external  code
-
-#source external/ImperasDV-HMC/Imperas/bin/setup.sh 
-#  setupImperas /home/ross/repos/active-wally/riscv-wally/external/ImperasDV-HMC/Imperas
-#  env | grep IMPERAS
-#  export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
-
-IMPERAS_TOOLS=$(pwd)/imperas.ic \
-OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
-TESTDIR=../../tests/riscof_lee/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S  \
-vsim -c -do "do wally-imperas.do rv64gc"
-
-
-# getting library issue.
-# try switching to modelsim 2022.01

sim/coverage

@@ -1,2 +0,0 @@
-# recompile coverage tests and run coverage including them
-pushd $WALLY/tests/coverage; make; popd; ./regression-wally -coverage

sim/make-tests.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-rm -r work*
-make allclean
-make
-# cd ../../tests/imperas-riscv-tests/
-# make allclean
-# make
-# cd ../wally-riscv-arch-test
-# make allclean
-# make
-# make XLEN=32
-# exe2memfile.pl work/*/*/*.elf
-# cd ../linux-testgen/linux-testvectors
-# ./tvLinker.sh
-# cd ../../../regression

sim/questa/coverage

@@ -1,2 +0,0 @@
-# recompile coverage tests and run coverage including them
-pushd $WALLY/tests/coverage; make; popd; ./regression-wally -coverage

sim/questa/sim-testfloat

@@ -1,14 +0,0 @@
-
-# cvtint - test integer conversion unit (fcvtint)
-# cvtfp  - test floating-point conversion unit (fcvtfp)
-# cmp    - test comparison unit's LT, LE, EQ opperations (fcmp)
-# add    - test addition
-# fma    - test fma
-# sub    - test subtraction
-# div    - test division
-# sqrt   - test square root
-# all    - test everything
-
-
-wsim fdqh_ieee_rv64gc $1 --tb testbench_fp --gui
-

sim/questa/sim-testfloat-batch

@@ -1,17 +0,0 @@
-# Run TestFloat simulation
-
-# cvtint - test integer conversion unit (fcvtint)
-# cvtfp  - test floating-point conversion unit (fcvtfp)
-# cmp    - test comparison unit's LT, LE, EQ opperations (fcmp)
-# add    - test addition
-# fma    - test fma
-# mul    - test mult with fma
-# sub    - test subtraction
-# div    - test division
-# sqrt   - test square root
-# all    - test everything
-
-#vsim -c -do "do testfloat.do fdqh_ieee_rv64gc $1"
-wsim fdqh_ieee_rv64gc $1 --tb testbench_fp
-#wsim fdqh_ieee_rv64gc $1 --tb testbench_fp --gui
-

sim/questa/sim-testfloat-verilator

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# sim-testfloat-verilator
-# David_Harris@hmc.edu 3 April 2024 
-# Run Testfloat simulations with Verilator
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-
-# cvtint - test integer conversion unit (fcvtint)
-# cvtfp  - test floating-point conversion unit (fcvtfp)
-# cmp    - test comparison unit's LT, LE, EQ opperations (fcmp)
-# add    - test addition
-# fma    - test fma
-# mul    - test mult with fma
-# sub    - test subtraction
-# div    - test division
-# sqrt   - test square root
-# all    - test everything
-
-wsim fdqh_ieee_rv64gc add --tb testbench_fp --sim verilator
-
-# Change TEST_SIZE to only test certain FP width
-# values are QP, DP, SP, HP or all for all tests
-#vsim -voptargs=+acc work.testbenchfp -GTEST=$2 -GTEST_SIZE="all" 

sim/questa/sim-wally

@@ -1,2 +0,0 @@
-wsim rv64gc arch64i --gui
-

sim/questa/sim-wally-batch

@@ -1 +0,0 @@
-wsim rv64gc arch64i 

sim/run-imperasdv-tests.bash

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-if [ -d results ]; then
-    rm -rf results
-fi
-mkdir -p results
-
-ALL=$(find ${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m -name "ref" -type d)
-
-export IMPERAS_TOOLS=$(pwd)/imperas.ic
-export OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1"
-
-for t in $ALL; do
-    export TESTDIR=$(dirname ${t})
-    OUTLOG=$(echo ${TESTDIR} | sed "s|${WALLY}/external/ImperasDV-HMC/tests/riscof/work|results|").log
-    OUTDIR=$(dirname ${OUTLOG})
-    echo "Running test ${TESTDIR} -> ${OUTDIR} :: ${OUTLOG}"
-
-    mkdir -p ${OUTDIR}
-    vsim -c -do "do wally-imperas.do rv64gc"
-    mv transcript ${OUTLOG}
-done

sim/test

@@ -1 +0,0 @@
-test

sim/verilator/sim-wally-batch

@@ -1 +0,0 @@
-wsim -s verilator rv64gc arch64i