aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunsup Lee <yunsup@cs.berkeley.edu>2013-10-16 14:28:55 -0700
committerYunsup Lee <yunsup@cs.berkeley.edu>2013-10-17 01:03:09 -0700
commitc35d6ad90af2f8b4be7b9d83636f88de9d989e4f (patch)
tree048081b1370f54b42ae1041a8f72273b7e3533ff
parentb37759445cd18d56eaa3a7705de6e6ff4c79038d (diff)
downloadriscv-tests-c35d6ad90af2f8b4be7b9d83636f88de9d989e4f.zip
riscv-tests-c35d6ad90af2f8b4be7b9d83636f88de9d989e4f.tar.gz
riscv-tests-c35d6ad90af2f8b4be7b9d83636f88de9d989e4f.tar.bz2
add passing physical vector tests back in
-rw-r--r--isa/Makefile2
-rw-r--r--isa/rv64uf/Makefrag2
-rw-r--r--isa/rv64ui/Makefrag2
-rw-r--r--isa/rv64uv/Makefrag3
4 files changed, 4 insertions, 5 deletions
diff --git a/isa/Makefile b/isa/Makefile
index f165c38..1009c27 100644
--- 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 5957d8d..6aa6395 100644
--- 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 3f77dc7..4643c5d 100644
--- 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 955c27d..7a287a1 100644
--- 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)