Use new toolchain and calling convention

[riscv-tests.git] / benchmarks / Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index dee7b239c6f5b6ae620eb479286da98041b4cbdb..23ce02da0e9e73657d61d9fff029615ac6fa5333 100644 (file)
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -18,14 +18,16 @@ instbasedir = $(UCB_VLSI_HOME)/install
 bmarks = \
        median \
        qsort \
+       rsort \
        towers \
        vvadd \
        multiply \
-       dgemm \
+       mm \
        dhrystone \
        spmv \
        mt-vvadd \
-       #mt-matmul \
+       mt-matmul \
+       #vec-fft \
        #vec-vvadd \
        #vec-cmplxmult \
        #vec-matmul \
@@ -36,7 +38,6 @@ bmarks_host = \
        towers \
        vvadd \
        multiply \
-       dgemm \
        spmv \
        vec-vvadd \
        vec-cmplxmult \
@@ -49,18 +50,19 @@ bmarks_host = \
 HOST_OPTS = -std=gnu99 -DPREALLOCATE=0 -DHOST_DEBUG=1
 HOST_COMP = gcc $(HOST_OPTS)
 
-RISCV_GCC = riscv-gcc
-RISCV_GCC_OPTS = -Wa,-march=RVIMAFDXhwacha -std=gnu99 -O2 -nostdlib -nostartfiles -ffast-math
-RISCV_LINK = riscv-gcc -T $(bmarkdir)/common/test.ld $(incs)
-RISCV_LINK_MT = riscv-gcc -T $(bmarkdir)/common/test-mt.ld
-RISCV_LINK_OPTS = -lc
-RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
+RISCV_PREFIX=riscv64-unknown-elf-
+RISCV_GCC = $(RISCV_PREFIX)gcc
+RISCV_GCC_OPTS = -static -Wa,-march=RVIMAFDXhwacha -std=gnu99 -O2 -ffast-math
+RISCV_LINK = $(RISCV_GCC) -T $(bmarkdir)/common/test.ld $(incs)
+RISCV_LINK_MT = $(RISCV_GCC) -T $(bmarkdir)/common/test-mt.ld
+RISCV_LINK_OPTS = -nostdlib -nostartfiles -ffast-math -lc
+RISCV_OBJDUMP = $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
 RISCV_SIM = spike
 
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(bmarkdir)/common
 
-incs  += -I../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I$(bmarkdir)/../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
 objs  :=
 
 include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))
@@ -90,7 +92,7 @@ $(bmarks_riscv_out): %.riscv.out: %.riscv
                     -c $(incs) $< -o $@
 
 %.o: %.S
-       $(RISCV_GCC) $(RISCV_GCC_OPTS) $(bmarks_defs) \
+       $(RISCV_GCC) $(RISCV_GCC_OPTS) $(bmarks_defs) -D__ASSEMBLY__=1 \
                     -c $(incs) $< -o $@
 
 riscv: $(bmarks_riscv_dump) $(bmarks_riscv_hex)