add passing physical vector tests back in

diff --git a/isa/Makefile b/isa/Makefile
index f165c38339abcc8a37b362b43e17b59f8ca1b368..1009c278792946df7477d0efc7182659b49c89b3 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -20,7 +20,7 @@ default: all
 RISCV_GCC = riscv-gcc
 RISCV_GCC_OPTS = -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --section=.text --section=.data --section=.bss
-RISCV_SIM = spike
+RISCV_SIM = spike --extension=hwacha
 
 vpath %.S $(isa_src_dir)
 

diff --git a/isa/rv64uf/Makefrag b/isa/rv64uf/Makefrag
index 5957d8d985722fd1279690c9b9704be5ff30db5e..6aa6395f4f6e4a5c2082658492590675bd8e97b4 100644 (file)
--- a/isa/rv64uf/Makefrag
+++ b/isa/rv64uf/Makefrag
@@ -15,4 +15,4 @@ rv64uf_p_vec_tests = $(addprefix rv64uf-p-vec-, $(rv64uf_sc_vec_tests))
 rv64uf_pt_vec_tests = $(addprefix rv64uf-pt-vec-, $(rv64uf_sc_vec_tests))
 rv64uf_v_vec_tests = $(addprefix rv64uf-v-vec-, $(rv64uf_sc_vec_tests))
 
-spike_tests += $(rv64uf_p_tests) $(rv64uf_v_tests) #$(rv64uf_p_vec_tests) $(rv64uf_pt_vec_tests) $(rv64uf_v_vec_tests)
+spike_tests += $(rv64uf_p_tests) $(rv64uf_v_tests) $(rv64uf_p_vec_tests) #$(rv64uf_pt_vec_tests) $(rv64uf_v_vec_tests)

diff --git a/isa/rv64ui/Makefrag b/isa/rv64ui/Makefrag
index 3f77dc793e1ba4d66672145a218dc936a5bc9396..4643c5d527dfb12e25bbb08d70d0cb7d26540d7e 100644 (file)
--- a/isa/rv64ui/Makefrag
+++ b/isa/rv64ui/Makefrag
@@ -49,4 +49,4 @@ 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_pm_tests) $(rv64ui_v_tests) $(rv64ui_p_vec_tests) #$(rv64ui_pt_vec_tests) $(rv64ui_v_vec_tests)

diff --git a/isa/rv64uv/Makefrag b/isa/rv64uv/Makefrag
index 955c27d92cdd321e18b15dcabca2d938d1bdf229..7a287a167158ac037d0cc4c23aef0767400d400f 100644 (file)
--- a/isa/rv64uv/Makefrag
+++ b/isa/rv64uv/Makefrag
@@ -19,7 +19,6 @@ rv64uv_sc_tests = \
        fmovn fmovz \
        vvadd_d vvadd_w vvadd_fd vvadd_fw \
        vvmul_d \
-       vvadd_branch \
 
 rv64uv_sc_vec_tests = \
        beq bge bgeu blt bltu bne \
@@ -31,4 +30,4 @@ rv64uv_p_vec_tests = $(addprefix rv64uv-p-vec-, $(rv64uv_sc_vec_tests))
 rv64uv_pt_vec_tests = $(addprefix rv64uv-pt-vec-, $(rv64uv_sc_vec_tests))
 rv64uv_v_vec_tests = $(addprefix rv64uv-v-vec-, $(rv64uv_sc_vec_tests))
 
-spike_tests += #$(rv64uv_p_tests)
+spike_tests += $(rv64uv_p_tests)