From 8122f59745db780987da6aa1e851e9e76aa985e0 Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Wed, 21 Aug 2019 13:22:12 -0500
Subject: [PATCH] Pacify 'restrict' warning in gemmtrsm4m1 ref ukr.

Details:
- Previously, some versions of gcc would complain that the same
  pointer, one_r, is being passed in for both alpha and beta in the
  fourth call to the real gemm ukernel in bli_gemmtrsm4m1_ref.c. This
  is understandable since the compiler knows that the real gemm ukernel
  qualifies all of its floating-point arguments (including alpha and
  beta) with restrict. A small hack has been inserted into the file
  that defines a new variable to store the value 1.0, which is now used
  in lieu of one_r for beta in the fourth call to the real gemm ukernel,
  which should pacify the compiler now. Thanks to Dave Love for
  reporting this issue (#328) and for Devin Matthews for offering his
  'restrict' expertise.
---
 configure                             |  2 +-
 ref_kernels/ind/bli_gemmtrsm4m1_ref.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 35c107698..8107e588b 100755
--- a/configure
+++ b/configure
@@ -1530,7 +1530,7 @@ check_compiler_version_ranges()
 	gcc_older_than_4_9_0='no'
 	gcc_older_than_6_1_0='no'
 
-	echo "${script_name}: checking for consequential version ranges for ${cc} ${cc_version}."
+	echo "${script_name}: checking ${cc} ${cc_version} against known consequential version ranges."
 
 	# gcc
 	if [ "x${cc_vendor}" = "xgcc" ]; then
diff --git a/ref_kernels/ind/bli_gemmtrsm4m1_ref.c b/ref_kernels/ind/bli_gemmtrsm4m1_ref.c
index 1b2205c8d..8bc057140 100644
--- a/ref_kernels/ind/bli_gemmtrsm4m1_ref.c
+++ b/ref_kernels/ind/bli_gemmtrsm4m1_ref.c
@@ -84,6 +84,14 @@ void PASTEMAC3(ch,opname,arch,suf) \
 \
 	ctype_r* restrict one_r       = PASTEMAC(chr,1); \
 	ctype_r* restrict minus_one_r = PASTEMAC(chr,m1); \
+\
+	/* A hack to avoid a 'restrict' warning triggered by passing in the
+	   same address (one_r) for both alpha and beta when calling the last
+	   of the four matrix products. We now use one_r for alpha and this
+	   new local variable, onel, for beta. */ \
+	ctype             onel; \
+	ctype_r* restrict onel_r      = &onel; \
+	PASTEMAC(chr,set1s)( onel ); \
 \
 	ctype_r           alpha_r     = PASTEMAC(ch,real)( *alpha ); \
 	ctype_r           alpha_i     = PASTEMAC(ch,imag)( *alpha ); \
@@ -187,7 +195,7 @@ PASTEMAC(chr,fprintm)( stdout, "gemmtrsm4m1_l_ukr: bx111p_i", k+m, n, \
 	  one_r, \
 	  a1x_i, \
 	  bx1_i, \
-	  one_r, \
+	  onel_r, \
 	  b11_r, rs_b, cs_b, \
 	  data, \
 	  cntx  \