diff --git a/frame/3/gemm/bli_gemm.h b/frame/3/gemm/bli_gemm.h index d9a9c9ef5..adabded54 100644 --- a/frame/3/gemm/bli_gemm.h +++ b/frame/3/gemm/bli_gemm.h @@ -40,7 +40,6 @@ #include "bli_gemm_blk_var1.h" #include "bli_gemm_blk_var2.h" #include "bli_gemm_blk_var3.h" -#include "bli_gemm_blk_var4.h" #include "bli_gemm_ker_var2.h" #include "bli_gemm_ker_var5.h" diff --git a/frame/3/gemm/bli_gemm_cntl.c b/frame/3/gemm/bli_gemm_cntl.c index 06a8ff955..0468807de 100644 --- a/frame/3/gemm/bli_gemm_cntl.c +++ b/frame/3/gemm/bli_gemm_cntl.c @@ -37,18 +37,19 @@ extern scalm_t* scalm_cntl; gemm_t* gemm_cntl; -gemm_t* gemm_cntl_packa; gemm_t* gemm_cntl_bp_ke; gemm_t* gemm_cntl_op_bp; gemm_t* gemm_cntl_mm_op; gemm_t* gemm_cntl_vl_mm; +#if 0 +gemm_t* gemm_cntl_packa; gemm_t* gemm_cntl_bp_ke5; gemm_t* gemm_cntl_pm_bp; gemm_t* gemm_cntl_mm_pm; gemm_t* gemm_cntl_vl_mm5; - +#endif packm_t* gemm_packa_cntl; packm_t* gemm_packb_cntl; packm_t* gemm_packc_cntl; @@ -60,7 +61,6 @@ blksz_t* gemm_kc; blksz_t* gemm_mr; blksz_t* gemm_nr; blksz_t* gemm_kr; -blksz_t* gemm_ni; void bli_gemm_cntl_init() @@ -96,11 +96,6 @@ void bli_gemm_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - gemm_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations. gemm_packa_cntl @@ -159,7 +154,7 @@ void bli_gemm_cntl_init() = bli_gemm_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -169,7 +164,6 @@ void bli_gemm_cntl_init() bli_gemm_cntl_obj_create( BLIS_BLOCKED, BLIS_VARIANT1, gemm_mc, - gemm_ni, NULL, gemm_packa_cntl, gemm_packb_cntl, @@ -188,7 +182,6 @@ void bli_gemm_cntl_init() NULL, NULL, NULL, - NULL, gemm_cntl_op_bp, NULL ); @@ -203,14 +196,13 @@ void bli_gemm_cntl_init() NULL, NULL, NULL, - NULL, gemm_cntl_mm_op, NULL ); // Alias the "master" gemm control tree to a shorter name. gemm_cntl = gemm_cntl_vl_mm; - +#if 0 // // Create a control tree for packing A, and streaming B and C. // @@ -227,7 +219,6 @@ void bli_gemm_cntl_init() BLIS_VARIANT3, gemm_kc, NULL, - NULL, gemm_packa_cntl, NULL, //gemm_packc_cntl, @@ -245,7 +236,6 @@ void bli_gemm_cntl_init() NULL, NULL, NULL, - NULL, gemm_cntl_pm_bp, NULL ); @@ -258,11 +248,11 @@ void bli_gemm_cntl_init() NULL, NULL, NULL, - NULL, gemm_cntl_mm_pm, NULL ); gemm_cntl_packa = gemm_cntl_vl_mm5; +#endif } void bli_gemm_cntl_finalize() @@ -273,7 +263,6 @@ void bli_gemm_cntl_finalize() bli_blksz_obj_free( gemm_mr ); bli_blksz_obj_free( gemm_nr ); bli_blksz_obj_free( gemm_kr ); - bli_blksz_obj_free( gemm_ni ); bli_cntl_obj_free( gemm_packa_cntl ); bli_cntl_obj_free( gemm_packb_cntl ); @@ -285,16 +274,17 @@ void bli_gemm_cntl_finalize() bli_cntl_obj_free( gemm_cntl_mm_op ); bli_cntl_obj_free( gemm_cntl_vl_mm ); +#if 0 bli_cntl_obj_free( gemm_cntl_bp_ke5 ); bli_cntl_obj_free( gemm_cntl_pm_bp ); bli_cntl_obj_free( gemm_cntl_mm_pm ); bli_cntl_obj_free( gemm_cntl_vl_mm5 ); +#endif } gemm_t* bli_gemm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_packm_a, packm_t* sub_packm_b, @@ -309,7 +299,6 @@ gemm_t* bli_gemm_cntl_obj_create( impl_t impl_type, cntl->impl_type = impl_type; cntl->var_num = var_num; cntl->b = b; - cntl->b_aux = b_aux; cntl->sub_scalm = sub_scalm; cntl->sub_packm_a = sub_packm_a; cntl->sub_packm_b = sub_packm_b; diff --git a/frame/3/gemm/bli_gemm_cntl.h b/frame/3/gemm/bli_gemm_cntl.h index f6fd2bb5f..9d3ef7941 100644 --- a/frame/3/gemm/bli_gemm_cntl.h +++ b/frame/3/gemm/bli_gemm_cntl.h @@ -37,7 +37,6 @@ struct gemm_s impl_t impl_type; varnum_t var_num; blksz_t* b; - blksz_t* b_aux; struct scalm_s* sub_scalm; struct packm_s* sub_packm_a; struct packm_s* sub_packm_b; @@ -54,7 +53,6 @@ void bli_gemm_cntl_finalize( void ); gemm_t* bli_gemm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_pack_a, packm_t* sub_pack_b, diff --git a/frame/3/gemm/bli_gemm_int.c b/frame/3/gemm/bli_gemm_int.c index 30ab62cbe..7e1703943 100644 --- a/frame/3/gemm/bli_gemm_int.c +++ b/frame/3/gemm/bli_gemm_int.c @@ -47,7 +47,7 @@ static FUNCPTR_T vars[6][3] = { NULL, NULL, bli_gemm_blk_var1 }, { NULL, bli_gemm_ker_var2, bli_gemm_blk_var2 }, { NULL, NULL, bli_gemm_blk_var3 }, - { NULL, NULL, bli_gemm_blk_var4 }, + { NULL, NULL, NULL }, { NULL, bli_gemm_ker_var5, NULL }, { NULL, NULL, NULL } }; diff --git a/frame/3/gemm/bli_gemm_blk_var4.c b/frame/3/gemm/other/bli_gemm_blk_var4.c similarity index 100% rename from frame/3/gemm/bli_gemm_blk_var4.c rename to frame/3/gemm/other/bli_gemm_blk_var4.c diff --git a/frame/3/gemm/bli_gemm_blk_var4.h b/frame/3/gemm/other/bli_gemm_blk_var4.h similarity index 100% rename from frame/3/gemm/bli_gemm_blk_var4.h rename to frame/3/gemm/other/bli_gemm_blk_var4.h diff --git a/frame/3/hemm/bli_hemm_cntl.c b/frame/3/hemm/bli_hemm_cntl.c index eef0d9ff1..be350c9a2 100644 --- a/frame/3/hemm/bli_hemm_cntl.c +++ b/frame/3/hemm/bli_hemm_cntl.c @@ -54,7 +54,6 @@ blksz_t* hemm_kc; blksz_t* hemm_mr; blksz_t* hemm_nr; blksz_t* hemm_kr; -blksz_t* hemm_ni; void bli_hemm_cntl_init() @@ -90,11 +89,6 @@ void bli_hemm_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - hemm_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations. hemm_packa_cntl @@ -149,7 +143,7 @@ void bli_hemm_cntl_init() = bli_gemm_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -157,10 +151,8 @@ void bli_hemm_cntl_init() hemm_cntl_op_bp = bli_gemm_cntl_obj_create( BLIS_BLOCKED, - //BLIS_VARIANT4, // var1 with incremental pack in iter 0 BLIS_VARIANT1, hemm_mc, - hemm_ni, NULL, hemm_packa_cntl, hemm_packb_cntl, @@ -176,7 +168,6 @@ void bli_hemm_cntl_init() BLIS_VARIANT3, hemm_kc, NULL, - NULL, NULL, NULL, NULL, @@ -194,7 +185,6 @@ void bli_hemm_cntl_init() NULL, NULL, NULL, - NULL, hemm_cntl_mm_op, NULL ); @@ -210,7 +200,6 @@ void bli_hemm_cntl_finalize() bli_blksz_obj_free( hemm_mr ); bli_blksz_obj_free( hemm_nr ); bli_blksz_obj_free( hemm_kr ); - bli_blksz_obj_free( hemm_ni ); bli_cntl_obj_free( hemm_packa_cntl ); bli_cntl_obj_free( hemm_packb_cntl ); diff --git a/frame/3/her2k/bli_her2k_cntl.c b/frame/3/her2k/bli_her2k_cntl.c index 70bbabdc7..857e8d52a 100644 --- a/frame/3/her2k/bli_her2k_cntl.c +++ b/frame/3/her2k/bli_her2k_cntl.c @@ -55,7 +55,6 @@ blksz_t* her2k_kc; blksz_t* her2k_mr; blksz_t* her2k_nr; blksz_t* her2k_kr; -blksz_t* her2k_ni; void bli_her2k_cntl_init() @@ -91,11 +90,6 @@ void bli_her2k_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - her2k_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations. her2k_packa_cntl @@ -149,7 +143,7 @@ void bli_her2k_cntl_init() = bli_her2k_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -157,10 +151,8 @@ void bli_her2k_cntl_init() her2k_cntl_op_bp = bli_her2k_cntl_obj_create( BLIS_BLOCKED, - //BLIS_VARIANT4, // var1 with incremental pack in iter 0 BLIS_VARIANT1, her2k_mc, - her2k_ni, NULL, her2k_packa_cntl, her2k_packb_cntl, @@ -177,7 +169,6 @@ void bli_her2k_cntl_init() BLIS_VARIANT3, her2k_kc, NULL, - NULL, NULL, NULL, NULL, @@ -193,7 +184,6 @@ void bli_her2k_cntl_init() BLIS_VARIANT2, her2k_nc, NULL, - NULL, NULL, NULL, NULL, @@ -213,7 +203,6 @@ void bli_her2k_cntl_finalize() bli_blksz_obj_free( her2k_mr ); bli_blksz_obj_free( her2k_nr ); bli_blksz_obj_free( her2k_kr ); - bli_blksz_obj_free( her2k_ni ); bli_cntl_obj_free( her2k_packa_cntl ); bli_cntl_obj_free( her2k_packb_cntl ); @@ -229,7 +218,6 @@ void bli_her2k_cntl_finalize() her2k_t* bli_her2k_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_packm_a, packm_t* sub_packm_b, @@ -245,7 +233,6 @@ her2k_t* bli_her2k_cntl_obj_create( impl_t impl_type, cntl->impl_type = impl_type; cntl->var_num = var_num; cntl->b = b; - cntl->b_aux = b_aux; cntl->sub_scalm = sub_scalm; cntl->sub_packm_a = sub_packm_a; cntl->sub_packm_b = sub_packm_b; diff --git a/frame/3/her2k/bli_her2k_cntl.h b/frame/3/her2k/bli_her2k_cntl.h index 457e9ed01..4f4c6e654 100644 --- a/frame/3/her2k/bli_her2k_cntl.h +++ b/frame/3/her2k/bli_her2k_cntl.h @@ -37,7 +37,6 @@ struct her2k_s impl_t impl_type; varnum_t var_num; blksz_t* b; - blksz_t* b_aux; struct scalm_s* sub_scalm; struct packm_s* sub_packm_a; struct packm_s* sub_packm_b; @@ -55,7 +54,6 @@ void bli_her2k_cntl_finalize( void ); her2k_t* bli_her2k_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_pack_a, packm_t* sub_pack_b, diff --git a/frame/3/herk/bli_herk_cntl.c b/frame/3/herk/bli_herk_cntl.c index 44228f8f1..cb0df4377 100644 --- a/frame/3/herk/bli_herk_cntl.c +++ b/frame/3/herk/bli_herk_cntl.c @@ -54,7 +54,6 @@ blksz_t* herk_kc; blksz_t* herk_mr; blksz_t* herk_nr; blksz_t* herk_kr; -blksz_t* herk_ni; void bli_herk_cntl_init() @@ -90,11 +89,6 @@ void bli_herk_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - herk_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations. herk_packa_cntl @@ -149,7 +143,7 @@ void bli_herk_cntl_init() = bli_herk_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -157,10 +151,8 @@ void bli_herk_cntl_init() herk_cntl_op_bp = bli_herk_cntl_obj_create( BLIS_BLOCKED, - //BLIS_VARIANT4, // var1 with incremental pack in iter 0 BLIS_VARIANT1, herk_mc, - herk_ni, NULL, herk_packa_cntl, herk_packb_cntl, @@ -176,7 +168,6 @@ void bli_herk_cntl_init() BLIS_VARIANT3, herk_kc, NULL, - NULL, NULL, NULL, NULL, @@ -194,7 +185,6 @@ void bli_herk_cntl_init() NULL, NULL, NULL, - NULL, herk_cntl_mm_op, NULL ); @@ -210,7 +200,6 @@ void bli_herk_cntl_finalize() bli_blksz_obj_free( herk_mr ); bli_blksz_obj_free( herk_nr ); bli_blksz_obj_free( herk_kr ); - bli_blksz_obj_free( herk_ni ); bli_cntl_obj_free( herk_packa_cntl ); bli_cntl_obj_free( herk_packb_cntl ); @@ -226,7 +215,6 @@ void bli_herk_cntl_finalize() herk_t* bli_herk_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_packm_a, packm_t* sub_packm_b, @@ -241,7 +229,6 @@ herk_t* bli_herk_cntl_obj_create( impl_t impl_type, cntl->impl_type = impl_type; cntl->var_num = var_num; cntl->b = b; - cntl->b_aux = b_aux; cntl->sub_scalm = sub_scalm; cntl->sub_packm_a = sub_packm_a; cntl->sub_packm_b = sub_packm_b; diff --git a/frame/3/herk/bli_herk_cntl.h b/frame/3/herk/bli_herk_cntl.h index 1c6c1afcf..5a841528e 100644 --- a/frame/3/herk/bli_herk_cntl.h +++ b/frame/3/herk/bli_herk_cntl.h @@ -37,7 +37,6 @@ struct herk_s impl_t impl_type; varnum_t var_num; blksz_t* b; - blksz_t* b_aux; struct scalm_s* sub_scalm; struct packm_s* sub_packm_a; struct packm_s* sub_packm_b; @@ -54,7 +53,6 @@ void bli_herk_cntl_finalize( void ); herk_t* bli_herk_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_pack_a, packm_t* sub_pack_b, diff --git a/frame/3/trmm/bli_trmm_cntl.c b/frame/3/trmm/bli_trmm_cntl.c index 514d04a0f..f2c0e6fbe 100644 --- a/frame/3/trmm/bli_trmm_cntl.c +++ b/frame/3/trmm/bli_trmm_cntl.c @@ -101,11 +101,6 @@ void bli_trmm_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - trmm_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations (left side). trmm_l_packa_cntl @@ -195,7 +190,7 @@ void bli_trmm_cntl_init() = bli_trmm_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -205,7 +200,6 @@ void bli_trmm_cntl_init() bli_trmm_cntl_obj_create( BLIS_BLOCKED, BLIS_VARIANT1, trmm_mc, - trmm_ni, NULL, trmm_l_packa_cntl, trmm_l_packb_cntl, @@ -222,7 +216,6 @@ void bli_trmm_cntl_init() BLIS_VARIANT3, trmm_kc, NULL, - NULL, NULL, NULL, NULL, @@ -241,7 +234,6 @@ void bli_trmm_cntl_init() NULL, NULL, NULL, - NULL, trmm_l_cntl_mm_op, NULL, NULL ); @@ -253,7 +245,6 @@ void bli_trmm_cntl_init() bli_trmm_cntl_obj_create( BLIS_BLOCKED, BLIS_VARIANT1, trmm_mc, - trmm_ni, NULL, trmm_r_packa_cntl, trmm_r_packb_cntl, @@ -270,7 +261,6 @@ void bli_trmm_cntl_init() BLIS_VARIANT3, trmm_kc, NULL, - NULL, NULL, NULL, NULL, @@ -289,7 +279,6 @@ void bli_trmm_cntl_init() NULL, NULL, NULL, - NULL, trmm_r_cntl_mm_op, NULL, NULL ); @@ -307,7 +296,6 @@ void bli_trmm_cntl_finalize() bli_blksz_obj_free( trmm_mr ); bli_blksz_obj_free( trmm_nr ); bli_blksz_obj_free( trmm_kr ); - bli_blksz_obj_free( trmm_ni ); bli_cntl_obj_free( trmm_l_packa_cntl ); bli_cntl_obj_free( trmm_l_packb_cntl ); @@ -328,7 +316,6 @@ void bli_trmm_cntl_finalize() trmm_t* bli_trmm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_packm_a, packm_t* sub_packm_b, @@ -344,7 +331,6 @@ trmm_t* bli_trmm_cntl_obj_create( impl_t impl_type, cntl->impl_type = impl_type; cntl->var_num = var_num; cntl->b = b; - cntl->b_aux = b_aux; cntl->sub_scalm = sub_scalm; cntl->sub_packm_a = sub_packm_a; cntl->sub_packm_b = sub_packm_b; diff --git a/frame/3/trmm/bli_trmm_cntl.h b/frame/3/trmm/bli_trmm_cntl.h index e7ddff652..f618311db 100644 --- a/frame/3/trmm/bli_trmm_cntl.h +++ b/frame/3/trmm/bli_trmm_cntl.h @@ -37,7 +37,6 @@ struct trmm_s impl_t impl_type; varnum_t var_num; blksz_t* b; - blksz_t* b_aux; struct scalm_s* sub_scalm; struct packm_s* sub_packm_a; struct packm_s* sub_packm_b; @@ -55,7 +54,6 @@ void bli_trmm_cntl_finalize( void ); trmm_t* bli_trmm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_pack_a, packm_t* sub_pack_b, diff --git a/frame/3/trsm/bli_trsm_cntl.c b/frame/3/trsm/bli_trsm_cntl.c index d4a59295e..0370e395a 100644 --- a/frame/3/trsm/bli_trsm_cntl.c +++ b/frame/3/trsm/bli_trsm_cntl.c @@ -65,7 +65,6 @@ blksz_t* trsm_kc; blksz_t* trsm_mr; blksz_t* trsm_nr; blksz_t* trsm_kr; -blksz_t* trsm_ni; void bli_trsm_cntl_init() @@ -101,11 +100,6 @@ void bli_trsm_cntl_init() BLIS_DEFAULT_KR_C, BLIS_EXTEND_KR_C, BLIS_DEFAULT_KR_Z, BLIS_EXTEND_KR_Z ); - trsm_ni = bli_blksz_obj_create( BLIS_DEFAULT_NI_S, 0, - BLIS_DEFAULT_NI_D, 0, - BLIS_DEFAULT_NI_C, 0, - BLIS_DEFAULT_NI_Z, 0 ); - // Create control tree objects for packm operations (left side). trsm_l_packa_cntl @@ -191,7 +185,7 @@ void bli_trsm_cntl_init() = bli_trsm_cntl_obj_create( BLIS_UNB_OPT, BLIS_VARIANT2, - NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); // Create control tree object for outer panel (to block-panel) @@ -201,7 +195,6 @@ void bli_trsm_cntl_init() bli_trsm_cntl_obj_create( BLIS_BLOCKED, BLIS_VARIANT1, trsm_mc, - trsm_ni, NULL, trsm_l_packa_cntl, trsm_l_packb_cntl, @@ -218,7 +211,6 @@ void bli_trsm_cntl_init() BLIS_VARIANT3, trsm_kc, NULL, - NULL, NULL, NULL, NULL, @@ -237,7 +229,6 @@ void bli_trsm_cntl_init() NULL, NULL, NULL, - NULL, trsm_l_cntl_mm_op, NULL, NULL ); @@ -249,7 +240,6 @@ void bli_trsm_cntl_init() bli_trsm_cntl_obj_create( BLIS_BLOCKED, BLIS_VARIANT1, trsm_mc, - trsm_ni, NULL, trsm_r_packa_cntl, trsm_r_packb_cntl, @@ -266,7 +256,6 @@ void bli_trsm_cntl_init() BLIS_VARIANT3, trsm_kc, NULL, - NULL, NULL, NULL, NULL, @@ -285,7 +274,6 @@ void bli_trsm_cntl_init() NULL, NULL, NULL, - NULL, trsm_r_cntl_mm_op, NULL, NULL ); @@ -303,7 +291,6 @@ void bli_trsm_cntl_finalize() bli_blksz_obj_free( trsm_mr ); bli_blksz_obj_free( trsm_nr ); bli_blksz_obj_free( trsm_kr ); - bli_blksz_obj_free( trsm_ni ); bli_cntl_obj_free( trsm_l_packa_cntl ); bli_cntl_obj_free( trsm_l_packb_cntl ); @@ -324,7 +311,6 @@ void bli_trsm_cntl_finalize() trsm_t* bli_trsm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_packm_a, packm_t* sub_packm_b, @@ -340,7 +326,6 @@ trsm_t* bli_trsm_cntl_obj_create( impl_t impl_type, cntl->impl_type = impl_type; cntl->var_num = var_num; cntl->b = b; - cntl->b_aux = b_aux; cntl->sub_scalm = sub_scalm; cntl->sub_packm_a = sub_packm_a; cntl->sub_packm_b = sub_packm_b; diff --git a/frame/3/trsm/bli_trsm_cntl.h b/frame/3/trsm/bli_trsm_cntl.h index 711bd3841..e652319b6 100644 --- a/frame/3/trsm/bli_trsm_cntl.h +++ b/frame/3/trsm/bli_trsm_cntl.h @@ -37,7 +37,6 @@ struct trsm_s impl_t impl_type; varnum_t var_num; blksz_t* b; - blksz_t* b_aux; struct scalm_s* sub_scalm; struct packm_s* sub_packm_a; struct packm_s* sub_packm_b; @@ -55,7 +54,6 @@ void bli_trsm_cntl_finalize( void ); trsm_t* bli_trsm_cntl_obj_create( impl_t impl_type, varnum_t var_num, blksz_t* b, - blksz_t* b_aux, scalm_t* sub_scalm, packm_t* sub_pack_a, packm_t* sub_pack_b, diff --git a/frame/cntl/bli_cntl.h b/frame/cntl/bli_cntl.h index f1a1d050c..bdd4afe8c 100644 --- a/frame/cntl/bli_cntl.h +++ b/frame/cntl/bli_cntl.h @@ -65,7 +65,6 @@ void bli_cntl_obj_free( void* cntl ); #define cntl_impl_type( cntl ) cntl->impl_type #define cntl_var_num( cntl ) cntl->var_num #define cntl_blocksize( cntl ) cntl->b -#define cntl_blocksize_aux( cntl ) cntl->b_aux