minor mt updates

[riscv-tests.git] / isa / Makefile

diff --git a/isa/Makefile b/isa/Makefile
index 77a0407ad34a7b2e9e704f51dc1cc46e88c59fba..19bd1e718f7985cd4b2073a9c90c81651ba5fdc4 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -2,12 +2,15 @@
 # Makefile for riscv-tests/isa
 #-----------------------------------------------------------------------
 
-include rv64ui/Makefrag
-include rv64uf/Makefrag
-include rv64uv/Makefrag
-include rv64si/Makefrag
-include rv64sv/Makefrag
-include rv32ui/Makefrag
+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)/rv32ui/Makefrag
+include $(isa_src_dir)/rv32si/Makefrag
 
 default: all
 
@@ -15,16 +18,19 @@ default: all
 # Build rules
 #--------------------------------------------------------------------
 
-RISCV_GCC = riscv-gcc
-RISCV_GCC_OPTS = -nostdlib -nostartfiles
-RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.data --section=.bss
-RISCV_SIM = spike
+RISCV_PREFIX=riscv64-unknown-elf-
+RISCV_GCC = $(RISCV_PREFIX)gcc
+RISCV_GCC_OPTS = -static -fpic -fvisibility=hidden -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
+RISCV_OBJDUMP = $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
+RISCV_SIM = spike --extension=hwacha
+
+vpath %.S $(isa_src_dir)
 
 #------------------------------------------------------------
 # Build assembly tests
 
 %.hex: %
-       elf2hex 16 16384 $< > $@
+       (elf2hex 16 8192 $< 2> /dev/null || elf2hex 16 16384 $<) > $@
 
 %.dump: %
        $(RISCV_OBJDUMP) $< > $@
@@ -35,36 +41,46 @@ RISCV_SIM = spike
 define compile_template
 
 $$($(1)_p_tests): $(1)-p-%: $(1)/%.S
-       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I../env/p -I./macros/scalar -T../env/p/link.ld $$< -o $$@
-tests += $$($(1)_p_tests)
+       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(isa_src_dir)/../env/p -I$(isa_src_dir)/macros/scalar -T$(isa_src_dir)/../env/p/link.ld $$< -o $$@
+$(1)_tests += $$($(1)_p_tests)
 
 $$($(1)_pt_tests): $(1)-pt-%: $(1)/%.S
-       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I../env/pt -I./macros/scalar -T../env/p/link.ld $$< -o $$@
-tests += $$($(1)_pt_tests)
+       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(isa_src_dir)/../env/pt -I$(isa_src_dir)/macros/scalar -T$(isa_src_dir)/../env/p/link.ld $$< -o $$@
+$(1)_tests += $$($(1)_pt_tests)
 
 $$($(1)_pm_tests): $(1)-pm-%: $(1)/%.S
-       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I../env/pm -I./macros/scalar -T../env/pm/link.ld $$< -o $$@
-tests += $$($(1)_pm_tests)
+       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(isa_src_dir)/../env/pm -I$(isa_src_dir)/macros/scalar -T$(isa_src_dir)/../env/pm/link.ld $$< -o $$@
+$(1)_tests += $$($(1)_pm_tests)
 
 $$($(1)_v_tests): $(1)-v-%: $(1)/%.S
-       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -std=gnu99 -O2 -I../env/v -I./macros/scalar -T../env/v/link.ld ../env/v/entry.S ../env/v/vm.c $$< -lc -o $$@
-tests += $$($(1)_v_tests)
+       $$(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../env/p -I./macros/vector -T../env/p/link.ld $$< -o $$@
-tests += $$($(1)_p_vec_tests)
+       $$(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../env/pt -I./macros/vector -T../env/pt/link.ld $$< -o $$@
-tests += $$($(1)_pt_vec_tests)
+       $$(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../env/v -I./macros/vector -T../env/v/link.ld ../env/v/entry.S ../env/v/vm.c $$< -lc -o $$@
-tests += $$($(1)_v_vec_tests)
+       $$(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))
+
+$(1): $$($(1)_tests_dump) $$($(1)_tests_hex)
+
+.PHONY: $(1)
+
+tests += $$($(1)_tests)
 
 endef
 
 $(eval $(call compile_template,rv32ui,-m32))
+$(eval $(call compile_template,rv32si,-m32))
 $(eval $(call compile_template,rv64ui))
 $(eval $(call compile_template,rv64uf))
 $(eval $(call compile_template,rv64uv))