Clean up canonical mt benchmarks and reorganize extra versions in /mt. All versions...

[riscv-tests.git] / benchmarks / Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index b4dbffcbe96383611ef01d3c3b6c5511709591c8..3346c7c844c2052c05a75e74653fedf0825d6dfd 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 \
@@ -50,10 +51,10 @@ 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_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 = -lc
+RISCV_LINK_OPTS = -nostdlib -nostartfiles -ffast-math -lc
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
 RISCV_SIM = spike
 
@@ -90,7 +91,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)