#-----------------------------------------------------------------------
rv32ui_sc_tests = \
+ simple \
add addi \
- amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoswap_w \
- #and andi \
- #auipc \
- #beq bge bgeu blt bltu bne \
- #div divu \
- #fence_i \
- #j jal jalr \
- #lb lbu lh lhu lw \
- #lui \
- #mul mulh mulhsu mulhu \
- #or ori \
- #rem remu \
- #sb sh sw \
- #sll slli \
- #slt slti \
- #sra srai \
- #srl srli \
- #sub \
- #xor xori \
-
-rv32ui_mc_tests = \
- #lrsc
+ and andi \
+ auipc \
+ beq bge bgeu blt bltu bne \
+ fence_i \
+ jal jalr \
+ lb lbu lh lhu lw \
+ lui \
+ or ori \
+ sb sh sw \
+ sll slli \
+ slt slti sltiu sltu \
+ sra srai \
+ srl srli \
+ sub \
+ xor xori \
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)