From b362320dd91e3ce0e92773b3a4cd67be1873aa69 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Fri, 16 Feb 2024 06:46:49 -0800
Subject: [PATCH] Removed unused Makefiles and Makefrags from
 wally-riscv-arch-test now that it is only used by riscof

---
 tests/wally-riscv-arch-test/Makefile          | 123 ------------------
 tests/wally-riscv-arch-test/Makefile.include  |  27 ----
 .../riscv-test-suite/Makefile.include         |  77 -----------
 .../riscv-test-suite/rv32i_m/C/Makefile       |   3 -
 .../riscv-test-suite/rv32i_m/C/Makefrag       |  34 -----
 .../riscv-test-suite/rv32i_m/F/Makefile       |   3 -
 .../riscv-test-suite/rv32i_m/F/Makefrag       |  14 --
 .../riscv-test-suite/rv32i_m/I/Makefile       |   3 -
 .../riscv-test-suite/rv32i_m/I/Makefrag       |  76 -----------
 .../riscv-test-suite/rv32i_m/M/Makefile       |   3 -
 .../riscv-test-suite/rv32i_m/M/Makefrag       |  35 -----
 .../rv32i_m/privilege/Makefile                |   5 -
 .../rv32i_m/privilege/Makefrag                |  65 ---------
 .../riscv-test-suite/rv64i_m/C/Makefile       |   3 -
 .../riscv-test-suite/rv64i_m/C/Makefrag       |  35 -----
 .../riscv-test-suite/rv64i_m/D/Makefile       |   3 -
 .../riscv-test-suite/rv64i_m/D/Makefrag       |  35 -----
 .../riscv-test-suite/rv64i_m/I/Makefile       |   3 -
 .../riscv-test-suite/rv64i_m/I/Makefrag       |  40 ------
 .../riscv-test-suite/rv64i_m/M/Makefile       |   3 -
 .../riscv-test-suite/rv64i_m/M/Makefrag       |  35 -----
 .../rv64i_m/privilege/Makefile                |   5 -
 .../rv64i_m/privilege/Makefrag                |  73 -----------
 23 files changed, 703 deletions(-)
 delete mode 100644 tests/wally-riscv-arch-test/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/Makefile.include
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/Makefile.include
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefrag
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
 delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag

diff --git a/tests/wally-riscv-arch-test/Makefile b/tests/wally-riscv-arch-test/Makefile
deleted file mode 100644
index 168f03c3c..000000000
--- a/tests/wally-riscv-arch-test/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Ensure the compiler and necessary executables are on the search PATH
-#
-
-#
-# Ensure you have set the following Variables
-#
-#
-export ROOTDIR    = $(shell pwd)
-export WORK      ?= $(ROOTDIR)/work
-
-include Makefile.include
-
-pipe:= |
-empty:=
-comma:= ,
-space:= $(empty) $(empty)
-
-RISCV_ISA_ALL = $(shell ls $(TARGETDIR)/$(RISCV_TARGET)/device/rv$(XLEN)i_m)
-RISCV_ISA_OPT = $(subst $(space),$(pipe),$(RISCV_ISA_ALL))
-
-RISCV_ISA_ALL := $(filter-out Makefile.include,$(RISCV_ISA_ALL))
-
-ifeq ($(RISCV_DEVICE),)
-    RISCV_DEVICE = I
-    DEFAULT_TARGET=all_variant
-else
-    DEFAULT_TARGET=variant
-endif
-export SUITEDIR   = $(ROOTDIR)/riscv-test-suite/rv$(XLEN)i_m/$(RISCV_DEVICE)
-
-$(info )
-$(info ============================ VARIABLE INFO ==================================)
-$(info ROOTDIR: ${ROOTDIR} [origin: $(origin ROOTDIR)])
-$(info WORK: ${WORK} [origin: $(origin WORK)])
-$(info TARGETDIR: ${TARGETDIR} [origin: $(origin TARGETDIR)])
-$(info RISCV_TARGET: ${RISCV_TARGET} [origin: $(origin RISCV_TARGET)])
-$(info XLEN: ${XLEN} [origin: $(origin XLEN)])
-$(info RISCV_DEVICE: ${RISCV_DEVICE} [origin: $(origin RISCV_DEVICE)])
-$(info =============================================================================)
-$(info )
-
-RVTEST_DEFINES = 
-ifeq ($(RISCV_ASSERT),1)
-	RVTEST_DEFINES += -DRVMODEL_ASSERT
-endif
-export RVTEST_DEFINES
-
-VERBOSE ?= 0
-ifeq ($(VERBOSE),1)
-    export V=
-    export REDIR1 =
-    export REDIR2 =
-else
-    export V=@
-    export REDIR1 = 1>/dev/null
-    export REDIR2 = 2>/dev/null
-endif
-
-default: $(DEFAULT_TARGET)
-
-variant: compile simulate verify
-
-all_variant:
-	@for isa in $(RISCV_ISA_ALL); do \
-		$(MAKE) $(JOBS) RISCV_TARGET=$(RISCV_TARGET) RISCV_TARGET_FLAGS="$(RISCV_TARGET_FLAGS)" RISCV_DEVICE=$$isa variant; \
-			rc=$$?; \
-			if [ $$rc -ne 0 ]; then \
-				exit $$rc; \
-			fi \
-	done
-
-build: compile
-run: simulate
-clean_all: clean
-
-compile:
-	$(MAKE) $(JOBS) \
-		RISCV_TARGET=$(RISCV_TARGET) \
-		RISCV_DEVICE=$(RISCV_DEVICE) \
-		compile -C $(SUITEDIR)
-
-simulate:
-	$(MAKE) $(JOBS) \
-		RISCV_TARGET=$(RISCV_TARGET) \
-		RISCV_DEVICE=$(RISCV_DEVICE) \
-		run -C $(SUITEDIR)
-
-verify: simulate
-	riscv-test-env/verify.sh
-
-postverify:
-ifeq ($(wildcard $(TARGETDIR)/$(RISCV_TARGET)/postverify.sh),)
-	$(info No post verify script found $(TARGETDIR)/$(RISCV_TARGET)/postverify.sh)
-else
-	$(TARGETDIR)/$(RISCV_TARGET)/postverify.sh
-endif
-
-clean:
-	$(MAKE) $(JOBS) \
-		RISCV_TARGET=$(RISCV_TARGET) \
-		RISCV_DEVICE=$(RISCV_DEVICE) \
-		clean -C $(SUITEDIR)
-
-help:
-	@echo "RISC-V Architectural Tests"
-	@echo ""
-	@echo "  Makefile Environment Variables to be set per Target"
-	@echo "     -- TARGETDIR='<directory containing the target folder>'"
-	@echo "     -- XLEN='<make supported xlen>'"
-	@echo "     -- RISCV_TARGET='<name of target>'"
-	@echo "     -- RISCV_TARGET_FLAGS='<any flags to be passed to target>'"
-	@echo "     -- RISCV_DEVICE='$(RISCV_ISA_OPT)' [ leave empty to run all devices ]"
-	@echo "     -- RISCV_TEST='<name of the test. eg. I-ADD-01'"
-	@echo "    "
-	@echo "  Makefile targets available"
-	@echo "     -- build: To compile all the tests within the RISCV_DEVICE suite and generate the elfs. Note this will default to running on the I extension alone if RISCV_DEVICE is empty"
-	@echo "     -- run: To run compiled tests on the target model and generate signatures. Note this will default to running on the I extension alone if RISCV_DEVICE is empty"
-	@echo "     -- verify: To verify if the generated signatures match the corresponding reference signatures. Note this will default to running on the I extension alone if RISCV_DEVICE is empty"
-	@echo "     -- postverify: To run post verification processing for a target, for example with this, riscvOVPsim runs instructional functional coverage on the tests"
-	@echo "     -- clean : removes the working directory from the root folder and also from the respective device folders of the target"
-	@echo "     -- default: build, run, and verify on all devices enabled"
-
diff --git a/tests/wally-riscv-arch-test/Makefile.include b/tests/wally-riscv-arch-test/Makefile.include
deleted file mode 100644
index 001fd1623..000000000
--- a/tests/wally-riscv-arch-test/Makefile.include
+++ /dev/null
@@ -1,27 +0,0 @@
-# set TARGETDIR to point to the directory which contains a sub-folder in the same name as the target
-export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target
-
-export RISCV_PREFIX = riscv64-unknown-elf-
-
-# set XLEN to max supported XLEN. Allowed values are 32 and 64
-export XLEN 							?= 64
-
-# name of the target. Note a folder of the same name must exist in the TARGETDIR directory
-export RISCV_TARGET       ?= spike
-
-# set the RISCV_DEVICE environment to a single extension you want to compile, simulate and/or verify. 
-# Leave this blank if you want to iterate through all the supported extensions available in the target
-export RISCV_DEVICE       ?= 
-
-# set this to a string which needs to be passed to your target Makefile.include files
-export RISCV_TARGET_FLAGS ?= 
-
-# set this if you want to enable assertions on the test-suites. Currently no tests support
-# assertions.
-export RISCV_ASSERT       ?= 0
-
-# set the number of parallel jobs (along with any other arguments) you would like to execute. Note that the target needs to ensure
-# that no common files across jobs are created/overwritten leading to unknown behavior
-JOBS= -j1
-
-
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/Makefile.include b/tests/wally-riscv-arch-test/riscv-test-suite/Makefile.include
deleted file mode 100644
index fe5f14aaa..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/Makefile.include
+++ /dev/null
@@ -1,77 +0,0 @@
-#=======================================================================
-# Makefile for riscv-tests/isa
-#-----------------------------------------------------------------------
-
-act_dir := .
-src_dir := $(act_dir)/src
-ref_dir := $(act_dir)/references
-work_dir := $(WORK)
-work_dir_isa := $(work_dir)/rv$(XLEN)i_m/$(RISCV_DEVICE)
-
-include $(act_dir)/Makefrag
-ifneq ($(RISCV_TEST),)
-	target_tests = $(RISCV_TEST).elf
-	target_tests_nosim = $(empty)
-endif
-
-default: all
-
-#--------------------------------------------------------------------
-# Build rules
-#--------------------------------------------------------------------
-
-vpath %.S $(act_dir)
-
-INCLUDE=$(TARGETDIR)/$(RISCV_TARGET)/device/rv$(XLEN)i_m/$(RISCV_DEVICE)/Makefile.include
-ifeq ($(wildcard $(INCLUDE)),)
-    $(error Cannot find '$(INCLUDE)`. Check that RISCV_TARGET and RISCV_DEVICE are set correctly.)
-endif
--include $(INCLUDE)
-
-#------------------------------------------------------------
-# Build and run assembly tests
-
-%.log: %.elf
-	$(V) echo "Execute $(@)"
-	$(V) $(RUN_TARGET)
-
-
-define compile_template
-
-$(work_dir_isa)/%.elf: $(src_dir)/%.S
-	$(V) echo "Compile $$(@)"
-	@mkdir -p $$(@D)
-	$(V) $(COMPILE_TARGET)
-
-.PRECIOUS: $(work_dir_isa)/%.elf
-
-endef
-
-target_elf = $(foreach e,$(target_tests),$(work_dir_isa)/$(e))
-target_elf_nosim = $(foreach e,$(addsuffix .elf, $(target_tests_nosim)),$(work_dir_isa)/$(e))
-combined_elf = $(target_elf_nosim) $(target_elf)
-target_log = $(patsubst %.elf,%.log,$(target_elf))
-
-ifdef target_tests_nosim 
-compile: copy 
-# now copy must be performed before compile, 
-# allowing us to copy over outputs if they won't simulate on spike correctly.
-endif
-
-copy:
-	@mkdir -p $(work_dir_isa)
-	$(info !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)
-	$(info <<<<<<<<<<<<<<<<<<<<<<<<<<<< COPYING REFERENCES WITHOUT SIMULATING >>>>>>>>>>>>>>>>>>>>>>>>>>>>)
-	$(info !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)
-	$(V) echo "Copying References without simulating for the following tests: $(target_tests_nosim)"
-	$(V) for test in $(target_tests_nosim); do grep -o '^[^#]*' $(ref_dir)/$$test.reference_output > $(work_dir_isa)/$$test.signature.output; done
-
-compile: $(combined_elf)
-run: $(target_log) 
-# note that run doesnt use the combined elf so it doesnt run the nosim tests.
-
-#------------------------------------------------------------
-# Clean up
-
-clean:
-	rm -rf $(work_dir)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefile
deleted file mode 100644
index d8449d851..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv32ic -mabi=ilp32 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefrag
deleted file mode 100644
index 79d1bd169..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/C/Makefrag
+++ /dev/null
@@ -1,34 +0,0 @@
-# RISC-V Architecture Test RV32I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV32I architectural tests
-
-rv32i_sc_tests = \
-
-rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests))
-
-target_tests += $(rv32i_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefile
deleted file mode 100644
index 4079d3013..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv32if -mabi=ilp32 -DXLEN=$(XLEN) -DFLEN=32))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefrag
deleted file mode 100644
index 253e9e0d3..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/F/Makefrag
+++ /dev/null
@@ -1,14 +0,0 @@
-# RISC-V Architecture Test RV32IF Makefrag
-#
-# Copyright (c) 2021. IIT Madras. All rights reserved.
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Description: Makefrag for RV32IF architectural tests
-
-rv32if_sc_tests = \
-
-
-
-rv32if_tests = $(addsuffix .elf, $(rv32if_sc_tests))
-
-target_tests += $(rv32if_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefile
deleted file mode 100644
index 74d788175..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv32i -mabi=ilp32 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
deleted file mode 100644
index 792ea2e24..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
+++ /dev/null
@@ -1,76 +0,0 @@
-# RISC-V Architecture Test RV32I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV32I architectural tests
-
-rv32i_sc_tests = \
- E-add-01 \
-   E-addi-01 \
-   E-and-01 \
-   E-andi-01 \
-   E-auipc-01 \
-   E-beq-01 \
-   E-bge-01 \
-   E-bgeu-01 \
-   E-blt-01 \
-   E-bltu-01 \
-   E-bne-01 \
-   E-jal-01 \
-   E-jalr-01 \
-   E-lb-align-01 \
-   E-lbu-align-01 \
-   E-lh-align-01 \
-   E-lhu-align-01 \
-   E-lui-01 \
-   E-lw-align-01 \
-   E-or-01 \
-   E-ori-01 \
-   E-sb-align-01 \
-   E-sh-align-01 \
-   E-sll-01 \
-   E-slli-01 \
-   E-slt-01 \
-   E-slti-01 \
-   E-sltiu-01 \
-   E-sltu-01 \
-   E-sra-01 \
-   E-srai-01 \
-   E-srl-01 \
-   E-srli-01 \
-   E-sub-01 \
-   E-sw-align-01 \
-   E-xor-01 \
-   E-xori-01 \
-	WALLY-ADD \
-	WALLY-SLT \
-	WALLY-SLTU \
-	WALLY-SUB \
-	WALLY-XOR
-
-rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests))
-
-target_tests += $(rv32i_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefile
deleted file mode 100644
index 17df4991f..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv32im -mabi=ilp32 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefrag
deleted file mode 100644
index 1426cad31..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/M/Makefrag
+++ /dev/null
@@ -1,35 +0,0 @@
-# RISC-V Architecture Test RV32IM Makefrag
-#
-# Copyright (c) 2018, Imperas Software Ltd.
-# Copyright (c) 2020, InCore Semiconductors. Pvt. Ltd.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Imperas Software Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Imperas Software Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV32IM architectural tests
-
-rv32im_sc_tests = \
-
-rv32im_tests = $(addsuffix .elf, $(rv32im_sc_tests))
-
-target_tests += $(rv32im_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
deleted file mode 100644
index 0c60cf417..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../../Makefile.include
-
-RVTEST_DEFINES += -march=rv$(XLEN)iaf # KMG: removed compressed instructions from privileged tests
-
-$(eval $(call compile_template,-march=rv32iaf -mabi=ilp32 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
deleted file mode 100644
index 243d9011f..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
+++ /dev/null
@@ -1,65 +0,0 @@
-# RISC-V Architecture Test RV32I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV32I architectural tests
-
-rv32i_sc_tests = \
-    WALLY-mmu-sv32 \
-    WALLY-pm-01 \
-    WALLY-csr-permission-s-01 \
-    WALLY-csr-permission-u-01 \
-    WALLY-misa-01 \
-    WALLY-lrsc-01 \
-    WALLY-status-mie-01 \
-    WALLY-trap-sret-01 \
-    WALLY-status-fp-enabled-01 \
-    WALLY-minfo-01 \
-    WALLY-cboz-01 \
-    WALLY-cbom-01 \
-
-target_tests_nosim = \
-    WALLY-pma-01 \
-    WALLY-mtvec-01 \
-    WALLY-stvec-01 \
-    WALLY-mie-01 \
-    WALLY-sie-01 \
-    WALLY-trap-01 \
-    WALLY-trap-s-01 \
-    WALLY-trap-u-01 \
-    WALLY-wfi-01 \
-    WALLY-status-sie-01 \
-    WALLY-status-tw-01 \
-    WALLY-gpio-01 \
-    WALLY-clint-01 \
-    WALLY-plic-01 \
-    WALLY-uart-01 \
-    WALLY-spi-01 \
-
-
-rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests))
-
-target_tests += $(rv32i_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefile
deleted file mode 100644
index 38d7cba9d..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv64ic -mabi=lp64 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefrag
deleted file mode 100644
index d7032fc71..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/C/Makefrag
+++ /dev/null
@@ -1,35 +0,0 @@
-# RISC-V Architecture Test RV64I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV64I architectural tests
-
-rv64i_sc_tests = \
- 
-
-rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))
-
-target_tests += $(rv64i_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefile
deleted file mode 100644
index a474441d6..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv64id -mabi=lp64 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefrag
deleted file mode 100644
index 261a9a852..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/D/Makefrag
+++ /dev/null
@@ -1,35 +0,0 @@
-# RISC-V Architecture Test RV64IM Makefrag
-#
-# Copyright (c) 2018, Imperas Software Ltd.
-# Copyright (c) 2020, InCore Semiconductors. Pvt. Ltd.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Imperas Software Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Imperas Software Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV64IM architectural tests
-
-rv64im_sc_tests = \
- 
-rv64im_tests = $(addsuffix .elf, $(rv64im_sc_tests))
-
-target_tests += $(rv64im_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefile
deleted file mode 100644
index 18dc245c8..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv64i -mabi=lp64 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefrag
deleted file mode 100644
index 19bb5bd01..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefrag
+++ /dev/null
@@ -1,40 +0,0 @@
-# RISC-V Architecture Test RV64I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV64I architectural tests
-
-rv64i_sc_tests = \
-    WALLY-ADD \
-    WALLY-SUB \
-    WALLY-SLT \
-    WALLY-SLTU \
-    WALLY-XOR \
-
-
-rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))
-
-target_tests += $(rv64i_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefile
deleted file mode 100644
index f767da3a4..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../../Makefile.include
-
-$(eval $(call compile_template,-march=rv64im -mabi=lp64 -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefrag
deleted file mode 100644
index 261a9a852..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/M/Makefrag
+++ /dev/null
@@ -1,35 +0,0 @@
-# RISC-V Architecture Test RV64IM Makefrag
-#
-# Copyright (c) 2018, Imperas Software Ltd.
-# Copyright (c) 2020, InCore Semiconductors. Pvt. Ltd.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Imperas Software Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Imperas Software Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV64IM architectural tests
-
-rv64im_sc_tests = \
- 
-rv64im_tests = $(addsuffix .elf, $(rv64im_sc_tests))
-
-target_tests += $(rv64im_tests)
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
deleted file mode 100644
index 7404f07c1..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../../Makefile.include
-
-RVTEST_DEFINES += -march=rv$(XLEN)iaf # KMG: removed compressed instructions from privileged tests
-
-$(eval $(call compile_template,-march=rv64iaf -mabi=lp64 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
deleted file mode 100644
index a96fae3db..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
+++ /dev/null
@@ -1,73 +0,0 @@
-# RISC-V Architecture Test RV64I Makefrag
-#
-# Copyright (c) 2017, Codasip Ltd.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of the Codasip Ltd. nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Codasip Ltd. BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Description: Makefrag for RV64I architectural tests
-
-rv64i_sc_tests = \
-    WALLY-mmu-sv39-01 \
-    WALLY-mmu-sv48-01 \
-    WALLY-pmp-01 \
-    WALLY-csr-permission-s-01 \
-    WALLY-csr-permission-u-01 \
-    WALLY-misa-01 \
-    WALLY-lrsc-01 \
-    WALLY-trap-sret-01 \
-    WALLY-status-mie-01 \
-    WALLY-status-sie-01 \
-    WALLY-status-tw-01 \
-    WALLY-status-fp-enabled-01 \
-    WALLY-misaligned-access-01 \
-    WALLY-minfo-01 \
-    WALLY-cboz-01 \
-    WALLY-cbom-01 \
-
-
-# Don't simulate these because they rely on SoC features that Spike does not offer.
-target_tests_nosim = \
-    WALLY-pma-01 \
-    WALLY-periph-01 \
-    WALLY-mtvec-01 \
-    WALLY-stvec-01 \
-    WALLY-mie-01 \
-    WALLY-sie-01 \
-    WALLY-trap-01 \
-    WALLY-trap-s-01 \
-    WALLY-trap-u-01 \
-    WALLY-spi-01 \
-    WALLY-gpio-01 \
-    WALLY-uart-01 \
-    WALLY-wfi-01 \
-
-
-# unclear why status-fp-enabled and wfi aren't simulating ok
-# DH 10/9/23: minfo needs Privileged Spec 1.12 for the mconfigptr register, but 
-#   we don't have the right ISA string so it's compiling at 1.11
-#   and Sail throws an illegal instruction exception on csrr mconfigptr
-
-rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))
-
-target_tests += $(rv64i_tests)