warning cleanup (#1380)

* dead increments in driver/level2

* dead increments in kernel/generic

* part dead increments in kernel/x86_64
This commit is contained in:
Andrew 2017-12-05 19:54:10 +01:00 committed by Martin Kroeker
parent c49c6b237d
commit 281a2b952f
16 changed files with 55 additions and 59 deletions

View File

@ -96,7 +96,7 @@ static int gbmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
COPY_K(args -> m, x, incx, buffer, 1); COPY_K(args -> m, x, incx, buffer, 1);
x = buffer; x = buffer;
buffer += ((COMPSIZE * args -> m + 1023) & ~1023); // buffer += ((COMPSIZE * args -> m + 1023) & ~1023);
} }
#endif #endif

View File

@ -91,7 +91,7 @@ static int sbmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
COPY_K(n, x, incx, buffer, 1); COPY_K(n, x, incx, buffer, 1);
x = buffer; x = buffer;
buffer += ((COMPSIZE * n + 1023) & ~1023); // buffer += ((COMPSIZE * n + 1023) & ~1023);
} }
SCAL_K(n, 0, 0, ZERO, SCAL_K(n, 0, 0, ZERO,

View File

@ -107,7 +107,7 @@ static int trmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
COPY_K(args -> n, x, incx, buffer, 1); COPY_K(args -> n, x, incx, buffer, 1);
x = buffer; x = buffer;
buffer += ((args -> n * COMPSIZE + 1023) & ~1023); // buffer += ((args -> n * COMPSIZE + 1023) & ~1023);
} }
if (range_n) y += *range_n * COMPSIZE; if (range_n) y += *range_n * COMPSIZE;

View File

@ -112,7 +112,7 @@ static int tpmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
#endif #endif
x = buffer; x = buffer;
buffer += ((COMPSIZE * args -> m + 1023) & ~1023); // buffer += ((COMPSIZE * args -> m + 1023) & ~1023);
} }
#ifndef TRANS #ifndef TRANS
@ -234,11 +234,7 @@ static int tpmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
return 0; return 0;
} }
#ifndef COMPLEX
int CNAME(BLASLONG m, FLOAT *a, FLOAT *x, BLASLONG incx, FLOAT *buffer, int nthreads){ int CNAME(BLASLONG m, FLOAT *a, FLOAT *x, BLASLONG incx, FLOAT *buffer, int nthreads){
#else
int CNAME(BLASLONG m, FLOAT *a, FLOAT *x, BLASLONG incx, FLOAT *buffer, int nthreads){
#endif
blas_arg_t args; blas_arg_t args;
blas_queue_t queue[MAX_CPU_NUMBER]; blas_queue_t queue[MAX_CPU_NUMBER];

View File

@ -429,7 +429,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
ctemp01 = *(aoffset1 + 0); ctemp01 = *(aoffset1 + 0);
*(boffset + 0) = ctemp01; *(boffset + 0) = ctemp01;
boffset += 1; // boffset += 1;
} }
} }

View File

@ -379,7 +379,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){
if (m & 1){ if (m & 1){
ctemp01 = *(aoffset1 + 0); ctemp01 = *(aoffset1 + 0);
*(boffset + 0) = ctemp01; *(boffset + 0) = ctemp01;
boffset += 1; // boffset += 1;
} }
} }

View File

@ -556,7 +556,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X < posY) { if (X < posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda;
@ -571,7 +571,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
a13 += i * lda; a13 += i * lda;
a14 += i * lda; a14 += i * lda;
a15 += i * lda; a15 += i * lda;
a16 += i * lda; a16 += i * lda; */
b += 16 * i; b += 16 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1147,14 +1147,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X < posY) { if (X < posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda;
a05 += i * lda; a05 += i * lda;
a06 += i * lda; a06 += i * lda;
a07 += i * lda; a07 += i * lda;
a08 += i * lda; a08 += i * lda; */
b += 8 * i; b += 8 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1380,10 +1380,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X < posY) { if (X < posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda; */
b += 4 * i; b += 4 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1488,8 +1488,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
b += 2; b += 2;
} else } else
if (X < posY) { if (X < posY) {
a01 += lda; /* a01 += lda;
a02 += lda; a02 += lda; */
b += 2; b += 2;
} else { } else {
#ifdef UNIT #ifdef UNIT

View File

@ -518,7 +518,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 15); i = (m & 15);
if (i > 0) { if (i > 0) {
if (X > posY) { if (X > posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i;
@ -533,7 +533,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
a13 += i; a13 += i;
a14 += i; a14 += i;
a15 += i; a15 += i;
a16 += i; a16 += i; */
b += 16 * i; b += 16 * i;
} else } else
if (X < posY) { if (X < posY) {
@ -1128,14 +1128,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 7); i = (m & 7);
if (i > 0) { if (i > 0) {
if (X > posY) { if (X > posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i;
a05 += i; a05 += i;
a06 += i; a06 += i;
a07 += i; a07 += i;
a08 += i; a08 += i; */
b += 8 * i; b += 8 * i;
} else } else
if (X < posY) { if (X < posY) {
@ -1368,10 +1368,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 3); i = (m & 3);
if (i > 0) { if (i > 0) {
if (X > posY) { if (X > posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i; */
b += 4 * i; b += 4 * i;
} else } else
if (X < posY) { if (X < posY) {
@ -1490,8 +1490,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
if (X < posY) { if (X < posY) {
b[ 0] = *(a01 + 0); b[ 0] = *(a01 + 0);
b[ 1] = *(a01 + 1); b[ 1] = *(a01 + 1);
a01 += lda; /* a01 += lda;
a02 += lda; a02 += lda; */
b += 2; b += 2;
} }
} else { } else {
@ -1540,7 +1540,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i --; i --;
} while (i > 0); } while (i > 0);
} }
posY += 1; // posY += 1;
} }
return 0; return 0;

View File

@ -556,7 +556,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X > posY) { if (X > posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda;
@ -571,7 +571,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
a13 += i * lda; a13 += i * lda;
a14 += i * lda; a14 += i * lda;
a15 += i * lda; a15 += i * lda;
a16 += i * lda; a16 += i * lda; */
b += 16 * i; b += 16 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1147,14 +1147,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X > posY) { if (X > posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda;
a05 += i * lda; a05 += i * lda;
a06 += i * lda; a06 += i * lda;
a07 += i * lda; a07 += i * lda;
a08 += i * lda; a08 += i * lda; */
b += 8 * i; b += 8 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1379,10 +1379,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
} }
} else } else
if (X > posY) { if (X > posY) {
a01 += i * lda; /* a01 += i * lda;
a02 += i * lda; a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda; */
b += 4 * i; b += 4 * i;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1488,8 +1488,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
b += 2; b += 2;
} else } else
if (X > posY) { if (X > posY) {
a01 += lda; /* a01 += lda;
a02 += lda; a02 += lda; */
b += 2; b += 2;
} else { } else {
#ifdef UNIT #ifdef UNIT

View File

@ -518,7 +518,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 15); i = (m & 15);
if (i > 0) { if (i > 0) {
if (X < posY) { if (X < posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i;
@ -533,7 +533,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
a13 += i; a13 += i;
a14 += i; a14 += i;
a15 += i; a15 += i;
a16 += i; a16 += i; */
b += 16 * i; b += 16 * i;
} else } else
if (X > posY) { if (X > posY) {
@ -1130,14 +1130,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 7); i = (m & 7);
if (i > 0) { if (i > 0) {
if (X < posY) { if (X < posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i;
a05 += i; a05 += i;
a06 += i; a06 += i;
a07 += i; a07 += i;
a08 += i; a08 += i; */
b += 8 * i; b += 8 * i;
} else } else
if (X > posY) { if (X > posY) {
@ -1156,13 +1156,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
b += 8; b += 8;
} }
a02 += i * lda; /* a02 += i * lda;
a03 += i * lda; a03 += i * lda;
a04 += i * lda; a04 += i * lda;
a05 += i * lda; a05 += i * lda;
a06 += i * lda; a06 += i * lda;
a07 += i * lda; a07 += i * lda;
a08 += i * lda; a08 += i * lda; */
} else { } else {
#ifdef UNIT #ifdef UNIT
b[ 0] = ONE; b[ 0] = ONE;
@ -1371,10 +1371,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = (m & 3); i = (m & 3);
if (i > 0) { if (i > 0) {
if (X < posY) { if (X < posY) {
a01 += i; /* a01 += i;
a02 += i; a02 += i;
a03 += i; a03 += i;
a04 += i; a04 += i; */
b += 4 * i; b += 4 * i;
} else } else
if (X > posY) { if (X > posY) {
@ -1387,9 +1387,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
a01 += lda; a01 += lda;
b += 4; b += 4;
} }
a02 += lda; /* a02 += lda;
a03 += lda; a03 += lda;
a04 += lda; a04 += lda; */
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1492,7 +1492,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
if (X > posY) { if (X > posY) {
b[ 0] = *(a01 + 0); b[ 0] = *(a01 + 0);
b[ 1] = *(a01 + 1); b[ 1] = *(a01 + 1);
a01 += lda; // a01 += lda;
b += 2; b += 2;
} else { } else {
#ifdef UNIT #ifdef UNIT
@ -1543,7 +1543,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i --; i --;
} while (i > 0); } while (i > 0);
} }
posY += 1; // posY += 1;
} }
return 0; return 0;

View File

@ -298,8 +298,8 @@ printf("%s %d %d %.16f %.16f %d %d %d\n","zgemv_n",m,n,alpha_r,alpha_i,lda,inc_x
if ( n2 & 1 ) if ( n2 & 1 )
{ {
cgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer); cgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer);
x_ptr += 2; /* x_ptr += 2;
a_ptr += lda; a_ptr += lda; */
} }
} }

View File

@ -300,8 +300,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
if ( n2 & 1 ) if ( n2 & 1 )
{ {
cgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha); cgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha);
a_ptr += lda; /* a_ptr += lda;
y_ptr += 2; y_ptr += 2; */
} }

View File

@ -392,8 +392,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha, FLOAT *a, BLASLO
if ( n2 & 1 ) if ( n2 & 1 )
{ {
sgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer,&alpha); sgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer,&alpha);
a_ptr += lda; /* a_ptr += lda;
x_ptr += 1; x_ptr += 1a; */
} }

View File

@ -406,9 +406,9 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha, FLOAT *a, BLASLO
{ {
sgemv_kernel_4x1(NB,a_ptr,xbuffer,ybuffer); sgemv_kernel_4x1(NB,a_ptr,xbuffer,ybuffer);
a_ptr += lda; // a_ptr += lda;
*y_ptr += ybuffer[0] * alpha; *y_ptr += ybuffer[0] * alpha;
y_ptr += inc_y; // y_ptr += inc_y;
} }
a += NB; a += NB;

View File

@ -300,8 +300,8 @@ printf("%s %d %d %.16f %.16f %d %d %d\n","zgemv_n",m,n,alpha_r,alpha_i,lda,inc_x
if ( n2 & 1 ) if ( n2 & 1 )
{ {
zgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer); zgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer);
x_ptr += 2; /* x_ptr += 2;
a_ptr += lda; a_ptr += lda; */
} }
} }

View File

@ -302,8 +302,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
if ( n2 & 1 ) if ( n2 & 1 )
{ {
zgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha); zgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha);
a_ptr += lda; /* a_ptr += lda;
y_ptr += 2; y_ptr += 2; */
} }