ERET -> xRET; new memory map

[riscv-tests.git] / isa / rv64ui / Makefrag

diff --git a/isa/rv64ui/Makefrag b/isa/rv64ui/Makefrag
index 45b86a2b12b3b0951087562ee9a323901c79b7d0..e8391185830a174cb10f965d59baf4e53d115d70 100644 (file)
--- a/isa/rv64ui/Makefrag
+++ b/isa/rv64ui/Makefrag
@@ -4,8 +4,8 @@
 
 rv64ui_sc_tests = \
        add addi addiw addw \
-       amoadd_d amoand_d amomax_d amomaxu_d amomin_d amominu_d amoor_d amoswap_d \
-       amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoswap_w \
+       amoadd_d amoand_d amomax_d amomaxu_d amomin_d amominu_d amoor_d amoxor_d amoswap_d \
+       amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoxor_w amoswap_w \
        and andi \
        auipc \
        beq bge bgeu blt bltu bne \
@@ -29,24 +29,7 @@ rv64ui_sc_tests = \
 rv64ui_mc_tests = \
        lrsc
 
-rv64ui_sc_vec_tests = \
-       add addi addiw addw \
-       and andi \
-       lui \
-       mul mulh mulhsu mulhu mulw \
-       or ori \
-       sll slli slliw sllw \
-       slt slti sltiu sltu \
-       sra srai sraiw sraw \
-       srl srli srliw srlw \
-       sub subw \
-       xor xori \
-
 rv64ui_p_tests = $(addprefix rv64ui-p-, $(rv64ui_sc_tests))
-rv64ui_pm_tests = $(addprefix rv64ui-pm-, $(rv64ui_mc_tests))
 rv64ui_v_tests = $(addprefix rv64ui-v-, $(rv64ui_sc_tests))
-rv64ui_p_vec_tests = $(addprefix rv64ui-p-vec-, $(rv64ui_sc_vec_tests))
-rv64ui_pt_vec_tests = $(addprefix rv64ui-pt-vec-, $(rv64ui_sc_vec_tests))
-rv64ui_v_vec_tests = $(addprefix rv64ui-v-vec-, $(rv64ui_sc_vec_tests))
 
-spike_tests += $(rv64ui_p_tests) $(rv64ui_pm_tests) $(rv64ui_v_tests) $(rv64ui_p_vec_tests) $(rv64ui_pt_vec_tests) $(rv64ui_v_vec_tests)
+spike_tests += $(rv64ui_p_tests) $(rv64ui_v_tests)