test

Author: MichaelJSr

tests/riscv/riscv-vector-tests/gen-test.sh.in

@@ -2,6 +2,7 @@
 
 XLEN=${XLEN:-"@XLEN@"}
 TOOLDIR=${TOOLDIR:-"@TOOLDIR@"}
+RISCV_TOOLCHAIN_PATH64=${RISCV_TOOLCHAIN_PATH:-"$TOOLDIR/riscv64-gnu-toolchain"}
 RISCV_TOOLCHAIN_PATH=${RISCV_TOOLCHAIN_PATH:-"$TOOLDIR/riscv$XLEN-gnu-toolchain"}
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PREV_DIR=$(pwd)
@@ -10,7 +11,10 @@ sudo apt-get install device-tree-compiler
 wget -O- -q https://go.dev/dl/go1.24.0.linux-amd64.tar.gz | tar -xzf -
 
 export RISCV=$RISCV_TOOLCHAIN_PATH
-export PATH=$PATH:$PREV_DIR/go/bin:$RISCV/bin
+export PATH=$PATH:$PREV_DIR/go/bin
+if [ "$XLEN" -ne 64 ]; then
+    export PATH=$PATH:RISCV_TOOLCHAIN_PATH64/bin
+fi
 
 git clone --recursive https://github.com/chipsalliance/riscv-vector-tests.git
 cd riscv-vector-tests

tests/riscv/riscv-vector-tests/run-test.sh.in

@@ -83,22 +83,22 @@ for testcase in ${testcases[@]}; do
   rm -f "$testcase*.bin" "$testcase*.dump" "$testcase*.log" > /dev/null 2>&1
 done
 
-export passed=0
-export failed=0
+passed=0
+failed=0
 
 for testcase in ${testcases[@]}; do
   echo "Testcase: $testcase"
   find . -type f -name "${testcase}*" 2>/dev/null | while read -r f; do
     "$RISCV_TOOLCHAIN_PATH/bin/riscv$XLEN-unknown-elf-objdump" -D "$f" > "$f.dump"
     "$RISCV_TOOLCHAIN_PATH/bin/riscv$XLEN-unknown-elf-objcopy" -O binary "$f" "$f.bin"
     echo "running $SCRIPT_DIR/../../../sim/simx/simx -v $f.bin"
-    "$SCRIPT_DIR/../../../sim/simx/simx" -v "$f.bin" > "$f.log"
+    "$SCRIPT_DIR/../../../sim/simx/simx" -v "$f.bin" &> "$f.log"
     if [ $? -eq 1 ]; then
       echo "$f PASSED"
-      export passed=$((passed+1))
+      ((passed++))
     else
       echo "$f FAILED"
-      export failed=$((failed+1))
+      ((failed++))
     fi
     # REG_TESTS=1 informs the script to delete the previous binary after each vector test to save disk space
     # Otherwise, the vector regression tests would run out of disk space eventually