amd/blis
1
0
Fork 0
mirror of https://github.com/amd/blis.git synced 2026-07-09 08:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed thread auto-factorization macro constants.

Browse Source 
Details:
- Renamed the following C preprocessor macros whose fallback/default
  values are specified within frame/include/bli_kernel_macro_defs.h:

    BLIS_DEFAULT_MR_THREAD_MAX  -> BLIS_THREAD_MAX_IR
    BLIS_DEFAULT_NR_THREAD_MAX  -> BLIS_THREAD_MAX_JR
    BLIS_DEFAULT_M_THREAD_RATIO -> BLIS_THREAD_RATIO_M
    BLIS_DEFAULT_N_THREAD_RATIO -> BLIS_THREAD_RATIO_N

- Renamed the above cpp macro overrides within the knl, skx, and zen
  sub-configurations, as well as invocations of those macros in
  bli_rntm.c.
- Moved config/zen/bli_kernel.h to an 'old' directory as it is no longer
  used by any code within BLIS.
This commit is contained in:
Field G. Van Zee
2018-10-10 15:11:09 -05:00
parent e2a59400bd
commit 53a9ab1c85
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/knl/bli_family_knl.h
View File

@@ -38,11 +38,11 @@
// -- THREADING PARAMETERS -----------------------------------------------------
#define BLIS_DEFAULT_M_THREAD_RATIO 4
#define BLIS_DEFAULT_N_THREAD_RATIO 1
#define BLIS_THREAD_RATIO_M 4
#define BLIS_THREAD_RATIO_N 1
#define BLIS_DEFAULT_MR_THREAD_MAX 1
#define BLIS_DEFAULT_NR_THREAD_MAX 1
#define BLIS_THREAD_MAX_IR 1
#define BLIS_THREAD_MAX_JR 1
// -- MEMORY ALLOCATION --------------------------------------------------------

8
config/skx/bli_family_skx.h
View File

@@ -37,11 +37,11 @@
// -- THREADING PARAMETERS -----------------------------------------------------
#define BLIS_DEFAULT_M_THREAD_RATIO 3
#define BLIS_DEFAULT_N_THREAD_RATIO 2
#define BLIS_THREAD_RATIO_M 3
#define BLIS_THREAD_RATIO_N 2
#define BLIS_DEFAULT_MR_THREAD_MAX 1
#define BLIS_DEFAULT_NR_THREAD_MAX 4
#define BLIS_THREAD_MAX_IR 1
#define BLIS_THREAD_MAX_JR 4
// -- MEMORY ALLOCATION --------------------------------------------------------

4
config/zen/bli_family_zen.h
View File

@@ -39,8 +39,8 @@
// By default, it is effective to parallelize the outer loops.
// Setting these macros to 1 will force JR and IR inner loops
// to be not paralleized.
#define BLIS_DEFAULT_MR_THREAD_MAX 1
#define BLIS_DEFAULT_NR_THREAD_MAX 1
#define BLIS_THREAD_MAX_IR 1
#define BLIS_THREAD_MAX_JR 1
#define BLIS_ENABLE_ZEN_BLOCK_SIZES
//#define BLIS_ENABLE_SMALL_MATRIX

0
config/zen/bli_kernel.h → config/zen/old/bli_kernel.h
View File

8
frame/base/bli_rntm.c
View File

@@ -198,15 +198,15 @@ void bli_rntm_set_ways_from_rntm
pc = 1;
bli_partition_2x2( nt, m*BLIS_DEFAULT_M_THREAD_RATIO,
n*BLIS_DEFAULT_N_THREAD_RATIO, &ic, &jc );
bli_partition_2x2( nt, m*BLIS_THREAD_RATIO_M,
n*BLIS_THREAD_RATIO_N, &ic, &jc );
for ( ir = BLIS_DEFAULT_MR_THREAD_MAX ; ir > 1 ; ir-- )
for ( ir = BLIS_THREAD_MAX_IR ; ir > 1 ; ir-- )
{
if ( ic % ir == 0 ) { ic /= ir; break; }
}
for ( jr = BLIS_DEFAULT_NR_THREAD_MAX ; jr > 1 ; jr-- )
for ( jr = BLIS_THREAD_MAX_JR ; jr > 1 ; jr-- )
{
if ( jc % jr == 0 ) { jc /= jr; break; }
}

16
frame/include/bli_kernel_macro_defs.h
View File

@@ -38,20 +38,20 @@
// -- Define default threading parameters --------------------------------------
#ifndef BLIS_DEFAULT_M_THREAD_RATIO
#define BLIS_DEFAULT_M_THREAD_RATIO 2
#ifndef BLIS_THREAD_RATIO_M
#define BLIS_THREAD_RATIO_M 2
#endif
#ifndef BLIS_DEFAULT_N_THREAD_RATIO
#define BLIS_DEFAULT_N_THREAD_RATIO 1
#ifndef BLIS_THREAD_RATIO_N
#define BLIS_THREAD_RATIO_N 1
#endif
#ifndef BLIS_DEFAULT_MR_THREAD_MAX
#define BLIS_DEFAULT_MR_THREAD_MAX 1
#ifndef BLIS_THREAD_MAX_IR
#define BLIS_THREAD_MAX_IR 1
#endif
#ifndef BLIS_DEFAULT_NR_THREAD_MAX
#define BLIS_DEFAULT_NR_THREAD_MAX 4
#ifndef BLIS_THREAD_MAX_JR
#define BLIS_THREAD_MAX_JR 4
#endif