From b2fed052c9a23d858ef0afbe220b342bce9aa7f7 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Wed, 3 Sep 2014 17:07:25 -0500 Subject: [PATCH] Minor code cleanup to bli_packm_struc_cxk*.c Details: - Realized that we don't need to track rs_p11 and cs_p11 for Hermitian/symmetric case of bli_packm_struc_cxk*(). They are always equal to rs_p and cs_p. --- frame/1m/packm/bli_packm_struc_cxk.c | 13 ++------- frame/1m/packm/bli_packm_struc_cxk_3m.c | 38 +++++++++---------------- frame/1m/packm/bli_packm_struc_cxk_4m.c | 31 ++++++-------------- 3 files changed, 25 insertions(+), 57 deletions(-) diff --git a/frame/1m/packm/bli_packm_struc_cxk.c b/frame/1m/packm/bli_packm_struc_cxk.c index fdce961f5..e779f925e 100644 --- a/frame/1m/packm/bli_packm_struc_cxk.c +++ b/frame/1m/packm/bli_packm_struc_cxk.c @@ -383,19 +383,12 @@ void PASTEMAC(ch,varname)( \ ctype* restrict p11; \ dim_t p11_m; \ dim_t p11_n; \ - inc_t rs_p11; \ - inc_t cs_p11; \ \ p11_m = panel_dim; \ p11_n = panel_dim; \ j = diagoffc_abs; \ p11 = p + (j )*ldp; \ c11 = c + (j )*ldc; \ -\ - /* Compute the row and column strides of p11. */ \ - if ( row_stored ) { rs_p11 = rs_p; cs_p11 = 1; } \ - else /* if ( col_stored ) */ { rs_p11 = 1; cs_p11 = cs_p; } \ -\ \ PASTEMAC(ch,scal2m)( 0, \ BLIS_NONUNIT_DIAG, \ @@ -404,8 +397,8 @@ void PASTEMAC(ch,varname)( \ p11_m, \ p11_n, \ kappa, \ - c11, rs_c, cs_c, \ - p11, rs_p11, cs_p11 ); \ + c11, rs_c, cs_c, \ + p11, rs_p, cs_p ); \ \ /* If source matrix c is Hermitian, we have to zero out the imaginary components of the diagonal of p11 in case the @@ -418,7 +411,7 @@ void PASTEMAC(ch,varname)( \ { \ PASTEMAC(ch,seti0s)( *p11 ); \ \ - p11 += rs_p11 + cs_p11; \ + p11 += rs_p + cs_p; \ } \ } \ } \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_3m.c b/frame/1m/packm/bli_packm_struc_cxk_3m.c index a09637f41..9dbfbac7d 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_3m.c +++ b/frame/1m/packm/bli_packm_struc_cxk_3m.c @@ -431,8 +431,6 @@ void PASTEMAC(ch,varname)( \ \ /* Pack the stored triangle of c11 to p11. */ \ { \ - inc_t cs_p11; \ - inc_t rs_p11; \ dim_t p11_m = panel_dim; \ dim_t p11_n = panel_dim; \ inc_t rs_c11 = 2*rs_c; \ @@ -448,10 +446,6 @@ void PASTEMAC(ch,varname)( \ ctype_r* alpha_i = ( bli_is_conj( conjc ) ? minus_one_r : one_r ); \ ctype_r kappa_r = PASTEMAC(ch,real)( *kappa ); \ ctype_r kappa_i = PASTEMAC(ch,imag)( *kappa ); \ -\ - /* Compute the row and column strides of p11. */ \ - if ( row_stored ) { rs_p11 = rs_p; cs_p11 = 1; } \ - else /* if ( col_stored ) */ { rs_p11 = 1; cs_p11 = cs_p; } \ \ /* Copy the real part of the stored triangle of c11 to p11_r. */ \ PASTEMAC(chr,scal2m)( 0, \ @@ -462,7 +456,7 @@ void PASTEMAC(ch,varname)( \ p11_n, \ alpha_r, \ c11_r, rs_c11, cs_c11, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ \ /* Copy the imaginary part of the stored triangle of c11 to p11_i, scaling by -1 if conjugation on c was requested. */ \ @@ -474,7 +468,7 @@ void PASTEMAC(ch,varname)( \ p11_n, \ alpha_i, \ c11_i, rs_c11, cs_c11, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ \ /* If source matrix c is Hermitian, we have to zero out the imaginary components of the diagonal of p11 in case the @@ -483,7 +477,7 @@ void PASTEMAC(ch,varname)( \ { \ for ( i = 0; i < p11_m; ++i ) \ { \ - ctype_r* pi11_i = p11_i + (i )*rs_p11 + (i )*cs_p11; \ + ctype_r* pi11_i = p11_i + (i )*rs_p + (i )*cs_p; \ \ PASTEMAC(chr,set0s)( *pi11_i ); \ } \ @@ -499,7 +493,7 @@ void PASTEMAC(ch,varname)( \ &kappa_r, \ &kappa_i, \ p11_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ else \ { \ @@ -509,7 +503,7 @@ void PASTEMAC(ch,varname)( \ &kappa_r, \ &kappa_i, \ p11_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ \ /* Update the p11 section of the ri panel. It simply needs @@ -520,9 +514,9 @@ void PASTEMAC(ch,varname)( \ for ( j = 0; j < p11_n; ++j ) \ for ( i = 0; i < p11_m; ++i ) \ { \ - ctype_r* pi11_r = p11_r + (i )*rs_p11 + (j )*cs_p11; \ - ctype_r* pi11_i = p11_i + (i )*rs_p11 + (j )*cs_p11; \ - ctype_r* pi11_rpi = p11_rpi + (i )*rs_p11 + (j )*cs_p11; \ + ctype_r* pi11_r = p11_r + (i )*rs_p + (j )*cs_p; \ + ctype_r* pi11_i = p11_i + (i )*rs_p + (j )*cs_p; \ + ctype_r* pi11_rpi = p11_rpi + (i )*rs_p + (j )*cs_p; \ \ PASTEMAC(chr,add3s)( *pi11_r, \ *pi11_i, \ @@ -590,12 +584,6 @@ void PASTEMAC(ch,varname)( \ ctype_r* p11_r = ( ctype_r* )p + (j )*ldp; \ ctype_r* p11_i = ( ctype_r* )p + is_p + (j )*ldp; \ ctype_r* p11_rpi = ( ctype_r* )p + 2*is_p + (j )*ldp; \ - inc_t cs_p11; \ - inc_t rs_p11; \ -\ - /* Compute the row and column strides of p11. */ \ - if ( row_stored ) { rs_p11 = rs_p; cs_p11 = 1; } \ - else /* if ( col_stored ) */ { rs_p11 = 1; cs_p11 = cs_p; } \ \ \ /* If the diagonal of c is implicitly unit, explicitly set the @@ -610,12 +598,12 @@ void PASTEMAC(ch,varname)( \ m_panel, \ n_panel, \ &kappa_r, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ PASTEMAC(chr,setd)( 0, \ m_panel, \ n_panel, \ &kappa_i, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ \ /* Update the diagonal of the p11 section of the rpi panel. It simply needs to contain the sum of diagonals of p11_r @@ -669,21 +657,21 @@ void PASTEMAC(ch,varname)( \ panel_dim, \ panel_dim, \ zero_r, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ PASTEMAC(chr,setm)( diagoffp11, \ BLIS_NONUNIT_DIAG, \ uplop11, \ panel_dim, \ panel_dim, \ zero_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ PASTEMAC(chr,setm)( diagoffp11, \ BLIS_NONUNIT_DIAG, \ uplop11, \ panel_dim, \ panel_dim, \ zero_r, \ - p11_rpi, rs_p11, cs_p11 ); \ + p11_rpi, rs_p, cs_p ); \ } \ } \ } diff --git a/frame/1m/packm/bli_packm_struc_cxk_4m.c b/frame/1m/packm/bli_packm_struc_cxk_4m.c index 40a92ea10..a5dcc0de2 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_4m.c +++ b/frame/1m/packm/bli_packm_struc_cxk_4m.c @@ -415,8 +415,6 @@ void PASTEMAC(ch,varname)( \ \ /* Pack the stored triangle of c11 to p11. */ \ { \ - inc_t cs_p11; \ - inc_t rs_p11; \ dim_t p11_m = panel_dim; \ dim_t p11_n = panel_dim; \ inc_t rs_c11 = 2*rs_c; \ @@ -432,10 +430,6 @@ void PASTEMAC(ch,varname)( \ ctype_r* alpha_i = ( bli_is_conj( conjc ) ? minus_one_r : one_r ); \ ctype_r kappa_r = PASTEMAC(ch,real)( *kappa ); \ ctype_r kappa_i = PASTEMAC(ch,imag)( *kappa ); \ -\ - /* Compute the row and column strides of p11. */ \ - if ( row_stored ) { rs_p11 = rs_p; cs_p11 = 1; } \ - else /* if ( col_stored ) */ { rs_p11 = 1; cs_p11 = cs_p; } \ \ /* Copy the real part of the stored triangle of c11 to p11_r. */ \ PASTEMAC(chr,scal2m)( 0, \ @@ -446,7 +440,7 @@ void PASTEMAC(ch,varname)( \ p11_n, \ alpha_r, \ c11_r, rs_c11, cs_c11, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ \ /* Copy the imaginary part of the stored triangle of c11 to p11_i, scaling by -1 if conjugation on c was requested. */ \ @@ -458,7 +452,7 @@ void PASTEMAC(ch,varname)( \ p11_n, \ alpha_i, \ c11_i, rs_c11, cs_c11, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ \ /* If source matrix c is Hermitian, we have to zero out the imaginary components of the diagonal of p11 in case the @@ -467,7 +461,7 @@ void PASTEMAC(ch,varname)( \ { \ for ( i = 0; i < p11_m; ++i ) \ { \ - ctype_r* pi11_i = p11_i + (i )*rs_p11 + (i )*cs_p11; \ + ctype_r* pi11_i = p11_i + (i )*rs_p + (i )*cs_p; \ \ PASTEMAC(chr,set0s)( *pi11_i ); \ } \ @@ -483,7 +477,7 @@ void PASTEMAC(ch,varname)( \ &kappa_r, \ &kappa_i, \ p11_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ else \ { \ @@ -493,7 +487,7 @@ void PASTEMAC(ch,varname)( \ &kappa_r, \ &kappa_i, \ p11_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ /* PASTEMAC(chr,fprintm)( stdout, "packm_herm_cxk: ap_r copied", m_panel_max, n_panel_max, \ @@ -561,13 +555,6 @@ void PASTEMAC(ch,varname)( \ dim_t j = bli_abs( diagoffp ); \ ctype_r* p11_r = ( ctype_r* )p + (j )*ldp; \ ctype_r* p11_i = ( ctype_r* )p + is_p + (j )*ldp; \ - inc_t cs_p11; \ - inc_t rs_p11; \ -\ - /* Compute the row and column strides of p11. */ \ - if ( row_stored ) { rs_p11 = rs_p; cs_p11 = 1; } \ - else /* if ( col_stored ) */ { rs_p11 = 1; cs_p11 = cs_p; } \ -\ \ /* If the diagonal of c is implicitly unit, explicitly set the the diagonal of the packed panel to kappa. */ \ @@ -580,12 +567,12 @@ void PASTEMAC(ch,varname)( \ m_panel, \ n_panel, \ &kappa_r, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ PASTEMAC(chr,setd)( 0, \ m_panel, \ n_panel, \ &kappa_i, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ \ \ @@ -626,14 +613,14 @@ void PASTEMAC(ch,varname)( \ panel_dim, \ panel_dim, \ zero_r, \ - p11_r, rs_p11, cs_p11 ); \ + p11_r, rs_p, cs_p ); \ PASTEMAC(chr,setm)( diagoffp11, \ BLIS_NONUNIT_DIAG, \ uplop11, \ panel_dim, \ panel_dim, \ zero_r, \ - p11_i, rs_p11, cs_p11 ); \ + p11_i, rs_p, cs_p ); \ } \ } \ }