Skip to content

Commit ded9a96

Browse files
authored
Merge pull request #5767 from martin-frbg/issue5763
Fix ARM64 DYNAMIC_ARCH unconditionally branching into the SME code for STRMM
2 parents 9a46ffb + 59cfea0 commit ded9a96

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

interface/symm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo,
374374
return;
375375
}
376376

377+
if (args.m == 0 || args.n == 0) return;
377378
#if !defined(COMPLEX) && !defined(DOUBLE) && !defined(BFLOAT16) && !defined(HFLOAT16)
378379
#if defined(ARCH_ARM64) && (defined(USE_SSYMM_KERNEL_DIRECT)||defined(DYNAMIC_ARCH))
379380
#if defined(DYNAMIC_ARCH)
@@ -383,7 +384,6 @@ if (strcmp(gotoblas_corename(), "armv9sme") == 0
383384
#endif
384385
)
385386
#endif
386-
if (args.m == 0 || args.n == 0) return;
387387
if (order == CblasRowMajor && m == lda && n == ldb && n == ldc)
388388
{
389389
if (Side == CblasLeft && Uplo == CblasUpper) {
@@ -398,8 +398,6 @@ if (strcmp(gotoblas_corename(), "armv9sme") == 0
398398

399399
#endif
400400

401-
if (args.m == 0 || args.n == 0) return;
402-
403401
IDEBUG_START;
404402

405403
FUNCTION_PROFILE_START();

interface/trsm.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,8 @@ void CNAME(enum CBLAS_ORDER order,
359359
return;
360360
}
361361

362+
if (args.m == 0 || args.n == 0) return;
363+
362364
#if !defined(COMPLEX) && !defined(DOUBLE) && !defined(BFLOAT16) && !defined(HFLOAT16)
363365
#if defined(ARCH_ARM64) && (defined(USE_STRMM_KERNEL_DIRECT)||defined(DYNAMIC_ARCH))
364366
#if defined(DYNAMIC_ARCH)
@@ -368,7 +370,6 @@ if (strcmp(gotoblas_corename(), "armv9sme") == 0
368370
#endif
369371
)
370372
#endif
371-
if (args.m == 0 || args.n == 0) return;
372373
if (order == CblasRowMajor && Diag == CblasNonUnit && Side == CblasLeft && m == lda && n == ldb) {
373374
if (Trans == CblasNoTrans) {
374375
(Uplo == CblasUpper ? STRMM_DIRECT_LNUN : STRMM_DIRECT_LNLN)(m, n, alpha, a, lda, b, ldb);
@@ -382,8 +383,6 @@ if (strcmp(gotoblas_corename(), "armv9sme") == 0
382383

383384
#endif
384385

385-
if ((args.m == 0) || (args.n == 0)) return;
386-
387386
IDEBUG_START;
388387

389388
FUNCTION_PROFILE_START();

0 commit comments

Comments
 (0)