From 85fbb650c9fc03787b5d02e1727bc092b821de04 Mon Sep 17 00:00:00 2001
From: Henry Cook <hcook@eecs.berkeley.edu>
Date: Thu, 13 Jun 2013 15:34:15 -0700
Subject: [PATCH] makefile support for new multithreading tests

---
 Makefrag          | 71 +++++++++++++++++++++++++++++++++++++++++++++++
 emulator/Makefile |  8 ++++++
 riscv-tests       |  2 +-
 3 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/Makefrag b/Makefrag
index c2d075bc..458da8ef 100644
--- a/Makefrag
+++ b/Makefrag
@@ -513,3 +513,74 @@ vec_bmarks = \
 	ubmark-bin-search \
 	ubmark-cmplx-mult \
 	ubmark-masked-filter \
+
+
+mt_bmarkdir = $(base_dir)/riscv-tests/mt
+mt_bmarks = \
+ab_matmul.riscv\
+ab_vvadd.riscv\
+ad_matmul.riscv\
+ad_vvadd.riscv\
+ae_matmul.riscv\
+ae_vvadd.riscv\
+af_matmul.riscv\
+af_vvadd.riscv\
+ag_matmul.riscv\
+ag_vvadd.riscv\
+ai_matmul.riscv\
+ai_vvadd.riscv\
+aj_vvadd.riscv\
+ak_matmul.riscv\
+ak_vvadd.riscv\
+al_matmul.riscv\
+al_vvadd.riscv\
+am_matmul.riscv\
+am_vvadd.riscv\
+an_matmul.riscv\
+an_vvadd.riscv\
+ap_matmul.riscv\
+ap_vvadd.riscv\
+aq_matmul.riscv\
+aq_vvadd.riscv\
+ar_matmul.riscv\
+ar_vvadd.riscv\
+as_matmul.riscv\
+as_vvadd.riscv\
+at_matmul.riscv\
+at_vvadd.riscv\
+av_matmul.riscv\
+av_vvadd.riscv\
+ay_matmul.riscv\
+ay_vvadd.riscv\
+az_matmul.riscv\
+az_vvadd.riscv\
+ba_matmul.riscv\
+ba_vvadd.riscv\
+bb_matmul.riscv\
+bb_vvadd.riscv\
+bc_matmul.riscv\
+bc_vvadd.riscv\
+be_matmul.riscv\
+be_vvadd.riscv\
+bf_matmul.riscv\
+bf_vvadd.riscv\
+bh_matmul.riscv\
+bh_vvadd.riscv\
+bj_matmul.riscv\
+bj_vvadd.riscv\
+bk_matmul.riscv\
+bk_vvadd.riscv\
+bm_matmul.riscv\
+bm_vvadd.riscv\
+bn_matmul.riscv\
+bn_vvadd.riscv\
+bo_matmul.riscv\
+bo_vvadd.riscv\
+bp_matmul.riscv\
+bp_vvadd.riscv\
+br_matmul.riscv\
+br_vvadd.riscv\
+bs_matmul.riscv\
+bs_vvadd.riscv\
+bt_matmul.riscv\
+bt_vvadd.riscv\
diff --git a/emulator/Makefile b/emulator/Makefile
index 82dfa3fc..269e8e8d 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -66,6 +66,10 @@ $(addprefix output/, $(addsuffix .hex, $(bmarks))): output/%.hex: $(bmarkdir)/%.
 	mkdir -p output
 	ln -fs ../$< $@
 
+$(addprefix output/, $(addsuffix .hex, $(mt_bmarks))): output/%.hex: $(mt_bmarkdir)/%.hex
+	mkdir -p output
+	ln -fs ../$< $@
+
 output:
 	mkdir -p $@
 
@@ -88,6 +92,8 @@ run-vecasm-timer-tests: $(addprefix output/, $(addsuffix .out, $(vecasm_pt_tests
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo;
 run-bmarks-test: $(addprefix output/, $(addsuffix .out, $(bmarks)))
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo;
+run-mt-tests: $(addprefix output/, $(addsuffix .out, $(mt_bmarks)))
+	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo;
 
 run-asm-tests-debug: $(addprefix output/, $(addsuffix .vpd, $(asm_p_tests) $(asm_v_tests)))
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $(patsubst %.vpd,%.out,$^); echo;
@@ -97,6 +103,8 @@ run-vecasm-timer-tests-debug: $(addprefix output/, $(addsuffix .vpd, $(vecasm_pt
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $(patsubst %.vpd,%.out,$^); echo;
 run-bmarks-test-debug: $(addprefix output/, $(addsuffix .vpd, $(bmarks)))
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $(patsubst %.vpd,%.out,$^); echo;
+run-mt-tests-debug: $(addprefix output/, $(addsuffix .vpd, $(mt_bmarks)))
+	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $(patsubst %.vpd,%.out,$^); echo;
 
 run: run-asm-tests run-vecasm-tests run-vecasm-timer-tests run-bmarks-test
 run-debug: run-asm-tests-debug run-vecasm-tests-debug run-vecasm-timer-tests-debug run-bmarks-test-debug
diff --git a/riscv-tests b/riscv-tests
index 4412b96c..60f05688 160000
--- a/riscv-tests
+++ b/riscv-tests
@@ -1 +1 @@
-Subproject commit 4412b96c81ca09dcce6305579dd86d4bf3b808da
+Subproject commit 60f056880ec6929c5f23af4d66aea0f0cb7b0245