From 9135dfd69d39f3bbd75034f479f27a78dbfebcce Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Fri, 5 Jun 2015 13:37:44 -0500
Subject: [PATCH] Minor updates to test/3m4m files.

---
 test/3m4m/Makefile | 32 ++++++++++++++++++--------------
 test/3m4m/runme.sh |  5 ++---
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/test/3m4m/Makefile b/test/3m4m/Makefile
index ecc6a84ef..e83ca4bc1 100644
--- a/test/3m4m/Makefile
+++ b/test/3m4m/Makefile
@@ -45,8 +45,8 @@
 #
 
 .PHONY: all \
-        blis openblas mkl \
-        blis-mt openblas-mt mkl-mt \
+        blis-gemm-st openblas-gemm-st mkl-gemm-st acml-gemm-st \
+        blis-gemm-mt openblas-gemm-mt mkl-gemm-mt acml-gemm-mt \
         clean cleanx
 
 
@@ -247,15 +247,19 @@ intel: blis-all openblas-all mkl-all
 
 amd: blis-all openblas-all acml-all
 
-blis-all: blis blis-mt
+blis-all: blis-gemm-st \
+          blis-gemm-mt
 
-openblas-all: openblas openblas-mt
+openblas-all: openblas-gemm-st \
+              openblas-gemm-mt
 
-mkl-all: mkl mkl-mt
+mkl-all: mkl-gemm-st \
+         mkl-gemm-mt
 
-acml-all: acml acml-mt
+acml-all: acml-gemm-st \
+          acml-gemm-mt
 
-blis: \
+blis-gemm-st: \
       test_sgemm_asm_blis_st.x \
       test_dgemm_asm_blis_st.x \
       \
@@ -276,7 +280,7 @@ blis: \
       test_cgemm_asm_blis_st.x \
       test_zgemm_asm_blis_st.x
 
-blis-mt: \
+blis-gemm-mt: \
       test_sgemm_asm_blis_mt.x \
       test_dgemm_asm_blis_mt.x \
       \
@@ -297,33 +301,33 @@ blis-mt: \
       test_cgemm_asm_blis_mt.x \
       test_zgemm_asm_blis_mt.x
 
-openblas: \
+openblas-gemm-st: \
       test_sgemm_openblas_st.x \
       test_dgemm_openblas_st.x \
       test_cgemm_openblas_st.x \
       test_zgemm_openblas_st.x
 
-openblas-mt: \
+openblas-gemm-mt: \
       test_cgemm_openblas_mt.x \
       test_zgemm_openblas_mt.x
 
-mkl: \
+mkl-gemm-st: \
       test_sgemm_mkl_st.x \
       test_dgemm_mkl_st.x \
       test_cgemm_mkl_st.x \
       test_zgemm_mkl_st.x
 
-mkl-mt: \
+mkl-gemm-mt: \
       test_cgemm_mkl_mt.x \
       test_zgemm_mkl_mt.x
 
-acml: \
+acml-gemm-st: \
       test_sgemm_acml_st.x \
       test_dgemm_acml_st.x \
       test_cgemm_acml_st.x \
       test_zgemm_acml_st.x
 
-acml-mt: \
+acml-gemm-mt: \
       test_cgemm_acml_mt.x \
       test_zgemm_acml_mt.x
 
diff --git a/test/3m4m/runme.sh b/test/3m4m/runme.sh
index 5aa12a2da..445e40bd0 100755
--- a/test/3m4m/runme.sh
+++ b/test/3m4m/runme.sh
@@ -64,12 +64,11 @@ if [ ${sys} = "stampede" ]; then
 elif [ ${sys} = "wahlberg" ]; then
 
 	test_impls="openblas acml asm_blis 3mhw_blis 3m3_blis 3m2_blis 3m1_blis 4mhw_blis 4m1b_blis 4m1a_blis"
-	#test_impls="openblas acml asm_blis"
+	test_impls="openblas acml asm_blis"
 fi
 
 # Real domain implementations to test.
-#test_impls_r="openblas acml asm_blis"
-test_impls_r="asm_blis"
+test_impls_r="openblas acml asm_blis"
 
 # First perform real test cases.
 for th in ${threads_r}; do