Adjusted scripts to use

This commit is contained in:
David Harris 2022-03-04 05:09:02 +00:00
parent 1d3cd85d59
commit f2bda069da
3 changed files with 12 additions and 12 deletions

View File

@ -9,7 +9,7 @@ use warnings;
import os;
if ($#ARGV != 0) {
die("Usage: $0 workpath [e.g. $0 ~/riscv-wally/addins/riscv-arch-test/work")
die("Usage: $0 workpath [e.g. $0 $WALLY/addins/riscv-arch-test/work")
}
my $mypath = $ARGV[0];
my @dirs = glob($mypath.'/*/*');

View File

@ -21,7 +21,7 @@ hash := $(shell git rev-parse --short HEAD)
export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(TECH)nm_$(FREQ)_MHz_$(time)_$(hash)
export SAIFPOWER ?= 0
CONFIGDIR ?= ~/riscv-wally/pipelined/config
CONFIGDIR ?= ${WALLY}/pipelined/config
CONFIGFILES ?= $(shell find $(CONFIGDIR) -name rv*_*)
CONFIGFILESTRIM = $(notdir $(CONFIGFILES))
print:

View File

@ -11,21 +11,21 @@ printf "\n\n#####\nStarting tests for $1\n#####\n\n"
if [[ "$2" != "-simonly" ]]
then
cd ~/riscv-wally/pipelined/testgen/privileged
cd $WALLY/pipelined/testgen/privileged
python3 "testgen-$1.py"
printf "\n\n#####\nRan testgen-$1.py Making...\n#####\n\n\n"
if [[ "$2" == "-c" ]]
then
printf "\n\n###\nWARNING\nThis seems to not be outputting begin_signature at the moment... Probably won't work in modelsim...\n###\n\n\n"
cd ~/riscv-wally/imperas-riscv-tests/riscv-test-suite/rv64p/src
cd $WALLY/imperas-riscv-tests/riscv-test-suite/rv64p/src
riscv64-unknown-elf-gcc -nostdlib -nostartfiles -march=rv64g "WALLY-$1".S -I../../../riscv-test-env -I../../../riscv-test-env/p -I../../../riscv-target/riscvOVPsimPlus -T../../../riscv-test-env/p/link.ld -o "../../../work/rv64p/WALLY-$1.elf"
cd ~/riscv-wally/imperas-riscv-tests/work/rv64p
cd $WALLY/imperas-riscv-tests/work/rv64p
riscv64-unknown-elf-objdump -d "WALLY-$1".elf > "WALLY-$1".elf.objdump
elif [[ "$2" != "-nosim" ]]
then
cd ~/riscv-wally/imperas-riscv-tests
cd $WALLY/imperas-riscv-tests
make privileged
exe2memfile.pl work/*/*.elf
@ -36,9 +36,9 @@ fi
if [[ "$2" == "-simonly" ]]
then
printf "\n\n###\nWARNING\nThis seems to not be outputting begin_signature at the moment... Probably won't work in modelsim...\n###\n\n\n"
cd ~/riscv-wally/imperas-riscv-tests/riscv-test-suite/rv64p/src
cd $WALLY/imperas-riscv-tests/riscv-test-suite/rv64p/src
riscv64-unknown-elf-gcc -nostdlib -nostartfiles -march=rv64g "WALLY-$1".S -I../../../riscv-test-env -I../../../riscv-test-env/p -I../../../riscv-target/riscvOVPsimPlus -T../../../riscv-test-env/p/link.ld -o "../../../work/rv64p/WALLY-$1.elf"
cd ~/riscv-wally/imperas-riscv-tests/work/rv64p
cd $WALLY/imperas-riscv-tests/work/rv64p
riscv64-unknown-elf-objdump -d "WALLY-$1".elf > "WALLY-$1".elf.objdump
# riscv64-unknown-elf-gcc -nostdlib -nostartfiles -march=rv64g "WALLY-CAUSE".S -I../../../riscv-test-env -I../../../riscv-test-env/p -I../../../riscv-target/riscvOVPsimPlus -T../../../riscv-test-env/p/link.ld -o "../../../work/rv64p/WALLY-CAUSE.elf"
@ -48,14 +48,14 @@ fi
if [[ "$2" == "-sim" || "$2" == "-simonly" ]]
then
printf "\n\n\n#####\nSimulating!\n#####\n\n"
cd ~/riscv-wally/pipelined/regression
cd $WALLY/pipelined/regression
vsim -do wally-privileged.do -c
fi
cd ~/riscv-wally/pipelined
cd $WALLY/pipelined
printf "\n\n\n#####\nDone!\n#####\n\n"
cd ~/riscv-wally/imperas-riscv-tests/work
cd $WALLY/imperas-riscv-tests/work
for isa in "rv64p" "rv32p"; do
printf "$isa = '{"
COMMA=""
@ -71,4 +71,4 @@ for isa in "rv64p" "rv32p"; do
printf "\n};\n\n"
done
cd ~/riscv-wally/pipelined
cd $WALLY/pipelined