From 6bbd4be769a9b344a55abe5ddaca1a99fd29f7b4 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 3 Feb 2014 13:15:25 -0600 Subject: [PATCH] Added 'f' on some gemm and trmm blocked variants. Details: - Added 'f' to some block variant files/functions to be consistent with other file/functions' naming convention. Here, the f indicates partitioning in the "forward" direction. --- frame/3/gemm/bli_gemm.h | 6 +++--- .../3/gemm/{bli_gemm_blk_var1.c => bli_gemm_blk_var1f.c} | 8 ++++---- .../3/gemm/{bli_gemm_blk_var3.h => bli_gemm_blk_var1f.h} | 8 ++++---- .../3/gemm/{bli_gemm_blk_var2.c => bli_gemm_blk_var2f.c} | 8 ++++---- .../3/gemm/{bli_gemm_blk_var1.h => bli_gemm_blk_var2f.h} | 8 ++++---- .../3/gemm/{bli_gemm_blk_var3.c => bli_gemm_blk_var3f.c} | 8 ++++---- .../bli_trmm_blk_var1.h => gemm/bli_gemm_blk_var3f.h} | 8 ++++---- frame/3/gemm/bli_gemm_int.c | 6 +++--- frame/3/trmm/bli_trmm.h | 2 +- .../3/trmm/{bli_trmm_blk_var1.c => bli_trmm_blk_var1f.c} | 8 ++++---- .../bli_gemm_blk_var2.h => trmm/bli_trmm_blk_var1f.h} | 8 ++++---- frame/3/trmm/bli_trmm_int.c | 8 ++++---- 12 files changed, 43 insertions(+), 43 deletions(-) rename frame/3/gemm/{bli_gemm_blk_var1.c => bli_gemm_blk_var1f.c} (96%) rename frame/3/gemm/{bli_gemm_blk_var3.h => bli_gemm_blk_var1f.h} (91%) rename frame/3/gemm/{bli_gemm_blk_var2.c => bli_gemm_blk_var2f.c} (96%) rename frame/3/gemm/{bli_gemm_blk_var1.h => bli_gemm_blk_var2f.h} (91%) rename frame/3/gemm/{bli_gemm_blk_var3.c => bli_gemm_blk_var3f.c} (96%) rename frame/3/{trmm/bli_trmm_blk_var1.h => gemm/bli_gemm_blk_var3f.h} (91%) rename frame/3/trmm/{bli_trmm_blk_var1.c => bli_trmm_blk_var1f.c} (96%) rename frame/3/{gemm/bli_gemm_blk_var2.h => trmm/bli_trmm_blk_var1f.h} (91%) diff --git a/frame/3/gemm/bli_gemm.h b/frame/3/gemm/bli_gemm.h index db1887c83..64a97777d 100644 --- a/frame/3/gemm/bli_gemm.h +++ b/frame/3/gemm/bli_gemm.h @@ -38,9 +38,9 @@ #include "bli_gemm_int.h" #include "bli_gemm_target.h" -#include "bli_gemm_blk_var1.h" -#include "bli_gemm_blk_var2.h" -#include "bli_gemm_blk_var3.h" +#include "bli_gemm_blk_var1f.h" +#include "bli_gemm_blk_var2f.h" +#include "bli_gemm_blk_var3f.h" #include "bli_gemm_ker_var2.h" #include "bli_gemm_ker_var5.h" diff --git a/frame/3/gemm/bli_gemm_blk_var1.c b/frame/3/gemm/bli_gemm_blk_var1f.c similarity index 96% rename from frame/3/gemm/bli_gemm_blk_var1.c rename to frame/3/gemm/bli_gemm_blk_var1f.c index 32268811b..e425f44fd 100644 --- a/frame/3/gemm/bli_gemm_blk_var1.c +++ b/frame/3/gemm/bli_gemm_blk_var1f.c @@ -34,10 +34,10 @@ #include "blis.h" -void bli_gemm_blk_var1( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ) +void bli_gemm_blk_var1f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ) { obj_t a1, a1_pack; obj_t b_pack; diff --git a/frame/3/gemm/bli_gemm_blk_var3.h b/frame/3/gemm/bli_gemm_blk_var1f.h similarity index 91% rename from frame/3/gemm/bli_gemm_blk_var3.h rename to frame/3/gemm/bli_gemm_blk_var1f.h index 0cde43be6..4e5bfcf36 100644 --- a/frame/3/gemm/bli_gemm_blk_var3.h +++ b/frame/3/gemm/bli_gemm_blk_var1f.h @@ -32,8 +32,8 @@ */ -void bli_gemm_blk_var3( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ); +void bli_gemm_blk_var1f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ); diff --git a/frame/3/gemm/bli_gemm_blk_var2.c b/frame/3/gemm/bli_gemm_blk_var2f.c similarity index 96% rename from frame/3/gemm/bli_gemm_blk_var2.c rename to frame/3/gemm/bli_gemm_blk_var2f.c index 7fed21e2c..c9f29ee7b 100644 --- a/frame/3/gemm/bli_gemm_blk_var2.c +++ b/frame/3/gemm/bli_gemm_blk_var2f.c @@ -34,10 +34,10 @@ #include "blis.h" -void bli_gemm_blk_var2( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ) +void bli_gemm_blk_var2f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ) { obj_t a_pack; obj_t b1, b1_pack; diff --git a/frame/3/gemm/bli_gemm_blk_var1.h b/frame/3/gemm/bli_gemm_blk_var2f.h similarity index 91% rename from frame/3/gemm/bli_gemm_blk_var1.h rename to frame/3/gemm/bli_gemm_blk_var2f.h index 78f36ce9e..01a4c175a 100644 --- a/frame/3/gemm/bli_gemm_blk_var1.h +++ b/frame/3/gemm/bli_gemm_blk_var2f.h @@ -32,8 +32,8 @@ */ -void bli_gemm_blk_var1( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ); +void bli_gemm_blk_var2f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ); diff --git a/frame/3/gemm/bli_gemm_blk_var3.c b/frame/3/gemm/bli_gemm_blk_var3f.c similarity index 96% rename from frame/3/gemm/bli_gemm_blk_var3.c rename to frame/3/gemm/bli_gemm_blk_var3f.c index d0cdc12e2..97bcd5d87 100644 --- a/frame/3/gemm/bli_gemm_blk_var3.c +++ b/frame/3/gemm/bli_gemm_blk_var3f.c @@ -34,10 +34,10 @@ #include "blis.h" -void bli_gemm_blk_var3( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ) +void bli_gemm_blk_var3f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ) { obj_t a1, a1_pack; obj_t b1, b1_pack; diff --git a/frame/3/trmm/bli_trmm_blk_var1.h b/frame/3/gemm/bli_gemm_blk_var3f.h similarity index 91% rename from frame/3/trmm/bli_trmm_blk_var1.h rename to frame/3/gemm/bli_gemm_blk_var3f.h index e8f2d6d0e..ba6716215 100644 --- a/frame/3/trmm/bli_trmm_blk_var1.h +++ b/frame/3/gemm/bli_gemm_blk_var3f.h @@ -32,8 +32,8 @@ */ -void bli_trmm_blk_var1( obj_t* a, - obj_t* b, - obj_t* c, - trmm_t* cntl ); +void bli_gemm_blk_var3f( obj_t* a, + obj_t* b, + obj_t* c, + gemm_t* cntl ); diff --git a/frame/3/gemm/bli_gemm_int.c b/frame/3/gemm/bli_gemm_int.c index 7e1703943..bc0a35472 100644 --- a/frame/3/gemm/bli_gemm_int.c +++ b/frame/3/gemm/bli_gemm_int.c @@ -44,9 +44,9 @@ typedef void (*FUNCPTR_T)( obj_t* a, static FUNCPTR_T vars[6][3] = { // unblocked optimized unblocked blocked - { 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_var1f }, + { NULL, bli_gemm_ker_var2, bli_gemm_blk_var2f }, + { NULL, NULL, bli_gemm_blk_var3f }, { NULL, NULL, NULL }, { NULL, bli_gemm_ker_var5, NULL }, { NULL, NULL, NULL } diff --git a/frame/3/trmm/bli_trmm.h b/frame/3/trmm/bli_trmm.h index 9e41c2f5f..c53893245 100644 --- a/frame/3/trmm/bli_trmm.h +++ b/frame/3/trmm/bli_trmm.h @@ -38,7 +38,7 @@ #include "bli_trmm_int.h" #include "bli_trmm_target.h" -#include "bli_trmm_blk_var1.h" +#include "bli_trmm_blk_var1f.h" #include "bli_trmm_blk_var2f.h" #include "bli_trmm_blk_var2b.h" diff --git a/frame/3/trmm/bli_trmm_blk_var1.c b/frame/3/trmm/bli_trmm_blk_var1f.c similarity index 96% rename from frame/3/trmm/bli_trmm_blk_var1.c rename to frame/3/trmm/bli_trmm_blk_var1f.c index b20931739..a21ff4876 100644 --- a/frame/3/trmm/bli_trmm_blk_var1.c +++ b/frame/3/trmm/bli_trmm_blk_var1f.c @@ -34,10 +34,10 @@ #include "blis.h" -void bli_trmm_blk_var1( obj_t* a, - obj_t* b, - obj_t* c, - trmm_t* cntl ) +void bli_trmm_blk_var1f( obj_t* a, + obj_t* b, + obj_t* c, + trmm_t* cntl ) { obj_t a1, a1_pack; obj_t b_pack; diff --git a/frame/3/gemm/bli_gemm_blk_var2.h b/frame/3/trmm/bli_trmm_blk_var1f.h similarity index 91% rename from frame/3/gemm/bli_gemm_blk_var2.h rename to frame/3/trmm/bli_trmm_blk_var1f.h index 620307827..c9fc004f7 100644 --- a/frame/3/gemm/bli_gemm_blk_var2.h +++ b/frame/3/trmm/bli_trmm_blk_var1f.h @@ -32,8 +32,8 @@ */ -void bli_gemm_blk_var2( obj_t* a, - obj_t* b, - obj_t* c, - gemm_t* cntl ); +void bli_trmm_blk_var1f( obj_t* a, + obj_t* b, + obj_t* c, + trmm_t* cntl ); diff --git a/frame/3/trmm/bli_trmm_int.c b/frame/3/trmm/bli_trmm_int.c index b78cda623..287205873 100644 --- a/frame/3/trmm/bli_trmm_int.c +++ b/frame/3/trmm/bli_trmm_int.c @@ -48,7 +48,7 @@ static FUNCPTR_T vars[2][2][4][3] = // lower { // unblocked optimized unblocked blocked - { NULL, NULL, bli_trmm_blk_var1 }, + { NULL, NULL, bli_trmm_blk_var1f }, { NULL, bli_trmm_ll_ker_var2, bli_trmm_blk_var2b }, { NULL, NULL, bli_trmm_blk_var3b }, { NULL, NULL, NULL }, @@ -56,7 +56,7 @@ static FUNCPTR_T vars[2][2][4][3] = // upper { // unblocked optimized unblocked blocked - { NULL, NULL, bli_trmm_blk_var1 }, + { NULL, NULL, bli_trmm_blk_var1f }, { NULL, bli_trmm_lu_ker_var2, bli_trmm_blk_var2f }, { NULL, NULL, bli_trmm_blk_var3f }, { NULL, NULL, NULL }, @@ -67,7 +67,7 @@ static FUNCPTR_T vars[2][2][4][3] = // lower { // unblocked optimized unblocked blocked - { NULL, NULL, bli_trmm_blk_var1 }, + { NULL, NULL, bli_trmm_blk_var1f }, { NULL, bli_trmm_rl_ker_var2, bli_trmm_blk_var2f }, { NULL, NULL, bli_trmm_blk_var3f }, { NULL, NULL, NULL }, @@ -75,7 +75,7 @@ static FUNCPTR_T vars[2][2][4][3] = // upper { // unblocked optimized unblocked blocked - { NULL, NULL, bli_trmm_blk_var1 }, + { NULL, NULL, bli_trmm_blk_var1f }, { NULL, bli_trmm_ru_ker_var2, bli_trmm_blk_var2b }, { NULL, NULL, bli_trmm_blk_var3b }, { NULL, NULL, NULL },