From 46e46a1d83da586c3dd9fd7a01eb16067abbaee1 Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Thu, 28 Aug 2014 12:05:45 -0500
Subject: [PATCH] Minor updates to packm blocked, cxk_3m/4m code.

Details:
- Added 'const' qualifier to inlined packing code that handles
  micro-panel packing that is too large for an existing packm ukernel.
- Comment updates.
---
 frame/1m/packm/bli_packm_blk_var1.c | 4 ++--
 frame/1m/packm/bli_packm_blk_var3.c | 4 ++--
 frame/1m/packm/bli_packm_blk_var4.c | 4 ++--
 frame/1m/packm/bli_packm_cxk_3m.c   | 4 ++--
 frame/1m/packm/bli_packm_cxk_4m.c   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frame/1m/packm/bli_packm_blk_var1.c b/frame/1m/packm/bli_packm_blk_var1.c
index 757198f15..6b72e3db6 100644
--- a/frame/1m/packm/bli_packm_blk_var1.c
+++ b/frame/1m/packm/bli_packm_blk_var1.c
@@ -214,8 +214,8 @@ void PASTEMAC(ch,varname)( \
 	row_stored = bli_is_col_packed( schema ); \
 	col_stored = bli_is_row_packed( schema ); \
 \
-	/* If the strides of P indicate row storage, then we are packing to
-	   column panels; otherwise, if the strides indicate column storage,
+	/* If the row storage flag indicates row storage, then we are packing
+	   to column panels; otherwise, if the strides indicate column storage,
 	   we are packing to row panels. */ \
 	if ( row_stored ) \
 	{ \
diff --git a/frame/1m/packm/bli_packm_blk_var3.c b/frame/1m/packm/bli_packm_blk_var3.c
index 49e1dcee8..542913d2c 100644
--- a/frame/1m/packm/bli_packm_blk_var3.c
+++ b/frame/1m/packm/bli_packm_blk_var3.c
@@ -255,8 +255,8 @@ void PASTEMAC(ch,varname)( \
 	row_stored = bli_is_col_packed( schema ); \
 	col_stored = bli_is_row_packed( schema ); \
 \
-	/* If the strides of P indicate row storage, then we are packing to
-	   column panels; otherwise, if the strides indicate column storage,
+	/* If the row storage flag indicates row storage, then we are packing
+	   to column panels; otherwise, if the strides indicate column storage,
 	   we are packing to row panels. */ \
 	if ( row_stored ) \
 	{ \
diff --git a/frame/1m/packm/bli_packm_blk_var4.c b/frame/1m/packm/bli_packm_blk_var4.c
index cec66b5c2..87daf0c83 100644
--- a/frame/1m/packm/bli_packm_blk_var4.c
+++ b/frame/1m/packm/bli_packm_blk_var4.c
@@ -255,8 +255,8 @@ void PASTEMAC(ch,varname)( \
 	row_stored = bli_is_col_packed( schema ); \
 	col_stored = bli_is_row_packed( schema ); \
 \
-	/* If the strides of P indicate row storage, then we are packing to
-	   column panels; otherwise, if the strides indicate column storage,
+	/* If the row storage flag indicates row storage, then we are packing
+	   to column panels; otherwise, if the strides indicate column storage,
 	   we are packing to row panels. */ \
 	if ( row_stored ) \
 	{ \
diff --git a/frame/1m/packm/bli_packm_cxk_3m.c b/frame/1m/packm/bli_packm_cxk_3m.c
index a4fa6417c..59148eefb 100644
--- a/frame/1m/packm/bli_packm_cxk_3m.c
+++ b/frame/1m/packm/bli_packm_cxk_3m.c
@@ -198,8 +198,8 @@ void PASTEMAC(ch,varname)( \
 		ctype_r* restrict p_r     = ( ctype_r* )p; \
 		ctype_r* restrict p_i     = ( ctype_r* )p +   psp; \
 		ctype_r* restrict p_rpi   = ( ctype_r* )p + 2*psp; \
-		dim_t             inca2   = 2*inca; \
-		dim_t             lda2    = 2*lda; \
+		const dim_t       inca2   = 2*inca; \
+		const dim_t       lda2    = 2*lda; \
 \
 		/* Treat the panel as m x n and column-stored (unit row stride). */ \
 \
diff --git a/frame/1m/packm/bli_packm_cxk_4m.c b/frame/1m/packm/bli_packm_cxk_4m.c
index c07081d77..7261b1358 100644
--- a/frame/1m/packm/bli_packm_cxk_4m.c
+++ b/frame/1m/packm/bli_packm_cxk_4m.c
@@ -198,8 +198,8 @@ void PASTEMAC(ch,varname)( \
 		ctype_r* restrict a_i     = ( ctype_r* )a + 1; \
 		ctype_r* restrict p_r     = ( ctype_r* )p; \
 		ctype_r* restrict p_i     = ( ctype_r* )p + psp; \
-		dim_t             inca2   = 2*inca; \
-		dim_t             lda2    = 2*lda; \
+		const dim_t       inca2   = 2*inca; \
+		const dim_t       lda2    = 2*lda; \
 \
 		/* Treat the panel as m x n and column-stored (unit row stride). */ \
 \