ERET -> xRET; new memory map

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

diff --git a/isa/rv32ui/Makefrag b/isa/rv32ui/Makefrag
index 7d186e283cfc92187cac7c5588b787c1c0e82f62..8124c02a093976d97d17387576285f35f53299d5 100644 (file)
--- a/isa/rv32ui/Makefrag
+++ b/isa/rv32ui/Makefrag
@@ -3,8 +3,9 @@
 #-----------------------------------------------------------------------
 
 rv32ui_sc_tests = \
+       simple \
        add addi \
-       amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoswap_w \
+       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 \
@@ -21,13 +22,13 @@ rv32ui_sc_tests = \
        slt slti \
        sra srai \
        srl srli \
-       #sub \
-       #xor xori \
+       sub \
+       xor xori \
 
 rv32ui_mc_tests = \
        lrsc
 
 rv32ui_p_tests = $(addprefix rv32ui-p-, $(rv32ui_sc_tests))
-rv32ui_pm_tests = $(addprefix rv32ui-pm-, $(rv32ui_mc_tests))
+rv32ui_v_tests = $(addprefix rv32ui-v-, $(rv32ui_sc_tests))
 
-spike_tests += $(rv32ui_p_tests) $(rv32ui_pm_tests)
+spike32_tests += $(rv32ui_p_tests) $(rv32ui_v_tests)