Skip to content

Relax alignment constraints #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devinamatthews merged 2 commits into from
Jan 11, 2022
Merged

Relax alignment constraints #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0ddce9
Relax alignment constraints
devinamatthews Jan 10, 2022
8fa2e2e
Fix row-/column-major pref. in 16x8 haswell sgemm ukr (unused)
devinamatthews Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions frame/include/bli_edge_case_macro_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@

// Helper macros for edge-case handling within gemm microkernels.

#define GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major) \
#define GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major,alignment) \
\
PASTEMAC(ch,ctype)* restrict _beta = beta; \
PASTEMAC(ch,ctype)* restrict _c = c; \
const inc_t _rs_c = rs_c; \
const inc_t _cs_c = cs_c; \
PASTEMAC(ch,ctype) _ct[ BLIS_STACK_BUF_MAX_SIZE / sizeof( PASTEMAC(ch,type) ) ] \
__attribute__((aligned(BLIS_STACK_BUF_ALIGN_SIZE))); \
__attribute__((aligned(alignment))); \
const inc_t _rs_ct = row_major ? nr : 1; \
const inc_t _cs_ct = row_major ? 1 : mr;

Expand All @@ -64,27 +64,27 @@

#define GEMM_UKR_SETUP_CT(ch,mr,nr,row_major) \
\
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major); \
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major,1); \
const bool _use_ct = ( row_major ? cs_c != 1 : rs_c != 1 ) || \
m != mr || n != nr; \
GEMM_UKR_SETUP_CT_POST(ch);

#define GEMM_UKR_SETUP_CT_AMBI(ch,mr,nr,row_major) \
\
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major); \
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major,1); \
const bool _use_ct = ( cs_c != 1 && rs_c != 1 ) || \
m != mr || n != nr; \
GEMM_UKR_SETUP_CT_POST(ch);

#define GEMM_UKR_SETUP_CT_ANY(ch,mr,nr,row_major) \
\
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major); \
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major,1); \
const bool _use_ct = m != mr || n != nr; \
GEMM_UKR_SETUP_CT_POST(ch);

#define GEMM_UKR_SETUP_CT_ALIGNED(ch,mr,nr,row_major,alignment) \
\
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major); \
GEMM_UKR_SETUP_CT_PRE(ch,mr,nr,row_major,alignment); \
const bool _use_ct = ( row_major ? cs_c != 1 : rs_c != 1 ) || \
m != mr || n != nr || \
( (uintptr_t)_c % alignment ) || \
Expand Down
2 changes: 1 addition & 1 deletion kernels/haswell/3/bli_gemm_haswell_asm_d8x6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void bli_sgemm_haswell_asm_16x6
uint64_t rs_c = rs_c0;
uint64_t cs_c = cs_c0;

GEMM_UKR_SETUP_CT( s, 16, 6, true );
GEMM_UKR_SETUP_CT( s, 16, 6, false );

begin_asm()

Expand Down