Share code between rv32ui and rv64ui tests

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

diff --git a/isa/rv64ui/Makefrag b/isa/rv64ui/Makefrag
index 3f77dc793e1ba4d66672145a218dc936a5bc9396..1867ea531398049dd3e24ce629338cb70c1245b6 100644 (file)
--- a/isa/rv64ui/Makefrag
+++ b/isa/rv64ui/Makefrag
@@ -4,20 +4,15 @@
 
 rv64ui_sc_tests = \
        add addi addiw addw \
-       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 \
-       div divu divuw divw \
-       example simple \
+       simple \
        fence_i \
-       j jal jalr \
+       jal jalr \
        lb lbu lh lhu lw lwu ld \
        lui \
-       mul mulh mulhsu mulhu mulw \
        or ori \
-       rem remu remuw remw \
        sb sh sw sd \
        sll slli slliw sllw \
        slt slti sltiu sltu \
@@ -26,27 +21,7 @@ rv64ui_sc_tests = \
        sub subw \
        xor xori \
 
-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)