X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=blobdiff_plain;f=benchmarks%2FMakefile;h=1145fed9adb29349a9a80a043355c0cc44f1a12f;hp=cff904ae11952358ab54c832779e0f74fdfdfbcd;hb=08486cb632ef704709a89fc6bab5842bec4c2547;hpb=767a5e2483e411785838a379f56a923f043badd2

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index cff904a..1145fed 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -6,7 +6,7 @@
 
 default: all
 
-bmarkdir = .
+src_dir = .
 
 instname = riscv-bmarks
 instbasedir = $(UCB_VLSI_HOME)/install
@@ -18,18 +18,15 @@ instbasedir = $(UCB_VLSI_HOME)/install
 bmarks = \
 	median \
 	qsort \
+	rsort \
 	towers \
 	vvadd \
 	multiply \
-	dgemm \
+	mm \
 	dhrystone \
 	spmv \
 	mt-vvadd \
-	#vec-fft \
-	#mt-matmul \
-	#vec-vvadd \
-	#vec-cmplxmult \
-	#vec-matmul \
+	mt-matmul \
 
 bmarks_host = \
 	median \
@@ -37,7 +34,6 @@ bmarks_host = \
 	towers \
 	vvadd \
 	multiply \
-	dgemm \
 	spmv \
 	vec-vvadd \
 	vec-cmplxmult \
@@ -50,21 +46,22 @@ 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_SIM = spike
+RISCV_PREFIX ?= riscv64-unknown-elf-
+RISCV_GCC ?= $(RISCV_PREFIX)gcc
+RISCV_GCC_OPTS ?= -static -std=gnu99 -O2 -ffast-math -fno-common -fno-builtin-printf
+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 -lc -lgcc
+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
+VPATH += $(addprefix $(src_dir)/, $(bmarks))
+VPATH += $(src_dir)/common
 
-incs  += -I$(bmarkdir)/../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I$(src_dir)/../env -I$(src_dir)/common $(addprefix -I$(src_dir)/, $(bmarks))
 objs  :=
 
-include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))
+include $(patsubst %, $(src_dir)/%/bmark.mk, $(bmarks))
 
 #------------------------------------------------------------
 # Build and run benchmarks on riscv simulator