Clean up benchmarks build

[riscv-tests.git] / isa / Makefile

diff --git a/isa/Makefile b/isa/Makefile
index 1afa4d6cd4501c0f7b26eb67431658cc715b4c62..7f22c535ddbf6a3beda9c20f20caa09ec54f7f3b 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -43,10 +43,10 @@ vpath %.S $(src_dir)
        $(RISCV_OBJDUMP) $< > $@
 
 %.out: %
-       $(RISCV_SIM) $< 2> $@
+       $(RISCV_SIM) --isa=rv64gc $< 2> $@
 
 %.out32: %
-       $(RISCV_SIM) --isa=RV32 $< 2> $@
+       $(RISCV_SIM) --isa=rv32gc $< 2> $@
 
 define compile_template
 
@@ -55,7 +55,7 @@ $$($(1)_p_tests): $(1)-p-%: $(1)/%.S
 $(1)_tests += $$($(1)_p_tests)
 
 $$($(1)_v_tests): $(1)-v-%: $(1)/%.S
-       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -DENTROPY=0x$$(shell echo \$$@ | md5sum | cut -c 1-7) -std=gnu99 -O2 -I$(src_dir)/../env/v -I$(src_dir)/macros/scalar -T$(src_dir)/../env/v/link.ld $(src_dir)/../env/v/entry.S $(src_dir)/../env/v/*.c $$< -lc -o $$@
+       $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -DENTROPY=0x$$(shell echo \$$@ | md5sum | cut -c 1-7) -std=gnu99 -O2 -I$(src_dir)/../env/v -I$(src_dir)/macros/scalar -T$(src_dir)/../env/v/link.ld $(src_dir)/../env/v/entry.S $(src_dir)/../env/v/*.c $$< -o $$@
 $(1)_tests += $$($(1)_v_tests)
 
 $(1)_tests_dump = $$(addsuffix .dump, $$($(1)_tests))
@@ -92,8 +92,6 @@ tests_out = $(addsuffix .out, $(spike_tests))
 tests32_out = $(addsuffix .out32, $(spike32_tests))
 
 run: $(tests_out) $(tests32_out)
-       echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' \
-              $(tests_out) $(tests32_out); echo;
 
 junk += $(tests) $(tests_dump) $(tests_hex) $(tests_out) $(tests32_out)