Skip to content

Commit 424d551

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #53 from xianyi/develop
rebase
2 parents 5d58b11 + 596f5df commit 424d551

File tree

17 files changed

+159
-38
lines changed

17 files changed

+159
-38
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ test/SBLAT2.SUMM
7070
test/SBLAT3.SUMM
7171
test/ZBLAT2.SUMM
7272
test/ZBLAT3.SUMM
73+
test/SHBLAT3.SUMM
7374
test/cblat1
7475
test/cblat2
7576
test/cblat3
@@ -79,6 +80,7 @@ test/dblat3
7980
test/sblat1
8081
test/sblat2
8182
test/sblat3
83+
test/test_shgemm
8284
test/zblat1
8385
test/zblat2
8486
test/zblat3

‎CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,13 @@ if (NOT NO_LAPACK)
8686
list(APPEND SUBDIRS lapack)
8787
endif ()
8888

89+
if (NOT DEFINED BUILD_HALF)
90+
set (BUILD_HALF false)
91+
endif ()
8992
# set which float types we want to build for
9093
if (NOT DEFINED BUILD_SINGLE AND NOT DEFINED BUILD_DOUBLE AND NOT DEFINED BUILD_COMPLEX AND NOT DEFINED BUILD_COMPLEX16)
9194
# if none are defined, build for all
92-
set(BUILD_HALF true)
95+
# set(BUILD_HALF true)
9396
set(BUILD_SINGLE true)
9497
set(BUILD_DOUBLE true)
9598
set(BUILD_COMPLEX true)
@@ -121,7 +124,7 @@ if (BUILD_COMPLEX16)
121124
list(APPEND FLOAT_TYPES "ZCOMPLEX") # defines COMPLEX and DOUBLE
122125
endif ()
123126

124-
if (BUILD_SINGLE OR BUILD_HALF)
127+
if (BUILD_HALF)
125128
message(STATUS "Building Half Precision")
126129
list(APPEND FLOAT_TYPES "HALF") # defines nothing
127130
endif ()

‎Makefile.rule

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ COMMON_PROF = -pg
273273
#
274274
# CPP_THREAD_SAFETY_TEST = 1
275275

276+
277+
# If you want to enable the experimental BFLOAT16 support
278+
# BUILD_HALF = 1
276279
#
277280
# End of user configuration
278281
#

‎Makefile.system

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,6 +1124,10 @@ ifeq ($(USE_TLS), 1)
11241124
CCOMMON_OPT += -DUSE_TLS
11251125
endif
11261126

1127+
ifeq ($(BUILD_HALF), 1)
1128+
CCOMMON_OPT += -DBUILD_HALF
1129+
endif
1130+
11271131
CCOMMON_OPT += -DVERSION=\"$(VERSION)\"
11281132

11291133
ifndef SYMBOLPREFIX
@@ -1395,6 +1399,7 @@ export KERNELDIR
13951399
export FUNCTION_PROFILE
13961400
export TARGET_CORE
13971401
export NO_AVX512
1402+
export BUILD_HALF
13981403

13991404
export SHGEMM_UNROLL_M
14001405
export SHGEMM_UNROLL_N

‎cmake/kernel.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ macro(SetDefaultL1)
113113
set(ZSUMKERNEL zsum.S)
114114
set(QSUMKERNEL sum.S)
115115
set(XSUMKERNEL zsum.S)
116+
if (BUILD_HALF)
116117
set(SHAMINKERNEL ../arm/amin.c)
117118
set(SHAMAXKERNEL ../arm/amax.c)
118119
set(SHMAXKERNEL ../arm/max.c)
@@ -131,6 +132,7 @@ macro(SetDefaultL1)
131132
set(SHNRM2KERNEL ../arm/nrm2.c)
132133
set(SHSUMKERNEL ../arm/sum.c)
133134
set(SHSWAPKERNEL ../arm/swap.c)
135+
endif ()
134136
endmacro ()
135137

136138
macro(SetDefaultL2)
@@ -179,17 +181,19 @@ macro(SetDefaultL2)
179181
set(XHEMV_L_KERNEL ../generic/zhemv_k.c)
180182
set(XHEMV_V_KERNEL ../generic/zhemv_k.c)
181183
set(XHEMV_M_KERNEL ../generic/zhemv_k.c)
184+
if (BUILD_HALF)
182185
set(SHGEMVNKERNEL ../arm/gemv_n.c)
183186
set(SHGEMVTKERNEL ../arm/gemv_t.c)
184187
set(SHGERKERNEL ../generic/ger.c)
185-
188+
endif ()
186189
endmacro ()
187190

188191
macro(SetDefaultL3)
189192
set(SGEADD_KERNEL ../generic/geadd.c)
190193
set(DGEADD_KERNEL ../generic/geadd.c)
191194
set(CGEADD_KERNEL ../generic/zgeadd.c)
192195
set(ZGEADD_KERNEL ../generic/zgeadd.c)
196+
if (BUILD_HALF)
193197
set(SHGEADD_KERNEL ../generic/geadd.c)
194198
set(SHGEMMKERNEL ../generic/gemmkernel_2x2.c)
195199
set(SHGEMM_BETA ../generic/gemm_beta.c)
@@ -201,6 +205,6 @@ macro(SetDefaultL3)
201205
set(SHGEMMITCOPYOBJ shgemm_itcopy.o)
202206
set(SHGEMMONCOPYOBJ shgemm_oncopy.o)
203207
set(SHGEMMOTCOPYOBJ shgemm_otcopy.o)
204-
208+
endif ()
205209

206210
endmacro ()

‎common_param.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ typedef struct {
4747
int dtb_entries;
4848
int offsetA, offsetB, align;
4949

50-
#if 1
50+
#ifdef BUILD_HALF
5151
int shgemm_p, shgemm_q, shgemm_r;
5252
int shgemm_unroll_m, shgemm_unroll_n, shgemm_unroll_mn;
5353

@@ -1002,12 +1002,14 @@ extern gotoblas_t *gotoblas;
10021002

10031003
#define HAVE_EX_L2 gotoblas -> exclusive_cache
10041004

1005+
#ifdef BUILD_HALF
10051006
#define SHGEMM_P gotoblas -> shgemm_p
10061007
#define SHGEMM_Q gotoblas -> shgemm_q
10071008
#define SHGEMM_R gotoblas -> shgemm_r
10081009
#define SHGEMM_UNROLL_M gotoblas -> shgemm_unroll_m
10091010
#define SHGEMM_UNROLL_N gotoblas -> shgemm_unroll_n
10101011
#define SHGEMM_UNROLL_MN gotoblas -> shgemm_unroll_mn
1012+
#endif
10111013

10121014
#define SGEMM_P gotoblas -> sgemm_p
10131015
#define SGEMM_Q gotoblas -> sgemm_q
@@ -1086,6 +1088,7 @@ extern gotoblas_t *gotoblas;
10861088
#define HAVE_EX_L2 0
10871089
#endif
10881090

1091+
#ifdef BUILD_HALF
10891092
#define SHGEMM_P SHGEMM_DEFAULT_P
10901093
#define SHGEMM_Q SHGEMM_DEFAULT_Q
10911094
#define SHGEMM_R SHGEMM_DEFAULT_R
@@ -1096,6 +1099,7 @@ extern gotoblas_t *gotoblas;
10961099
#else
10971100
#define SHGEMM_UNROLL_MN MAX((SHGEMM_UNROLL_M), (SHGEMM_UNROLL_N))
10981101
#endif
1102+
#endif
10991103

11001104
#define SGEMM_P SGEMM_DEFAULT_P
11011105
#define SGEMM_Q SGEMM_DEFAULT_Q
@@ -1330,31 +1334,31 @@ extern gotoblas_t *gotoblas;
13301334
#endif
13311335

13321336
#ifndef SHGEMM_DEFAULT_R
1333-
#define SHGEMM_DEFAULT_R (((BUFFER_SIZE - ((SHGEMM_DEFAULT_P * SHGEMM_DEFAULT_Q * 4 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (SHGEMM_DEFAULT_Q * 4) - 15) & ~15)
1337+
#define SHGEMM_DEFAULT_R (((BUFFER_SIZE - ((SHGEMM_DEFAULT_P * SHGEMM_DEFAULT_Q * 4 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (SHGEMM_DEFAULT_Q * 4) - 15) & ~15UL)
13341338
#endif
13351339

13361340
#ifndef SGEMM_DEFAULT_R
1337-
#define SGEMM_DEFAULT_R (((BUFFER_SIZE - ((SGEMM_DEFAULT_P * SGEMM_DEFAULT_Q * 4 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (SGEMM_DEFAULT_Q * 4) - 15) & ~15)
1341+
#define SGEMM_DEFAULT_R (((BUFFER_SIZE - ((SGEMM_DEFAULT_P * SGEMM_DEFAULT_Q * 4 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (SGEMM_DEFAULT_Q * 4) - 15) & ~15UL)
13381342
#endif
13391343

13401344
#ifndef DGEMM_DEFAULT_R
1341-
#define DGEMM_DEFAULT_R (((BUFFER_SIZE - ((DGEMM_DEFAULT_P * DGEMM_DEFAULT_Q * 8 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (DGEMM_DEFAULT_Q * 8) - 15) & ~15)
1345+
#define DGEMM_DEFAULT_R (((BUFFER_SIZE - ((DGEMM_DEFAULT_P * DGEMM_DEFAULT_Q * 8 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (DGEMM_DEFAULT_Q * 8) - 15) & ~15UL)
13421346
#endif
13431347

13441348
#ifndef QGEMM_DEFAULT_R
1345-
#define QGEMM_DEFAULT_R (((BUFFER_SIZE - ((QGEMM_DEFAULT_P * QGEMM_DEFAULT_Q * 16 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (QGEMM_DEFAULT_Q * 16) - 15) & ~15)
1349+
#define QGEMM_DEFAULT_R (((BUFFER_SIZE - ((QGEMM_DEFAULT_P * QGEMM_DEFAULT_Q * 16 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (QGEMM_DEFAULT_Q * 16) - 15) & ~15UL)
13461350
#endif
13471351

13481352
#ifndef CGEMM_DEFAULT_R
1349-
#define CGEMM_DEFAULT_R (((BUFFER_SIZE - ((CGEMM_DEFAULT_P * CGEMM_DEFAULT_Q * 8 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (CGEMM_DEFAULT_Q * 8) - 15) & ~15)
1353+
#define CGEMM_DEFAULT_R (((BUFFER_SIZE - ((CGEMM_DEFAULT_P * CGEMM_DEFAULT_Q * 8 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (CGEMM_DEFAULT_Q * 8) - 15) & ~15UL)
13501354
#endif
13511355

13521356
#ifndef ZGEMM_DEFAULT_R
1353-
#define ZGEMM_DEFAULT_R (((BUFFER_SIZE - ((ZGEMM_DEFAULT_P * ZGEMM_DEFAULT_Q * 16 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (ZGEMM_DEFAULT_Q * 16) - 15) & ~15)
1357+
#define ZGEMM_DEFAULT_R (((BUFFER_SIZE - ((ZGEMM_DEFAULT_P * ZGEMM_DEFAULT_Q * 16 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (ZGEMM_DEFAULT_Q * 16) - 15) & ~15UL)
13541358
#endif
13551359

13561360
#ifndef XGEMM_DEFAULT_R
1357-
#define XGEMM_DEFAULT_R (((BUFFER_SIZE - ((XGEMM_DEFAULT_P * XGEMM_DEFAULT_Q * 32 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (XGEMM_DEFAULT_Q * 32) - 15) & ~15)
1361+
#define XGEMM_DEFAULT_R (((BUFFER_SIZE - ((XGEMM_DEFAULT_P * XGEMM_DEFAULT_Q * 32 + GEMM_DEFAULT_OFFSET_A + GEMM_DEFAULT_ALIGN) & ~GEMM_DEFAULT_ALIGN)) / (XGEMM_DEFAULT_Q * 32) - 15) & ~15UL)
13581362
#endif
13591363

13601364
#ifndef SNUMOPT

‎driver/level3/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ ifeq ($(ARCH), MIPS)
1919
USE_GEMM3M = 1
2020
endif
2121

22+
ifeq ($(BUILD_HALF),1)
2223
SHBLASOBJS += shgemm_nn.$(SUFFIX) shgemm_nt.$(SUFFIX) shgemm_tn.$(SUFFIX) shgemm_tt.$(SUFFIX)
24+
endif
25+
2326
SBLASOBJS += \
2427
sgemm_nn.$(SUFFIX) sgemm_nt.$(SUFFIX) sgemm_tn.$(SUFFIX) sgemm_tt.$(SUFFIX) \
2528
strmm_LNUU.$(SUFFIX) strmm_LNUN.$(SUFFIX) strmm_LNLU.$(SUFFIX) strmm_LNLN.$(SUFFIX) \
@@ -204,8 +207,9 @@ COMMONOBJS += gemm_thread_m.$(SUFFIX) gemm_thread_n.$(SUFFIX) gemm_thread_mn.$(
204207
COMMONOBJS += syrk_thread.$(SUFFIX)
205208

206209
ifndef USE_SIMPLE_THREADED_LEVEL3
207-
210+
ifeq ($(BUILD_HALF),1)
208211
SHBLASOBJS += shgemm_thread_nn.$(SUFFIX) shgemm_thread_nt.$(SUFFIX) shgemm_thread_tn.$(SUFFIX) shgemm_thread_tt.$(SUFFIX)
212+
endif
209213
SBLASOBJS += sgemm_thread_nn.$(SUFFIX) sgemm_thread_nt.$(SUFFIX) sgemm_thread_tn.$(SUFFIX) sgemm_thread_tt.$(SUFFIX)
210214
DBLASOBJS += dgemm_thread_nn.$(SUFFIX) dgemm_thread_nt.$(SUFFIX) dgemm_thread_tn.$(SUFFIX) dgemm_thread_tt.$(SUFFIX)
211215
QBLASOBJS += qgemm_thread_nn.$(SUFFIX) qgemm_thread_nt.$(SUFFIX) qgemm_thread_tn.$(SUFFIX) qgemm_thread_tt.$(SUFFIX)

‎driver/others/blas_server.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static void legacy_exec(void *func, int mode, blas_arg_t *args, void *sb){
272272
}
273273
}
274274

275-
#if defined(OS_LINUX) && !defined(NO_AFFINITY)
275+
#if defined(OS_LINUX) && !defined(NO_AFFINITY)
276276
int gotoblas_set_affinity(int);
277277
int gotoblas_set_affinity2(int);
278278
int get_node(void);
@@ -281,6 +281,8 @@ int get_node(void);
281281
static int increased_threads = 0;
282282

283283
#ifdef OS_LINUX
284+
extern int openblas_get_num_threads(void);
285+
284286
int openblas_setaffinity(int thread_idx, size_t cpusetsize, cpu_set_t* cpu_set) {
285287
const int active_threads = openblas_get_num_threads();
286288

@@ -602,7 +604,7 @@ int blas_thread_init(void){
602604
if(ret!=0){
603605
struct rlimit rlim;
604606
const char *msg = strerror(ret);
605-
fprintf(STDERR, "OpenBLAS blas_thread_init: pthread_create failed for thread %ld of %ld: %s\n", i+1,blas_num_threads,msg);
607+
fprintf(STDERR, "OpenBLAS blas_thread_init: pthread_create failed for thread %ld of %d: %s\n", i+1,blas_num_threads,msg);
606608
#ifdef RLIMIT_NPROC
607609
if(0 == getrlimit(RLIMIT_NPROC, &rlim)) {
608610
fprintf(STDERR, "OpenBLAS blas_thread_init: RLIMIT_NPROC "

‎driver/others/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,7 @@ if (!release->address) return;
20702070
if (munmap(release -> address, BUFFER_SIZE)) {
20712071
int errsv=errno;
20722072
perror("OpenBLAS : munmap failed:");
2073-
printf("error code=%d,\trelease->address=%lx\n",errsv,release->address);
2073+
printf("error code=%d,\trelease->address=%p\n",errsv,release->address);
20742074
}
20752075
}
20762076

‎exports/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ ifndef BUILD_LAPACK_DEPRECATED
3030
BUILD_LAPACK_DEPRECATED = 0
3131
endif
3232

33+
ifndef BUILD_HALF
34+
BUILD_HALF = 0
35+
endif
36+
3337
ifeq ($(OSNAME), WINNT)
3438
ifeq ($(F_COMPILER), GFORTRAN)
3539
ifndef ONLY_CBLAS
@@ -234,23 +238,23 @@ static : ../$(LIBNAME)
234238
rm -f goto.$(SUFFIX)
235239

236240
osx.def : gensymbol ../Makefile.system ../getarch.c
237-
perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
241+
perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_HALF) > $(@F)
238242

239243
aix.def : gensymbol ../Makefile.system ../getarch.c
240-
perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
244+
perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_HALF) > $(@F)
241245

242246
objcopy.def : gensymbol ../Makefile.system ../getarch.c
243-
perl ./gensymbol objcopy $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
247+
perl ./gensymbol objcopy $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_HALF) > $(@F)
244248

245249
objconv.def : gensymbol ../Makefile.system ../getarch.c
246-
perl ./gensymbol objconv $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
250+
perl ./gensymbol objconv $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_HALF) > $(@F)
247251

248252
test : linktest.c
249253
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
250254
rm -f linktest
251255

252256
linktest.c : gensymbol ../Makefile.system ../getarch.c
253-
perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > linktest.c
257+
perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_HALF) > linktest.c
254258

255259
clean ::
256260
@rm -f *.def *.dylib __.SYMDEF* *.renamed

0 commit comments

Comments
 (0)