Skip to content

Commit 09414a4

Browse files
authored
Ensure that GEMMTR name appears in XERBLA if gemmt was called as such
1 parent c139b63 commit 09414a4

File tree

3 files changed

+31
-8
lines changed

3 files changed

+31
-8
lines changed

interface/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ endif ()
109109
GenerateNamedObjects("trsm.c" "TRMM" "trmm" ${CBLAS_FLAG})
110110

111111
# gemmtr is gemmt under the name adopted by the Reference BLAS
112-
GenerateNamedObjects("gemm.c" "" "gemmtr" ${CBLAS_FLAG})
112+
GenerateNamedObjects("gemm.c" "RNAME" "gemmtr" ${CBLAS_FLAG})
113113

114114
# max and imax are compiled 4 times
115115
GenerateNamedObjects("max.c" "" "" ${CBLAS_FLAG})
@@ -126,7 +126,7 @@ if (BUILD_BFLOAT16)
126126
GenerateNamedObjects("bf16dot.c" "" "sbdot" ${CBLAS_FLAG} "" "" true "BFLOAT16")
127127
GenerateNamedObjects("gemm.c" "" "sbgemm" ${CBLAS_FLAG} "" "" true "BFLOAT16")
128128
GenerateNamedObjects("gemmt.c" "" "sbgemmt" ${CBLAS_FLAG} "" "" true "BFLOAT16")
129-
GenerateNamedObjects("gemmt.c" "" "sbgemmtr" ${CBLAS_FLAG} "" "" true "BFLOAT16")
129+
GenerateNamedObjects("gemmt.c" "RNAME" "sbgemmtr" ${CBLAS_FLAG} "" "" true "BFLOAT16")
130130
GenerateNamedObjects("sbgemv.c" "" "sbgemv" ${CBLAS_FLAG} "" "" true "BFLOAT16")
131131
GenerateNamedObjects("tobf16.c" "SINGLE_PREC" "sbstobf16" ${CBLAS_FLAG} "" "" true "BFLOAT16")
132132
GenerateNamedObjects("tobf16.c" "DOUBLE_PREC" "sbdtobf16" ${CBLAS_FLAG} "" "" true "BFLOAT16")

interface/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ sbgemm.$(SUFFIX) sbgemm.$(PSUFFIX) : gemm.c ../param.h
13061306
sbgemmt.$(SUFFIX) sbgemmt.$(PSUFFIX) : sbgemmt.c ../param.h
13071307
$(CC) -c $(CFLAGS) $< -o $(@F)
13081308
sbgemmtr.$(SUFFIX) sbgemmtr.$(PSUFFIX) : sbgemmt.c ../param.h
1309-
$(CC) -c $(CFLAGS) $< -o $(@F)
1309+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13101310
endif
13111311

13121312
sgemm.$(SUFFIX) sgemm.$(PSUFFIX) : gemm.c ../param.h
@@ -1343,19 +1343,19 @@ zgemmt.$(SUFFIX) zgemmt.$(PSUFFIX) : gemmt.c ../param.h
13431343
$(CC) -c $(CFLAGS) $< -o $(@F)
13441344

13451345
sgemmtr.$(SUFFIX) sgemmtr.$(PSUFFIX) : gemmt.c ../param.h
1346-
$(CC) -c $(CFLAGS) $< -o $(@F)
1346+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13471347

13481348
dgemmtr.$(SUFFIX) dgemmtr.$(PSUFFIX) : gemmt.c ../param.h
1349-
$(CC) -c $(CFLAGS) $< -o $(@F)
1349+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13501350

13511351
qgemmtr.$(SUFFIX) qgemmtr.$(PSUFFIX) : gemmt.c ../param.h
1352-
$(CC) -c $(CFLAGS) $< -o $(@F)
1352+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13531353

13541354
cgemmtr.$(SUFFIX) cgemmtr.$(PSUFFIX) : gemmt.c ../param.h
1355-
$(CC) -c $(CFLAGS) $< -o $(@F)
1355+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13561356

13571357
zgemmtr.$(SUFFIX) zgemmtr.$(PSUFFIX) : gemmt.c ../param.h
1358-
$(CC) -c $(CFLAGS) $< -o $(@F)
1358+
$(CC) -c $(CFLAGS) -DRNAME $< -o $(@F)
13591359

13601360
ssymm.$(SUFFIX) ssymm.$(PSUFFIX) : symm.c
13611361
$(CC) -c $(CFLAGS) $< -o $(@F)

interface/gemmt.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
#ifndef COMPLEX
4040
#define SMP_THRESHOLD_MIN 65536.0
41+
#ifdef RNAME
4142
#ifdef XDOUBLE
4243
#define ERROR_NAME "QGEMMT "
4344
#elif defined(DOUBLE)
@@ -48,7 +49,28 @@
4849
#define ERROR_NAME "SGEMMT "
4950
#endif
5051
#else
52+
#ifdef XDOUBLE
53+
#define ERROR_NAME "QGEMMTR"
54+
#elif defined(DOUBLE)
55+
#define ERROR_NAME "DGEMMTR"
56+
#elif defined(BFLOAT16)
57+
#define ERROR_NAME "SBGEMMTR"
58+
#else
59+
#define ERROR_NAME "SGEMMTR"
60+
#endif
61+
#endif
62+
#else
5163
#define SMP_THRESHOLD_MIN 8192.0
64+
#ifdef RNAME
65+
#ifdef XDOUBLE
66+
#define ERROR_NAME "XGEMMTR"
67+
#elif defined(DOUBLE)
68+
#define ERROR_NAME "ZGEMMTR"
69+
#else
70+
#define ERROR_NAME "CGEMMTR"
71+
#endif
72+
#endif
73+
#else
5274
#ifdef XDOUBLE
5375
#define ERROR_NAME "XGEMMT "
5476
#elif defined(DOUBLE)
@@ -57,6 +79,7 @@
5779
#define ERROR_NAME "CGEMMT "
5880
#endif
5981
#endif
82+
#endif
6083

6184
#ifndef GEMM_MULTITHREAD_THRESHOLD
6285
#define GEMM_MULTITHREAD_THRESHOLD 4

0 commit comments

Comments
 (0)