From 6e7de6ef84babb273dc5528a9b9d01f0febe394b Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Fri, 17 Mar 2017 12:10:24 -0500 Subject: [PATCH] Minor updates to test/3m4m. Details: - Updated initial problem size and increment in Makefile. - Updated code in test_gemm.c to correctly query kc from context. --- test/3m4m/Makefile | 4 ++-- test/3m4m/test_gemm.c | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/test/3m4m/Makefile b/test/3m4m/Makefile index 9e982032f..7e1fd33bb 100644 --- a/test/3m4m/Makefile +++ b/test/3m4m/Makefile @@ -209,9 +209,9 @@ STR_ST := -DTHR_STR=\"st\" STR_MT := -DTHR_STR=\"mt\" # Problem size specification -PDEF_ST := -DP_BEGIN=80 \ +PDEF_ST := -DP_BEGIN=40 \ -DP_END=2000 \ - -DP_INC=80 + -DP_INC=40 PDEF_MT := -DP_BEGIN=80 \ -DP_END=4000 \ diff --git a/test/3m4m/test_gemm.c b/test/3m4m/test_gemm.c index c8e9ec5d5..c00ca4e25 100644 --- a/test/3m4m/test_gemm.c +++ b/test/3m4m/test_gemm.c @@ -78,24 +78,20 @@ int main( int argc, char** argv ) n_input = -1; k_input = -1; -#if 0 - num_t dt_real = bli_datatype_proj_to_real( DT ); - cntx_t cntx; +#if 1 - bli_gemm_cntx_init( &cntx ); + cntx_t cntx; - // Extract the kc blocksize for the requested datatype and its - // real analogue. - dim_t kc = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, &cntx ); - dim_t kc_real = bli_cntx_get_blksz_def_dt( dt_real, BLIS_KC, &cntx ); + // Initialize a context for the current induced method and datatype. + bli_gemm_cntx_init( &cntx ); + + // Set k to the kc blocksize for the current datatype. + k_input = bli_cntx_get_blksz_def_dt( dt, BLIS_KC, &cntx ); + +#elif 0 + + k_input = 256; - // Assign the k dimension depending on which implementation is - // being tested. Note that the BLIS_NAT case handles the real - // domain cases as well as native complex. - if ( IND == BLIS_NAT ) k_input = kc; - else if ( IND == BLIS_3M1 ) k_input = kc_real / 3; - else if ( IND == BLIS_4M1A ) k_input = kc_real / 2; - else k_input = kc_real; #endif // Choose the char corresponding to the requested datatype.