enable make subsets

[riscv-tests.git] / isa / Makefile

diff --git a/isa/Makefile b/isa/Makefile
index 1ec64c0ea6b2c6b376e0cdbfcc1c8a90c6f8ae8f..81acc2dba8fc5f3a27dece283afcb27d1a831182 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -41,31 +41,40 @@ define compile_template
 
 $$($(1)_p_tests): $(1)-p-%: $(1)/%.S
        $$(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 $$@
-tests += $$($(1)_p_tests)
+$(1)_tests += $$($(1)_p_tests)
 
 $$($(1)_pt_tests): $(1)-pt-%: $(1)/%.S
        $$(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 $$@
-tests += $$($(1)_pt_tests)
+$(1)_tests += $$($(1)_pt_tests)
 
 $$($(1)_pm_tests): $(1)-pm-%: $(1)/%.S
        $$(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 $$@
-tests += $$($(1)_pm_tests)
+$(1)_tests += $$($(1)_pm_tests)
 
 $$($(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 $$@
-tests += $$($(1)_v_tests)
+$(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 $$@
-tests += $$($(1)_p_vec_tests)
+$(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 $$@
-tests += $$($(1)_pt_vec_tests)
+$(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 $$@
-tests += $$($(1)_v_vec_tests)
+$(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