Skip to content

Commit 9f13b2c

Browse files
SrangrangSrangrang
committed
style: modify HALF to BFLOAT16 in benchmark folder
1 parent ec14e16 commit 9f13b2c

File tree

4 files changed

+43
-31
lines changed

4 files changed

+43
-31
lines changed

‎benchmark/Makefile‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,15 @@ GOTO_LAPACK_TARGETS=
5656
endif
5757

5858
ifeq ($(BUILD_BFLOAT16),1)
59-
GOTO_HALF_TARGETS=sbgemm.goto
59+
GOTO_BFLOAT_TARGETS=sbgemm.goto
6060
else
61-
GOTO_HALF_TARGETS=
61+
GOTO_BFLOAT_TARGETS=
62+
endif
63+
64+
ifeq ($(BUILD_HFLOAT16),1)
65+
GOTO_HFLOAT_TARGETS=shgemm.goto
66+
else
67+
GOTO_HFLOAT_TARGETS=
6268
endif
6369

6470
ifeq ($(OSNAME), WINNT)
@@ -104,7 +110,7 @@ goto :: slinpack.goto dlinpack.goto clinpack.goto zlinpack.goto \
104110
spotrf.goto dpotrf.goto cpotrf.goto zpotrf.goto \
105111
ssymm.goto dsymm.goto csymm.goto zsymm.goto \
106112
somatcopy.goto domatcopy.goto comatcopy.goto zomatcopy.goto \
107-
saxpby.goto daxpby.goto caxpby.goto zaxpby.goto $(GOTO_HALF_TARGETS)
113+
saxpby.goto daxpby.goto caxpby.goto zaxpby.goto $(GOTO_BFLOAT_TARGETS) $(GOTO_HFLOAT_TARGETS)
108114

109115
acml :: slinpack.acml dlinpack.acml clinpack.acml zlinpack.acml \
110116
scholesky.acml dcholesky.acml ccholesky.acml zcholesky.acml \
@@ -278,7 +284,7 @@ goto :: sgemm.goto dgemm.goto cgemm.goto zgemm.goto \
278284
smin.goto dmin.goto \
279285
saxpby.goto daxpby.goto caxpby.goto zaxpby.goto \
280286
somatcopy.goto domatcopy.goto comatcopy.goto zomatcopy.goto \
281-
snrm2.goto dnrm2.goto scnrm2.goto dznrm2.goto $(GOTO_LAPACK_TARGETS) $(GOTO_HALF_TARGETS)
287+
snrm2.goto dnrm2.goto scnrm2.goto dznrm2.goto $(GOTO_LAPACK_TARGETS) $(GOTO_BFLOAT_TARGETS) $(GOTO_HFLOAT_TARGETS)
282288

283289
acml :: slinpack.acml dlinpack.acml clinpack.acml zlinpack.acml \
284290
scholesky.acml dcholesky.acml ccholesky.acml zcholesky.acml \
@@ -633,6 +639,11 @@ sbgemm.goto : sbgemm.$(SUFFIX) ../$(LIBNAME)
633639
$(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) -lm
634640
endif
635641

642+
ifeq ($(BUILD_HFLOAT16),1)
643+
shgemm.goto : shgemm.$(SUFFIX) ../$(LIBNAME)
644+
$(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) -lm
645+
endif
646+
636647
sgemm.goto : sgemm.$(SUFFIX) ../$(LIBNAME)
637648
$(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) -lm
638649

@@ -2960,7 +2971,12 @@ zcholesky.$(SUFFIX) : cholesky.c
29602971

29612972
ifeq ($(BUILD_BFLOAT16),1)
29622973
sbgemm.$(SUFFIX) : gemm.c
2963-
$(CC) $(CFLAGS) -c -DHALF -UCOMPLEX -UDOUBLE -o $(@F) $^
2974+
$(CC) $(CFLAGS) -c -DBFLOAT16 -UCOMPLEX -UDOUBLE -o $(@F) $^
2975+
endif
2976+
2977+
ifeq ($(BUILD_HFLOAT16),1)
2978+
shgemm.$(SUFFIX) : gemm.c
2979+
$(CC) $(CFLAGS) -c -DHFLOAT16 -UCOMPLEX -UDOUBLE -o $(@F) $^
29642980
endif
29652981

29662982
sgemm.$(SUFFIX) : gemm.c

‎benchmark/gemm.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,17 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333

3434
#ifdef DOUBLE
3535
#define GEMM BLASFUNC(dgemm)
36-
#elif defined(HALF)
36+
#elif defined(BFLOAT16)
3737
#define GEMM BLASFUNC(sbgemm)
38+
#undef IFLOAT
39+
#define IFLOAT bfloat16
3840
#elif defined(HFLOAT16)
3941
#define GEMM BLASFUNC(shgemm)
42+
#undef IFLOAT
43+
#define IFLOAT hfloat16
4044
#else
4145
#define GEMM BLASFUNC(sgemm)
46+
#define IFLOAT float
4247
#endif
4348

4449
#else

‎driver/level3/Makefile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,16 @@ endif
351351
all ::
352352

353353
sbgemm_nn.$(SUFFIX) : gemm.c level3.c ../../param.h
354-
$(CC) $(CFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
354+
$(CC) $(CFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
355355

356356
sbgemm_nt.$(SUFFIX) : gemm.c level3.c ../../param.h
357-
$(CC) $(CFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
357+
$(CC) $(CFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
358358

359359
sbgemm_tn.$(SUFFIX) : gemm.c level3.c ../../param.h
360-
$(CC) $(CFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
360+
$(CC) $(CFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
361361

362362
sbgemm_tt.$(SUFFIX) : gemm.c level3.c ../../param.h
363-
$(CC) $(CFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
363+
$(CC) $(CFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
364364

365365
shgemm_nn.$(SUFFIX) : gemm.c level3.c ../../param.h
366366
$(CC) $(CFLAGS) $(BLOCKS) -c -DHFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
@@ -570,16 +570,16 @@ beta_thread.$(SUFFIX) : beta_thread.c ../../common.h
570570
$(CC) -c $(CFLAGS) $< -o $(@F)
571571

572572
sbgemm_thread_nn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
573-
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
573+
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
574574

575575
sbgemm_thread_nt.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
576-
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
576+
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
577577

578578
sbgemm_thread_tn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
579-
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
579+
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
580580

581581
sbgemm_thread_tt.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
582-
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
582+
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
583583

584584
shgemm_thread_nn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
585585
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
@@ -2767,16 +2767,16 @@ xtrsm_RCLN.$(SUFFIX) : trsm_R.c
27672767
$(CC) -c $(CFLAGS) -DCOMPLEX -DXDOUBLE -DTRANSA -UUPPER -UUNIT -DCONJ $< -o $(@F)
27682768

27692769
sbgemm_nn.$(PSUFFIX) : gemm.c level3.c ../../param.h
2770-
$(CC) $(PFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
2770+
$(CC) $(PFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
27712771

27722772
sbgemm_nt.$(PSUFFIX) : gemm.c level3.c ../../param.h
2773-
$(CC) $(PFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
2773+
$(CC) $(PFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
27742774

27752775
sbgemm_tn.$(PSUFFIX) : gemm.c level3.c ../../param.h
2776-
$(CC) $(PFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
2776+
$(CC) $(PFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
27772777

27782778
sbgemm_tt.$(PSUFFIX) : gemm.c level3.c ../../param.h
2779-
$(CC) $(PFLAGS) $(BLOCKS) -c -DHALF -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
2779+
$(CC) $(PFLAGS) $(BLOCKS) -c -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
27802780

27812781
shgemm_nn.$(PSUFFIX) : gemm.c level3.c ../../param.h
27822782
$(CC) $(PFLAGS) $(BLOCKS) -c -DHFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
@@ -3002,16 +3002,16 @@ zgemm_batch_thread.$(SUFFIX) : gemm_batch_thread.c ../../common.h
30023002

30033003

30043004
sbgemm_thread_nn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
3005-
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
3005+
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)
30063006

30073007
sbgemm_thread_nt.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
3008-
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
3008+
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DNT $< -o $(@F)
30093009

30103010
sbgemm_thread_tn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
3011-
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
3011+
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTN $< -o $(@F)
30123012

30133013
sbgemm_thread_tt.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
3014-
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHALF -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
3014+
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DBFLOAT16 -UDOUBLE -UCOMPLEX -DTT $< -o $(@F)
30153015

30163016
shgemm_thread_nn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
30173017
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DHFLOAT16 -UDOUBLE -UCOMPLEX -DNN $< -o $(@F)

‎kernel/x86_64/KERNEL.HASWELL‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,3 @@ DASUMKERNEL = dasum.c
106106

107107
SROTKERNEL = srot.c
108108
DROTKERNEL = drot.c
109-
110-
111-
ifeq ($(BUILD_BFLOAT16), 1)
112-
SHGEMMKERNEL = ../generic/gemmkernel_2x2.c
113-
SHGEMMONCOPY = ../generic/gemm_ncopy_2.c
114-
SHGEMMOTCOPY = ../generic/gemm_tcopy_2.c
115-
SHGEMMONCOPYOBJ = shgemm_oncopy$(TSUFFIX).$(SUFFIX)
116-
SHGEMMOTCOPYOBJ = shgemm_otcopy$(TSUFFIX).$(SUFFIX)
117-
endif

0 commit comments

Comments
 (0)