Relocated packm ukernel #includes.

Details:
- Consolidated the #include statements for packm ukernel headers from
  bli_packm_cxk.h, bli_packm_cxk_ri.h, and bli_packm_cxk_ri3.h to
  bli_packm.h.
- Comment/whitespace updates to bli_packm_blk_var3.c, _var4.c.
This commit is contained in:
Field G. Van Zee
2014-08-12 12:36:25 -05:00
parent 7f77856e25
commit 82dac98d90
6 changed files with 17 additions and 38 deletions

View File

@@ -52,3 +52,13 @@
#include "bli_packm_cxk.h"
#include "bli_packm_cxk_ri.h"
#include "bli_packm_cxk_ri3.h"
#include "bli_packm_ref_2xk.h"
#include "bli_packm_ref_4xk.h"
#include "bli_packm_ref_6xk.h"
#include "bli_packm_ref_8xk.h"
#include "bli_packm_ref_10xk.h"
#include "bli_packm_ref_12xk.h"
#include "bli_packm_ref_14xk.h"
#include "bli_packm_ref_16xk.h"

View File

@@ -314,8 +314,8 @@ void PASTEMAC(ch,varname)( \
\
p_begin = p_cast; \
\
for ( ic = ic0, ip = ip0, it = 0; it < num_iter; \
ic += ic_inc, ip += ip_inc, it += 1 ) \
for ( ic = ic0, ip = ip0, it = 0; it < num_iter; \
ic += ic_inc, ip += ip_inc, it += 1 ) \
{ \
panel_dim_i = bli_min( panel_dim_max, iter_dim - ic ); \
\
@@ -387,6 +387,7 @@ void PASTEMAC(ch,varname)( \
} \
\
\
/* NOTE: This value is usually LESS than (ps_p*3)/2. */ \
p_inc = ( ldp * panel_len_max_i * 3 ) / 2; \
\
/*
@@ -423,7 +424,7 @@ void PASTEMAC(ch,varname)( \
p_begin, rs_p, cs_p ); \
} \
\
/* NOTE: This value is equivalent to ps_p. */ \
/* NOTE: This value is equivalent to (ps_p*3)/2. */ \
p_inc = ( ldp * panel_len_max_i * 3 ) / 2; \
} \
else \
@@ -450,7 +451,7 @@ void PASTEMAC(ch,varname)( \
p_begin, rs_p, cs_p ); \
} \
\
/* NOTE: This value is equivalent to ps_p. */ \
/* NOTE: This value is equivalent to (ps_p*3)/2. */ \
p_inc = ( ldp * panel_len_max_i * 3 ) / 2; \
\
} \

View File

@@ -314,7 +314,7 @@ void PASTEMAC(ch,varname)( \
\
p_begin = p_cast; \
\
for ( ic = ic0, ip = ip0, it = 0; it < num_iter; \
for ( ic = ic0, ip = ip0, it = 0; it < num_iter; \
ic += ic_inc, ip += ip_inc, it += 1 ) \
{ \
panel_dim_i = bli_min( panel_dim_max, iter_dim - ic ); \
@@ -386,6 +386,7 @@ void PASTEMAC(ch,varname)( \
p_use, rs_p, cs_p ); \
} \
\
/* NOTE: This value is usually LESS than ps_p. */ \
p_inc = ldp * panel_len_max_i; \
\
/*

View File

@@ -32,17 +32,6 @@
*/
// Include headers for various packm kernels.
#include "bli_packm_ref_2xk.h"
#include "bli_packm_ref_4xk.h"
#include "bli_packm_ref_6xk.h"
#include "bli_packm_ref_8xk.h"
#include "bli_packm_ref_10xk.h"
#include "bli_packm_ref_12xk.h"
#include "bli_packm_ref_14xk.h"
#include "bli_packm_ref_16xk.h"
#undef GENTPROT
#define GENTPROT( ctype, ch, varname ) \
\

View File

@@ -32,17 +32,6 @@
*/
// Include headers for various packm kernels.
#include "bli_packm_ref_2xk.h"
#include "bli_packm_ref_4xk.h"
#include "bli_packm_ref_6xk.h"
#include "bli_packm_ref_8xk.h"
#include "bli_packm_ref_10xk.h"
#include "bli_packm_ref_12xk.h"
#include "bli_packm_ref_14xk.h"
#include "bli_packm_ref_16xk.h"
#undef GENTPROTCO
#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
\

View File

@@ -32,17 +32,6 @@
*/
// Include headers for various packm kernels.
#include "bli_packm_ref_2xk.h"
#include "bli_packm_ref_4xk.h"
#include "bli_packm_ref_6xk.h"
#include "bli_packm_ref_8xk.h"
#include "bli_packm_ref_10xk.h"
#include "bli_packm_ref_12xk.h"
#include "bli_packm_ref_14xk.h"
#include "bli_packm_ref_16xk.h"
#undef GENTPROTCO
#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
\