fixed makefile for 32 bit arch tests, restored original make for all others

This commit is contained in:
Kip Macsai-Goren 2023-02-17 09:57:56 -08:00
parent 70027a55b4
commit 02bc03af42
2 changed files with 6 additions and 6 deletions

View File

@ -8,8 +8,8 @@ wally_workdir = $(work)/wally-riscv-arch-test
current_dir = $(shell pwd)
#XLEN ?= 64
all: root arch64
#all: root arch32 wally32 wally32e arch64 wally64
#all: root wally32 wally64
all: root arch32 wally32 wally32e arch64 wally64
root:
mkdir -p $(work_dir)
@ -25,7 +25,7 @@ arch32:
rsync -a $(work_dir)/rv32i_m/ $(arch_workdir)/rv32i_m/ || echo "error suppressed"
arch64:
riscof run --work-dir=$(work_dir) --config=config64.ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser --no-dut-run
riscof run --work-dir=$(work_dir) --config=config64.ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser
rsync -a $(work_dir)/rv64i_m/ $(arch_workdir)/rv64i_m/ || echo "error suppressed"
# Also copy F and D tests to RV64
rsync -a $(work_dir)/rv32i_m/ $(arch_workdir)/rv64i_m/ || echo "error suppressed"

View File

@ -1,12 +1,12 @@
hart_ids: [0]
hart0:
ISA: RV32IMAFDCZicsr_Zifencei
# ISA: RV32IMAFDCZicsr_Zifencei_Zba_Zbb_Zbc_Zbs
#ISA: RV32IMAFDCZicsr_Zifencei
ISA: RV32IMACZicsr_Zifencei_Zba_Zbb_Zbc_Zbs
physical_addr_sz: 32
User_Spec_Version: '2.3'
supported_xlen: [32]
misa:
reset-val: 0x4000112D
reset-val: 0x40001105
rv32:
accessible: true
mxl: