From 09414a4187fafe70aa4633e2ded1d3a1bbc4db14 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 6 Feb 2025 18:52:00 +0100 Subject: [PATCH 1/4] Ensure that GEMMTR name appears in XERBLA if gemmt was called as such --- interface/CMakeLists.txt | 4 ++-- interface/Makefile | 12 ++++++------ interface/gemmt.c | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 8d815c4521..c0d5896e17 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -109,7 +109,7 @@ endif () GenerateNamedObjects("trsm.c" "TRMM" "trmm" ${CBLAS_FLAG}) # gemmtr is gemmt under the name adopted by the Reference BLAS - GenerateNamedObjects("gemm.c" "" "gemmtr" ${CBLAS_FLAG}) + GenerateNamedObjects("gemm.c" "RNAME" "gemmtr" ${CBLAS_FLAG}) # max and imax are compiled 4 times GenerateNamedObjects("max.c" "" "" ${CBLAS_FLAG}) @@ -126,7 +126,7 @@ if (BUILD_BFLOAT16) GenerateNamedObjects("bf16dot.c" "" "sbdot" ${CBLAS_FLAG} "" "" true "BFLOAT16") GenerateNamedObjects("gemm.c" "" "sbgemm" ${CBLAS_FLAG} "" "" true "BFLOAT16") GenerateNamedObjects("gemmt.c" "" "sbgemmt" ${CBLAS_FLAG} "" "" true "BFLOAT16") - GenerateNamedObjects("gemmt.c" "" "sbgemmtr" ${CBLAS_FLAG} "" "" true "BFLOAT16") + GenerateNamedObjects("gemmt.c" "RNAME" "sbgemmtr" ${CBLAS_FLAG} "" "" true "BFLOAT16") GenerateNamedObjects("sbgemv.c" "" "sbgemv" ${CBLAS_FLAG} "" "" true "BFLOAT16") GenerateNamedObjects("tobf16.c" "SINGLE_PREC" "sbstobf16" ${CBLAS_FLAG} "" "" true "BFLOAT16") GenerateNamedObjects("tobf16.c" "DOUBLE_PREC" "sbdtobf16" ${CBLAS_FLAG} "" "" true "BFLOAT16") diff --git a/interface/Makefile b/interface/Makefile index c22e087c02..849d59bef6 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -1306,7 +1306,7 @@ sbgemm.$(SUFFIX) sbgemm.$(PSUFFIX) : gemm.c ../param.h sbgemmt.$(SUFFIX) sbgemmt.$(PSUFFIX) : sbgemmt.c ../param.h $(CC) -c $(CFLAGS) $< -o $(@F) sbgemmtr.$(SUFFIX) sbgemmtr.$(PSUFFIX) : sbgemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) endif sgemm.$(SUFFIX) sgemm.$(PSUFFIX) : gemm.c ../param.h @@ -1343,19 +1343,19 @@ zgemmt.$(SUFFIX) zgemmt.$(PSUFFIX) : gemmt.c ../param.h $(CC) -c $(CFLAGS) $< -o $(@F) sgemmtr.$(SUFFIX) sgemmtr.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) dgemmtr.$(SUFFIX) dgemmtr.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) qgemmtr.$(SUFFIX) qgemmtr.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) cgemmtr.$(SUFFIX) cgemmtr.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) zgemmtr.$(SUFFIX) zgemmtr.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) ssymm.$(SUFFIX) ssymm.$(PSUFFIX) : symm.c $(CC) -c $(CFLAGS) $< -o $(@F) diff --git a/interface/gemmt.c b/interface/gemmt.c index 01747af41b..cf01c4dcf7 100644 --- a/interface/gemmt.c +++ b/interface/gemmt.c @@ -38,6 +38,7 @@ #ifndef COMPLEX #define SMP_THRESHOLD_MIN 65536.0 +#ifdef RNAME #ifdef XDOUBLE #define ERROR_NAME "QGEMMT " #elif defined(DOUBLE) @@ -48,7 +49,28 @@ #define ERROR_NAME "SGEMMT " #endif #else +#ifdef XDOUBLE +#define ERROR_NAME "QGEMMTR" +#elif defined(DOUBLE) +#define ERROR_NAME "DGEMMTR" +#elif defined(BFLOAT16) +#define ERROR_NAME "SBGEMMTR" +#else +#define ERROR_NAME "SGEMMTR" +#endif +#endif +#else #define SMP_THRESHOLD_MIN 8192.0 +#ifdef RNAME +#ifdef XDOUBLE +#define ERROR_NAME "XGEMMTR" +#elif defined(DOUBLE) +#define ERROR_NAME "ZGEMMTR" +#else +#define ERROR_NAME "CGEMMTR" +#endif +#endif +#else #ifdef XDOUBLE #define ERROR_NAME "XGEMMT " #elif defined(DOUBLE) @@ -57,6 +79,7 @@ #define ERROR_NAME "CGEMMT " #endif #endif +#endif #ifndef GEMM_MULTITHREAD_THRESHOLD #define GEMM_MULTITHREAD_THRESHOLD 4 From 7c3e169b67c246e3e2fc1174c6b39e0f54e5d139 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 6 Feb 2025 19:21:08 +0100 Subject: [PATCH 2/4] Update gemmt.c --- interface/gemmt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/gemmt.c b/interface/gemmt.c index cf01c4dcf7..d63115f77d 100644 --- a/interface/gemmt.c +++ b/interface/gemmt.c @@ -69,7 +69,6 @@ #else #define ERROR_NAME "CGEMMTR" #endif -#endif #else #ifdef XDOUBLE #define ERROR_NAME "XGEMMT " From ff30ac96662e850fdc7f617dfd1a0078298b2229 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 6 Feb 2025 19:51:23 +0100 Subject: [PATCH 3/4] Update Makefile --- interface/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/Makefile b/interface/Makefile index 849d59bef6..f09a6f46b9 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -1304,7 +1304,7 @@ ifeq ($(BUILD_BFLOAT16),1) sbgemm.$(SUFFIX) sbgemm.$(PSUFFIX) : gemm.c ../param.h $(CC) -c $(CFLAGS) $< -o $(@F) sbgemmt.$(SUFFIX) sbgemmt.$(PSUFFIX) : sbgemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) sbgemmtr.$(SUFFIX) sbgemmtr.$(PSUFFIX) : sbgemmt.c ../param.h $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) endif @@ -1328,19 +1328,19 @@ xgemm.$(SUFFIX) xgemm.$(PSUFFIX) : gemm.c ../param.h $(CC) -c $(CFLAGS) $< -o $(@F) sgemmt.$(SUFFIX) sgemmt.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) dgemmt.$(SUFFIX) dgemmt.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) qgemmt.$(SUFFIX) qgemmt.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) cgemmt.$(SUFFIX) cgemmt.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) zgemmt.$(SUFFIX) zgemmt.$(PSUFFIX) : gemmt.c ../param.h - $(CC) -c $(CFLAGS) $< -o $(@F) + $(CC) -c $(CFLAGS) -URNAME $< -o $(@F) sgemmtr.$(SUFFIX) sgemmtr.$(PSUFFIX) : gemmt.c ../param.h $(CC) -c $(CFLAGS) -DRNAME $< -o $(@F) From db7e5f1fa751ec454155764dab93ab9554e73bdc Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 6 Feb 2025 21:26:20 +0100 Subject: [PATCH 4/4] Update gemmt.c --- interface/gemmt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/gemmt.c b/interface/gemmt.c index d63115f77d..bcccf5a747 100644 --- a/interface/gemmt.c +++ b/interface/gemmt.c @@ -40,23 +40,23 @@ #define SMP_THRESHOLD_MIN 65536.0 #ifdef RNAME #ifdef XDOUBLE -#define ERROR_NAME "QGEMMT " +#define ERROR_NAME "QGEMMTR" #elif defined(DOUBLE) -#define ERROR_NAME "DGEMMT " +#define ERROR_NAME "DGEMMTR" #elif defined(BFLOAT16) -#define ERROR_NAME "SBGEMMT " +#define ERROR_NAME "SBGEMMTR" #else -#define ERROR_NAME "SGEMMT " +#define ERROR_NAME "SGEMMTR" #endif #else #ifdef XDOUBLE -#define ERROR_NAME "QGEMMTR" +#define ERROR_NAME "QGEMMT " #elif defined(DOUBLE) -#define ERROR_NAME "DGEMMTR" +#define ERROR_NAME "DGEMMT " #elif defined(BFLOAT16) -#define ERROR_NAME "SBGEMMTR" +#define ERROR_NAME "SBGEMMT " #else -#define ERROR_NAME "SGEMMTR" +#define ERROR_NAME "SGEMMT " #endif #endif #else