Minor Makefile improvements

[riscv-tests.git] / benchmarks / Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 5d33f860d4d6eccf595c17a1abba463ac80aff80..b4dbffcbe96383611ef01d3c3b6c5511709591c8 100644 (file)
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -24,11 +24,11 @@ bmarks = \
        dgemm \
        dhrystone \
        spmv \
-       vec-vvadd \
-       vec-cmplxmult \
-       vec-matmul \
        mt-vvadd \
-       mt-matmul \
+       #mt-matmul \
+       #vec-vvadd \
+       #vec-cmplxmult \
+       #vec-matmul \
 
 bmarks_host = \
        median \
@@ -51,17 +51,16 @@ 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
+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_SYSCALL = $(bmarkdir)/common/syscalls.c -lc
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
 RISCV_SIM = spike
 
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(bmarkdir)/common
 
-incs  += -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))