From b6017e53f4b26c99b14cdaa408351f11322b1e80 Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Tue, 27 Aug 2019 14:18:14 -0500
Subject: [PATCH] Bugfix of output text + tweaks to test/sup driver.

Details:
- Fixed an off-by-one bug in the output of matlab row indices in
  test/sup/test_gemm.c that only manifested when the problem size
  increment was equal to 1.
- Disabled the building of rrc, rcr, rcc, crr, crc, and ccr storage
  combinations for blissup drivers in test/sup. This helps make the
  building of drivers complete sooner.
- Trivial changes to test/sup/runme.sh.
---
 test/sup/Makefile    | 19 +++++++++++++------
 test/sup/runme.sh    | 10 +++++-----
 test/sup/test_gemm.c |  4 ++--
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/test/sup/Makefile b/test/sup/Makefile
index 2be53fefe..2cd062747 100644
--- a/test/sup/Makefile
+++ b/test/sup/Makefile
@@ -217,15 +217,22 @@ TRANS := n_n \
          t_n \
          t_t
 
+# While BLIS supports all combinations of row and column storage for matrices
+# C, A, and B, the alternatives mostly only support CBLAS APIs, which inherently
+# support only "all row-storage" or "all column-storage". Thus, we disable the
+# building of those other drivers so that compilation/linking completes sooner.
+#STORS := r_r_r \
+#         r_r_c \
+#         r_c_r \
+#         r_c_c \
+#         c_r_r \
+#         c_r_c \
+#         c_c_r \
+#         c_c_c
 STORS := r_r_r \
-         r_r_c \
-         r_c_r \
-         r_c_c \
-         c_r_r \
-         c_r_c \
-         c_c_r \
          c_c_c
 
+
 SHAPES := l_l_s \
           l_s_l \
           s_l_l \
diff --git a/test/sup/runme.sh b/test/sup/runme.sh
index 912c50dc0..48dacfa3a 100755
--- a/test/sup/runme.sh
+++ b/test/sup/runme.sh
@@ -38,13 +38,13 @@ sks="4"
 
 # Implementations to test.
 impls="vendor blissup blislpab openblas eigen libxsmm blasfeo"
-#impls="vendor openblas eigen"
-#impls="blislpab blissup"
-#impls="openblas eigen vendor"
-#impls="eigen"
+#impls="vendor"
 #impls="blissup"
-#impls="blasfeo"
+#impls="blislpab"
+#impls="openblas"
+#impls="eigen"
 #impls="libxsmm"
+#impls="blasfeo"
 
 # Example: test_dgemm_nn_rrc_m6npkp_blissup_st.x
 
diff --git a/test/sup/test_gemm.c b/test/sup/test_gemm.c
index 51becc9b3..7f611b554 100644
--- a/test/sup/test_gemm.c
+++ b/test/sup/test_gemm.c
@@ -152,7 +152,7 @@ int main( int argc, char** argv )
 	printf( "data_%s_%cgemm_%c%c_%s", THR_STR, dt_ch,
 	                                  transal, transbl, STR );
 	printf( "( %2lu, 1:4 ) = [ %4lu %4lu %4lu %7.2f ];\n",
-	        ( unsigned long )(p - p_begin + 1)/p_inc + 1,
+	        ( unsigned long )(p - p_begin)/p_inc + 1,
 	        ( unsigned long )0,
 	        ( unsigned long )0,
 	        ( unsigned long )0, 0.0 );
@@ -562,7 +562,7 @@ int main( int argc, char** argv )
 		printf( "data_%s_%cgemm_%c%c_%s", THR_STR, dt_ch,
 		                                  transal, transbl, STR );
 		printf( "( %2lu, 1:4 ) = [ %4lu %4lu %4lu %7.2f ];\n",
-		        ( unsigned long )(p - p_begin + 1)/p_inc + 1,
+		        ( unsigned long )(p - p_begin)/p_inc + 1,
 		        ( unsigned long )m,
 		        ( unsigned long )n,
 		        ( unsigned long )k, gflops );