aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2017-01-04 11:45:18 -0800
committerAndrew Waterman <andrew@sifive.com>2017-01-04 11:45:18 -0800
commit6a1a38d421fd3e24bdc179d58d33572636b903b2 (patch)
treed093b9b4450520b89860b5b86941f6b5f72df7e4
parentacc35f32c788fdcbb854f8fb6d74026050ced273 (diff)
downloadriscv-tests-6a1a38d421fd3e24bdc179d58d33572636b903b2.zip
riscv-tests-6a1a38d421fd3e24bdc179d58d33572636b903b2.tar.gz
riscv-tests-6a1a38d421fd3e24bdc179d58d33572636b903b2.tar.bz2
Specify Spike ISA explicitly
-rw-r--r--benchmarks/Makefile2
-rw-r--r--isa/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index ce9d4f9..bc17927 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -55,7 +55,7 @@ RISCV_LINK ?= $(RISCV_GCC) -T $(src_dir)/common/test.ld $(incs)
RISCV_LINK_MT ?= $(RISCV_GCC) -T $(src_dir)/common/test-mt.ld
RISCV_LINK_OPTS ?= -nostdlib -nostartfiles -ffast-math -lgcc
RISCV_OBJDUMP ?= $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
-RISCV_SIM ?= spike
+RISCV_SIM ?= spike --isa=rv$(XLEN)gc
VPATH += $(addprefix $(src_dir)/, $(bmarks))
VPATH += $(src_dir)/common
diff --git a/isa/Makefile b/isa/Makefile
index 1afa4d6..3ed1b60 100644
--- 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