Add support for cvw-riscv-arch-test

This commit is contained in:
Jordan Carlin 2025-05-08 03:12:01 -07:00
parent 3d368d50d7
commit 1002f3badb
No known key found for this signature in database

View file

@ -5,10 +5,12 @@ nproc := $(shell nproc --ignore=1)
# Directories
arch_dir := $(WALLY)/addins/riscv-arch-test
cvw_arch_dir := $(WALLY)/addins/cvw-riscv-arch-test
wally_dir := $(WALLY)/tests/wally-riscv-arch-test
work_dir := ./riscof_work
work := ./work
arch_workdir := $(work)/riscv-arch-test
cvw_arch_workdir := $(work)/cvw-riscv-arch-test
wally_workdir := $(work)/wally-riscv-arch-test
current_dir := $(shell pwd)
@ -16,6 +18,7 @@ current_dir := $(shell pwd)
.PHONY: all riscv-arch-test wally-riscv-arch-test clean
all: riscv-arch-test wally-riscv-arch-test
riscv-arch-test: arch32e arch32 arch64
cvw-riscv-arch-test: cvw-arch32e cvw-arch32 cvw-arch64
wally-riscv-arch-test: wally32 wally64
# Generate config.ini files
@ -26,7 +29,14 @@ config%.ini: config.ini
arch%: config$$*.ini | $(work_dir) $(arch_workdir)
riscof run --work-dir=$(work_dir)/$@ --config=$< --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser
$(MAKE) -f makefile-memfile WORKDIR=$(work_dir)/$@ BITWIDTH=$(patsubst %32e,%32,$*)
rsync -a $(work_dir)/$@/rv*/* $(arch_workdir)/rv$(patsubst %64,%64i,$(patsubst %32,%32i,$*))_m || echo "error suppressed"
rsync -a $(work_dir)/$@/rv*/* $(arch_workdir)/rv$(patsubst %64,%64i,$(patsubst %32,%32i,$*)) || echo "error suppressed"
# Generate cvw-riscv-arch-test targets
# Generate riscv-arch-test targets
cvw-arch%: config$$*.ini | $(work_dir) $(cvw_arch_workdir)
riscof run --work-dir=$(work_dir)/$@ --config=$< --suite=$(cvw_arch_dir)/riscv-test-suite/ --env=$(cvw_arch_dir)/riscv-test-suite/env --no-browser
$(MAKE) -f makefile-memfile WORKDIR=$(work_dir)/$@ BITWIDTH=$(patsubst %32e,%32,$*)
rsync -a $(work_dir)/$@/rv*/* $(cvw_arch_workdir)/rv$(patsubst %64,%64i,$(patsubst %32,%32i,$*))_m || echo "error suppressed"
# Generate wally-riscv-arch-test targets
wally%: config$$*.ini | $(work_dir) $(wally_workdir)
@ -39,7 +49,7 @@ clean:
rm -rf $(work_dir)
rm -rf $(wally_workdir)
rm -rf $(arch_workdir)
rm -rf $(submodule_wor_dir)
rm -rf $(cvw_arch_workdir)
$(work_dir) $(arch_workdir) $(wally_workdir):
$(work_dir) $(arch_workdir) $(wally_workdir) $(cvw_arch_workdir):
mkdir -p $@