Merge pull request #1316 from timmoon10/develop

Variable thread count for multi-threaded GEMMs
This commit is contained in:
Martin Kroeker 2017-10-04 20:35:00 +02:00 committed by GitHub
commit e1b2502840
2 changed files with 88 additions and 111 deletions

View File

@ -121,13 +121,15 @@ static void *huge_malloc(BLASLONG size){
int main(int argc, char *argv[]){ int main(int argc, char *argv[]){
FLOAT *a, *b, *c; FLOAT *a, *b, *c;
FLOAT alpha[] = {1.0, 1.0}; FLOAT alpha[] = {1.0, 0.0};
FLOAT beta [] = {0.0, 0.0}; FLOAT beta [] = {0.0, 0.0};
char trans='N'; char transa = 'N';
blasint m, n, i, j; char transb = 'N';
blasint m, n, k, i, j, lda, ldb, ldc;
int loops = 1; int loops = 1;
int has_param_n=0; int has_param_m = 0;
int l; int has_param_n = 0;
int has_param_k = 0;
char *p; char *p;
int from = 1; int from = 1;
@ -135,78 +137,100 @@ int main(int argc, char *argv[]){
int step = 1; int step = 1;
struct timeval start, stop; struct timeval start, stop;
double time1,timeg; double time1, timeg;
argc--;argv++; argc--;argv++;
if (argc > 0) { from = atol(*argv); argc--; argv++;} if (argc > 0) { from = atol(*argv); argc--; argv++; }
if (argc > 0) { to = MAX(atol(*argv), from); argc--; argv++;} if (argc > 0) { to = MAX(atol(*argv), from); argc--; argv++; }
if (argc > 0) { step = atol(*argv); argc--; argv++;} if (argc > 0) { step = atol(*argv); argc--; argv++; }
if ((p = getenv("OPENBLAS_TRANS"))) trans=*p; if ((p = getenv("OPENBLAS_TRANS"))) {
transa=*p;
fprintf(stderr, "From : %3d To : %3d Step=%d : Trans=%c\n", from, to, step, trans); transb=*p;
if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
fprintf(stderr,"Out of Memory!!\n");exit(1);
} }
if ((p = getenv("OPENBLAS_TRANSA"))) {
if (( b = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){ transa=*p;
fprintf(stderr,"Out of Memory!!\n");exit(1);
} }
if ((p = getenv("OPENBLAS_TRANSB"))) {
if (( c = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){ transb=*p;
fprintf(stderr,"Out of Memory!!\n");exit(1);
} }
TOUPPER(transa);
TOUPPER(transb);
fprintf(stderr, "From : %3d To : %3d Step=%d : Transa=%c : Transb=%c\n", from, to, step, transa, transb);
p = getenv("OPENBLAS_LOOPS"); p = getenv("OPENBLAS_LOOPS");
if ( p != NULL ) if ( p != NULL ) {
loops = atoi(p); loops = atoi(p);
}
if ((p = getenv("OPENBLAS_PARAM_M"))) {
m = atoi(p);
has_param_m=1;
} else {
m = to;
}
if ((p = getenv("OPENBLAS_PARAM_N"))) { if ((p = getenv("OPENBLAS_PARAM_N"))) {
n = atoi(p); n = atoi(p);
has_param_n=1; has_param_n=1;
} else {
n = to;
}
if ((p = getenv("OPENBLAS_PARAM_K"))) {
k = atoi(p);
has_param_k=1;
} else {
k = to;
}
if (( a = (FLOAT *)malloc(sizeof(FLOAT) * m * k * COMPSIZE)) == NULL) {
fprintf(stderr,"Out of Memory!!\n");exit(1);
}
if (( b = (FLOAT *)malloc(sizeof(FLOAT) * k * n * COMPSIZE)) == NULL) {
fprintf(stderr,"Out of Memory!!\n");exit(1);
}
if (( c = (FLOAT *)malloc(sizeof(FLOAT) * m * n * COMPSIZE)) == NULL) {
fprintf(stderr,"Out of Memory!!\n");exit(1);
} }
#ifdef linux #ifdef linux
srandom(getpid()); srandom(getpid());
#endif #endif
for(j = 0; j < to; j++){ for (i = 0; i < m * k * COMPSIZE; i++) {
for(i = 0; i < to * COMPSIZE; i++){ a[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
b[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
c[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
} }
for (i = 0; i < k * n * COMPSIZE; i++) {
b[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
}
for (i = 0; i < m * n * COMPSIZE; i++) {
c[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
} }
fprintf(stderr, " SIZE Flops Time\n"); fprintf(stderr, " SIZE Flops Time\n");
for(m = from; m <= to; m += step) for (i = from; i <= to; i += step) {
{
timeg=0; timeg=0;
if ( has_param_n == 1 && n <= m ) if (!has_param_m) { m = i; }
n=n; if (!has_param_n) { n = i; }
else if (!has_param_k) { k = i; }
n=m;
if (transa == 'N') { lda = m; }
else { lda = k; }
if (transb == 'N') { ldb = k; }
else { ldb = n; }
ldc = m;
fprintf(stderr, " M=%4d, N=%4d, K=%4d : ", (int)m, (int)n, (int)k);
fprintf(stderr, " %6dx%d : ", (int)m, (int)n);
gettimeofday( &start, (struct timezone *)0); gettimeofday( &start, (struct timezone *)0);
for (l=0; l<loops; l++) for (j=0; j<loops; j++) {
{ GEMM (&transa, &transb, &m, &n, &k, alpha, a, &lda, b, &ldb, beta, c, &ldc);
GEMM (&trans, &trans, &m, &n, &m, alpha, a, &m, b, &m, beta, c, &m );
} }
gettimeofday( &stop, (struct timezone *)0); gettimeofday( &stop, (struct timezone *)0);
time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6; time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

View File

@ -684,8 +684,6 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
BLASLONG m = args -> m; BLASLONG m = args -> m;
BLASLONG n = args -> n; BLASLONG n = args -> n;
BLASLONG nthreads = args -> nthreads; BLASLONG nthreads = args -> nthreads;
BLASLONG divN, divT;
int mode;
if (nthreads == 1) { if (nthreads == 1) {
GEMM_LOCAL(args, range_m, range_n, sa, sb, 0); GEMM_LOCAL(args, range_m, range_n, sa, sb, 0);
@ -706,66 +704,21 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
n = n_to - n_from; n = n_to - n_from;
} }
if ((m < nthreads * SWITCH_RATIO) || (n < nthreads * SWITCH_RATIO)) { if ((m < 2 * SWITCH_RATIO) || (n < 2 * SWITCH_RATIO)) {
GEMM_LOCAL(args, range_m, range_n, sa, sb, 0); GEMM_LOCAL(args, range_m, range_n, sa, sb, 0);
return 0; return 0;
} }
divT = nthreads; if (m < nthreads * SWITCH_RATIO) {
divN = 1; nthreads = blas_quickdivide(m, SWITCH_RATIO);
}
#if 0 if (n < nthreads * SWITCH_RATIO) {
while ((GEMM_P * divT > m * SWITCH_RATIO) && (divT > 1)) { nthreads = blas_quickdivide(n, SWITCH_RATIO);
do {
divT --;
divN = 1;
while (divT * divN < nthreads) divN ++;
} while ((divT * divN != nthreads) && (divT > 1));
} }
#endif
// fprintf(stderr, "divN = %4ld divT = %4ld\n", divN, divT); args -> nthreads = nthreads;
args -> nthreads = divT;
if (divN == 1){
gemm_driver(args, range_m, range_n, sa, sb, 0); gemm_driver(args, range_m, range_n, sa, sb, 0);
} else {
#ifndef COMPLEX
#ifdef XDOUBLE
mode = BLAS_XDOUBLE | BLAS_REAL;
#elif defined(DOUBLE)
mode = BLAS_DOUBLE | BLAS_REAL;
#else
mode = BLAS_SINGLE | BLAS_REAL;
#endif
#else
#ifdef XDOUBLE
mode = BLAS_XDOUBLE | BLAS_COMPLEX;
#elif defined(DOUBLE)
mode = BLAS_DOUBLE | BLAS_COMPLEX;
#else
mode = BLAS_SINGLE | BLAS_COMPLEX;
#endif
#endif
#if defined(TN) || defined(TT) || defined(TR) || defined(TC) || \
defined(CN) || defined(CT) || defined(CR) || defined(CC)
mode |= (BLAS_TRANSA_T);
#endif
#if defined(NT) || defined(TT) || defined(RT) || defined(CT) || \
defined(NC) || defined(TC) || defined(RC) || defined(CC)
mode |= (BLAS_TRANSB_T);
#endif
#ifdef OS_WINDOWS
gemm_thread_n(mode, args, range_m, range_n, GEMM_LOCAL, sa, sb, divN);
#else
gemm_thread_n(mode, args, range_m, range_n, gemm_driver, sa, sb, divN);
#endif
}
return 0; return 0;
} }