amd/blis
1
0
Fork 0
mirror of https://github.com/amd/blis.git synced 2026-05-24 10:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused dt arg in bli_gks_query_ind_cntx().

Browse Source 
Details:
- Removed the num_t datatype argument from bli_gks_query_ind_cntx().
  This argument stopped being needed by the function in commit e9da642.
  Its only use in bli_gks_query_ind_cntx() was to be passed through to
  the context initialization function for the chosen induced method,
  but even then, commit log notes from e9da642 indicate that I could not
  recall why the datatype argument was ever needed by the context init
  function to begin with.
- Updated all invocations of bli_gks_query_ind_cntx() to omit the dt
  argument. Most of these invocations resided in various standalone test
  drivers (and the testsuite).
This commit is contained in:
Field G. Van Zee
2022-06-15 14:09:49 -05:00
parent 5677289245
commit d93df02334
20 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frame/3/bli_l3_oapi_ex.c
View File

@@ -102,7 +102,7 @@ void PASTEMAC(gemm,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -153,7 +153,7 @@ void PASTEMAC(gemmt,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -281,7 +281,7 @@ void PASTEMAC(hemm,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -331,7 +331,7 @@ void PASTEMAC(symm,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -381,7 +381,7 @@ void PASTEMAC(trmm3,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -487,7 +487,7 @@ void PASTEMAC(trmm,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )
@@ -534,7 +534,7 @@ void PASTEMAC(trsm,BLIS_OAPI_EX_SUF)
// If necessary, obtain a valid context from the gks using the induced
// method id determined above.
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im, dt );
if ( cntx == NULL ) cntx = bli_gks_query_ind_cntx( im );
// Check the operands.
if ( bli_error_checking_is_enabled() )

3
frame/3/gemm/bli_gemm_md.c
View File

@@ -439,8 +439,7 @@ mddm_t bli_gemm_md_rcc
// the target datatype. (The packm_blk_var1_md() function has "built-in"
// support for packing to 1r (and 1e) schemas, whereas the
// packm_blk_var1() function relies on packm kernels for packing to 1r.
const num_t dt_complex = bli_obj_dt( a );
const cntx_t* cntx_1m = bli_gks_query_ind_cntx( BLIS_1M, dt_complex );
const cntx_t* cntx_1m = bli_gks_query_ind_cntx( BLIS_1M );
const func_t* packm_1m_mr = bli_cntx_get_ukrs( BLIS_PACKM_MRXK_KER, cntx_1m );
const func_t* packm_1m_nr = bli_cntx_get_ukrs( BLIS_PACKM_NRXK_KER, cntx_1m );

5
frame/base/bli_gks.c
View File

@@ -509,8 +509,7 @@ static bli_pthread_mutex_t gks_mutex = BLIS_PTHREAD_MUTEX_INITIALIZER;
const cntx_t* bli_gks_query_ind_cntx
(
ind_t ind,
num_t dt
ind_t ind
)
{
bli_init_once();
@@ -675,7 +674,7 @@ const char* bli_gks_l3_ukr_impl_string( ukr_t ukr, ind_t method, num_t dt )
// Query the context for the current induced method and datatype, and
// then query the ukernel function pointer for the given datatype from
// that context.
const cntx_t* cntx = bli_gks_query_ind_cntx( method, dt );
const cntx_t* cntx = bli_gks_query_ind_cntx( method );
void_fp fp = bli_cntx_get_ukr_dt( dt, ukr, cntx );
// Check whether the ukernel function pointer is NULL for the given

2
frame/base/bli_gks.h
View File

@@ -50,7 +50,7 @@ BLIS_EXPORT_BLIS const cntx_t* bli_gks_query_nat_cntx( void );
const cntx_t* bli_gks_query_cntx_noinit( void );
BLIS_EXPORT_BLIS const cntx_t* bli_gks_query_ind_cntx( ind_t ind, num_t dt );
BLIS_EXPORT_BLIS const cntx_t* bli_gks_query_ind_cntx( ind_t ind );
BLIS_EXPORT_BLIS void bli_gks_init_ref_cntx( cntx_t* cntx );

4
frame/compat/extra/bla_gemm3m.c
View File

@@ -103,7 +103,7 @@ void PASTEF77(ch,blasname) \
abbreviated version of bli_gemm_ex() so that we can bypass
consideration of sup, which doesn't make sense in this context. */ \
{ \
cntx_t* cntx = ( cntx_t* )bli_gks_query_ind_cntx( BLIS_1M, dt ); \
cntx_t* cntx = ( cntx_t* )bli_gks_query_ind_cntx( BLIS_1M ); \
\
rntm_t rntm_l; \
rntm_t* rntm = &rntm_l; \
@@ -222,7 +222,7 @@ void PASTEF77(ch,blasname) \
abbreviated version of bli_gemm_ex() so that we can bypass
consideration of sup, which doesn't make sense in this context. */ \
{ \
cntx_t* cntx = ( cntx_t* )bli_gks_query_ind_cntx( BLIS_1M, dt ); \
cntx_t* cntx = ( cntx_t* )bli_gks_query_ind_cntx( BLIS_1M ); \
\
rntm_t rntm_l; \
rntm_t* rntm = &rntm_l; \

2
test/1m4m/test_gemm.c
View File

@@ -109,7 +109,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/3/test_gemm.c
View File

@@ -109,7 +109,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/3/test_hemm.c
View File

@@ -87,7 +87,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/3/test_herk.c
View File

@@ -89,7 +89,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/3/test_trmm.c
View File

@@ -92,7 +92,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/3/test_trsm.c
View File

@@ -92,7 +92,7 @@ int main( int argc, char** argv )
ind_t ind_mod = ind;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/skx/test_gemm.c
View File

@@ -94,7 +94,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/skx/test_hemm.c
View File

@@ -93,7 +93,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/skx/test_syrk.c
View File

@@ -92,7 +92,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/skx/test_trmm.c
View File

@@ -94,7 +94,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/thunderx2/test_gemm.c
View File

@@ -93,7 +93,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/thunderx2/test_hemm.c
View File

@@ -93,7 +93,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/thunderx2/test_syrk.c
View File

@@ -92,7 +92,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

2
test/studies/thunderx2/test_trmm.c
View File

@@ -94,7 +94,7 @@ int main( int argc, char** argv )
if ( ind == BLIS_3M1 ) ind_mod = BLIS_1M;
// Initialize a context for the current induced method and datatype.
cntx = bli_gks_query_ind_cntx( ind_mod, dt );
cntx = bli_gks_query_ind_cntx( ind_mod );
// Set k to the kc blocksize for the current datatype.
k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, cntx );

8
testsuite/src/test_libblis.c
View File

@@ -1080,9 +1080,11 @@ void libblis_test_output_params_struct( FILE* os, test_params_t* params )
bli_ind_oper_get_avail_impl_string( BLIS_GEMM, BLIS_DCOMPLEX ) );
libblis_test_fprintf_c( os, "\n" );
// Query a native context.
cntx_c = ( cntx_t* )bli_gks_query_ind_cntx( im, BLIS_SCOMPLEX );
cntx_z = ( cntx_t* )bli_gks_query_ind_cntx( im, BLIS_DCOMPLEX );
// Query a native context. NOTE: Now that we've removed the dt argument from
// bli_gks_query_ind_cntx(), we can consolidate cntx_c and cntx_z; there is
// no need to query two contexts since they are the same.
cntx_c = ( cntx_t* )bli_gks_query_ind_cntx( im );
cntx_z = ( cntx_t* )bli_gks_query_ind_cntx( im );
libblis_test_fprintf_c( os, "level-3 blocksizes c z \n" );
libblis_test_fprintf_c( os, " mc %7d %7d\n",