X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=isa%2FMakefile;h=07aef5063821978da5b754b978b842eb9b80e314;hb=7155726ad6612a7f87318d84ac496672f9bbc8ce;hp=3a8b2651610255ec95c940844b2d7d2c8def765b;hpb=f66d9faeca28d491115eb60a8f5b6b747f255a09;p=riscv-tests.git

diff --git a/isa/Makefile b/isa/Makefile
index 3a8b265..07aef50 100644
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -6,9 +6,7 @@ isa_src_dir := .
 
 include $(isa_src_dir)/rv64ui/Makefrag
 include $(isa_src_dir)/rv64uf/Makefrag
-include $(isa_src_dir)/rv64uv/Makefrag
 include $(isa_src_dir)/rv64si/Makefrag
-include $(isa_src_dir)/rv64sv/Makefrag
 include $(isa_src_dir)/rv64mi/Makefrag
 include $(isa_src_dir)/rv32ui/Makefrag
 include $(isa_src_dir)/rv32si/Makefrag
@@ -23,9 +21,9 @@ default: all
 RISCV_PREFIX=riscv64-unknown-elf-
 RISCV_GCC = $(RISCV_PREFIX)gcc
 ENTROPY = -DENTROPY=$(shell echo $$$$)
-RISCV_GCC_OPTS = $(ENTROPY) -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
+RISCV_GCC_OPTS = $(ENTROPY) -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles
 RISCV_OBJDUMP = $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.text.init --section=.data
-RISCV_SIM = spike --extension=hwacha
+RISCV_SIM = spike
 
 vpath %.S $(isa_src_dir)
 
@@ -62,18 +60,6 @@ $$($(1)_v_tests): $(1)-v-%: $(1)/%.S
 	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -std=gnu99 -O2 -I$(isa_src_dir)/../env/v -I$(isa_src_dir)/macros/scalar -T$(isa_src_dir)/../env/v/link.ld $(isa_src_dir)/../env/v/entry.S $(isa_src_dir)/../env/v/vm.c $$< -lc -o $$@
 $(1)_tests += $$($(1)_v_tests)
 
-$$($(1)_p_vec_tests): $(1)-p-vec-%: $(1)/%.S
-	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(isa_src_dir)/../env/p -I$(isa_src_dir)/macros/vector -T$(isa_src_dir)/../env/p/link.ld $$< -o $$@
-$(1)_tests += $$($(1)_p_vec_tests)
-
-$$($(1)_pt_vec_tests): $(1)-pt-vec-%: $(1)/%.S
-	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(isa_src_dir)/../env/pt -I$(isa_src_dir)/macros/vector -T$(isa_src_dir)/../env/pt/link.ld $$< -o $$@
-$(1)_tests += $$($(1)_pt_vec_tests)
-
-$$($(1)_v_vec_tests): $(1)-v-vec-%: $(1)/%.S
-	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -std=gnu99 -O2 -I$(isa_src_dir)/../env/v -I$(isa_src_dir)/macros/vector -T$(isa_src_dir)/../env/v/link.ld $(isa_src_dir)/../env/v/entry.S $(isa_src_dir)/../env/v/vm.c $$< -lc -o $$@
-$(1)_tests += $$($(1)_v_vec_tests)
-
 $(1)_tests_dump = $$(addsuffix .dump, $$($(1)_tests))
 $(1)_tests_hex = $$(addsuffix .hex, $$($(1)_tests))
 
@@ -90,9 +76,7 @@ $(eval $(call compile_template,rv32si,-m32))
 $(eval $(call compile_template,rv32mi,-m32))
 $(eval $(call compile_template,rv64ui))
 $(eval $(call compile_template,rv64uf))
-$(eval $(call compile_template,rv64uv))
 $(eval $(call compile_template,rv64si))
-$(eval $(call compile_template,rv64sv))
 $(eval $(call compile_template,rv64mi))
 
 tests_dump = $(addsuffix .dump, $(tests))