From 281a2b952ffec9a132f4d28a1b6aa86f54bd6cf7 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 5 Dec 2017 19:54:10 +0100 Subject: [PATCH] warning cleanup (#1380) * dead increments in driver/level2 * dead increments in kernel/generic * part dead increments in kernel/x86_64 --- driver/level2/gbmv_thread.c | 2 +- driver/level2/sbmv_thread.c | 2 +- driver/level2/tbmv_thread.c | 2 +- driver/level2/tpmv_thread.c | 6 +----- kernel/generic/gemm_ncopy_16.c | 2 +- kernel/generic/gemm_tcopy_16.c | 2 +- kernel/generic/trmm_lncopy_16.c | 16 ++++++++-------- kernel/generic/trmm_ltcopy_16.c | 18 +++++++++--------- kernel/generic/trmm_uncopy_16.c | 16 ++++++++-------- kernel/generic/trmm_utcopy_16.c | 24 ++++++++++++------------ kernel/x86_64/cgemv_n_4.c | 4 ++-- kernel/x86_64/cgemv_t_4.c | 4 ++-- kernel/x86_64/sgemv_n_4.c | 4 ++-- kernel/x86_64/sgemv_t_4.c | 4 ++-- kernel/x86_64/zgemv_n_4.c | 4 ++-- kernel/x86_64/zgemv_t_4.c | 4 ++-- 16 files changed, 55 insertions(+), 59 deletions(-) diff --git a/driver/level2/gbmv_thread.c b/driver/level2/gbmv_thread.c index 9d37467..c0cb947 100644 --- a/driver/level2/gbmv_thread.c +++ b/driver/level2/gbmv_thread.c @@ -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); x = buffer; - buffer += ((COMPSIZE * args -> m + 1023) & ~1023); + // buffer += ((COMPSIZE * args -> m + 1023) & ~1023); } #endif diff --git a/driver/level2/sbmv_thread.c b/driver/level2/sbmv_thread.c index ce841ee..e59451c 100644 --- a/driver/level2/sbmv_thread.c +++ b/driver/level2/sbmv_thread.c @@ -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); x = buffer; - buffer += ((COMPSIZE * n + 1023) & ~1023); + // buffer += ((COMPSIZE * n + 1023) & ~1023); } SCAL_K(n, 0, 0, ZERO, diff --git a/driver/level2/tbmv_thread.c b/driver/level2/tbmv_thread.c index aaf4958..35e5ff1 100644 --- a/driver/level2/tbmv_thread.c +++ b/driver/level2/tbmv_thread.c @@ -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); x = buffer; - buffer += ((args -> n * COMPSIZE + 1023) & ~1023); + // buffer += ((args -> n * COMPSIZE + 1023) & ~1023); } if (range_n) y += *range_n * COMPSIZE; diff --git a/driver/level2/tpmv_thread.c b/driver/level2/tpmv_thread.c index 79438ba..b7eb105 100644 --- a/driver/level2/tpmv_thread.c +++ b/driver/level2/tpmv_thread.c @@ -112,7 +112,7 @@ static int tpmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F #endif x = buffer; - buffer += ((COMPSIZE * args -> m + 1023) & ~1023); + // buffer += ((COMPSIZE * args -> m + 1023) & ~1023); } #ifndef TRANS @@ -234,11 +234,7 @@ static int tpmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F return 0; } -#ifndef COMPLEX -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_queue_t queue[MAX_CPU_NUMBER]; diff --git a/kernel/generic/gemm_ncopy_16.c b/kernel/generic/gemm_ncopy_16.c index 9bd40f1..5f91d0d 100644 --- a/kernel/generic/gemm_ncopy_16.c +++ b/kernel/generic/gemm_ncopy_16.c @@ -429,7 +429,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){ ctemp01 = *(aoffset1 + 0); *(boffset + 0) = ctemp01; - boffset += 1; + // boffset += 1; } } diff --git a/kernel/generic/gemm_tcopy_16.c b/kernel/generic/gemm_tcopy_16.c index 6528d94..56268eb 100644 --- a/kernel/generic/gemm_tcopy_16.c +++ b/kernel/generic/gemm_tcopy_16.c @@ -379,7 +379,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, FLOAT *b){ if (m & 1){ ctemp01 = *(aoffset1 + 0); *(boffset + 0) = ctemp01; - boffset += 1; + // boffset += 1; } } diff --git a/kernel/generic/trmm_lncopy_16.c b/kernel/generic/trmm_lncopy_16.c index 0795a83..4c0a76c 100644 --- a/kernel/generic/trmm_lncopy_16.c +++ b/kernel/generic/trmm_lncopy_16.c @@ -556,7 +556,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X < posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += 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; a14 += i * lda; a15 += i * lda; - a16 += i * lda; + a16 += i * lda; */ b += 16 * i; } else { #ifdef UNIT @@ -1147,14 +1147,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X < posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += i * lda; a04 += i * lda; a05 += i * lda; a06 += i * lda; a07 += i * lda; - a08 += i * lda; + a08 += i * lda; */ b += 8 * i; } else { #ifdef UNIT @@ -1380,10 +1380,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X < posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += i * lda; - a04 += i * lda; + a04 += i * lda; */ b += 4 * i; } else { #ifdef UNIT @@ -1488,8 +1488,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON b += 2; } else if (X < posY) { - a01 += lda; - a02 += lda; + /* a01 += lda; + a02 += lda; */ b += 2; } else { #ifdef UNIT diff --git a/kernel/generic/trmm_ltcopy_16.c b/kernel/generic/trmm_ltcopy_16.c index b8469d0..c8fde52 100644 --- a/kernel/generic/trmm_ltcopy_16.c +++ b/kernel/generic/trmm_ltcopy_16.c @@ -518,7 +518,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 15); if (i > 0) { if (X > posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; a04 += i; @@ -533,7 +533,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON a13 += i; a14 += i; a15 += i; - a16 += i; + a16 += i; */ b += 16 * i; } else if (X < posY) { @@ -1128,14 +1128,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 7); if (i > 0) { if (X > posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; a04 += i; a05 += i; a06 += i; a07 += i; - a08 += i; + a08 += i; */ b += 8 * i; } else if (X < posY) { @@ -1368,10 +1368,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 3); if (i > 0) { if (X > posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; - a04 += i; + a04 += i; */ b += 4 * i; } else if (X < posY) { @@ -1490,8 +1490,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON if (X < posY) { b[ 0] = *(a01 + 0); b[ 1] = *(a01 + 1); - a01 += lda; - a02 += lda; + /* a01 += lda; + a02 += lda; */ b += 2; } } else { @@ -1540,7 +1540,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i --; } while (i > 0); } - posY += 1; + // posY += 1; } return 0; diff --git a/kernel/generic/trmm_uncopy_16.c b/kernel/generic/trmm_uncopy_16.c index 19b2fdd..5fb769b 100644 --- a/kernel/generic/trmm_uncopy_16.c +++ b/kernel/generic/trmm_uncopy_16.c @@ -556,7 +556,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X > posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += 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; a14 += i * lda; a15 += i * lda; - a16 += i * lda; + a16 += i * lda; */ b += 16 * i; } else { #ifdef UNIT @@ -1147,14 +1147,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X > posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += i * lda; a04 += i * lda; a05 += i * lda; a06 += i * lda; a07 += i * lda; - a08 += i * lda; + a08 += i * lda; */ b += 8 * i; } else { #ifdef UNIT @@ -1379,10 +1379,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON } } else if (X > posY) { - a01 += i * lda; + /* a01 += i * lda; a02 += i * lda; a03 += i * lda; - a04 += i * lda; + a04 += i * lda; */ b += 4 * i; } else { #ifdef UNIT @@ -1488,8 +1488,8 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON b += 2; } else if (X > posY) { - a01 += lda; - a02 += lda; + /* a01 += lda; + a02 += lda; */ b += 2; } else { #ifdef UNIT diff --git a/kernel/generic/trmm_utcopy_16.c b/kernel/generic/trmm_utcopy_16.c index b83989f..5d0f7dd 100644 --- a/kernel/generic/trmm_utcopy_16.c +++ b/kernel/generic/trmm_utcopy_16.c @@ -518,7 +518,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 15); if (i > 0) { if (X < posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; a04 += i; @@ -533,7 +533,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON a13 += i; a14 += i; a15 += i; - a16 += i; + a16 += i; */ b += 16 * i; } else if (X > posY) { @@ -1130,14 +1130,14 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 7); if (i > 0) { if (X < posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; a04 += i; a05 += i; a06 += i; a07 += i; - a08 += i; + a08 += i; */ b += 8 * i; } else if (X > posY) { @@ -1156,13 +1156,13 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON b += 8; } - a02 += i * lda; + /* a02 += i * lda; a03 += i * lda; a04 += i * lda; a05 += i * lda; a06 += i * lda; a07 += i * lda; - a08 += i * lda; + a08 += i * lda; */ } else { #ifdef UNIT b[ 0] = ONE; @@ -1371,10 +1371,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i = (m & 3); if (i > 0) { if (X < posY) { - a01 += i; + /* a01 += i; a02 += i; a03 += i; - a04 += i; + a04 += i; */ b += 4 * i; } else if (X > posY) { @@ -1387,9 +1387,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON a01 += lda; b += 4; } - a02 += lda; + /* a02 += lda; a03 += lda; - a04 += lda; + a04 += lda; */ } else { #ifdef UNIT @@ -1492,7 +1492,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON if (X > posY) { b[ 0] = *(a01 + 0); b[ 1] = *(a01 + 1); - a01 += lda; + // a01 += lda; b += 2; } else { #ifdef UNIT @@ -1543,7 +1543,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON i --; } while (i > 0); } - posY += 1; + // posY += 1; } return 0; diff --git a/kernel/x86_64/cgemv_n_4.c b/kernel/x86_64/cgemv_n_4.c index 14cc9fe..770c955 100644 --- a/kernel/x86_64/cgemv_n_4.c +++ b/kernel/x86_64/cgemv_n_4.c @@ -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 ) { cgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer); - x_ptr += 2; - a_ptr += lda; + /* x_ptr += 2; + a_ptr += lda; */ } } diff --git a/kernel/x86_64/cgemv_t_4.c b/kernel/x86_64/cgemv_t_4.c index 3dc19dc..d75e58f 100644 --- a/kernel/x86_64/cgemv_t_4.c +++ b/kernel/x86_64/cgemv_t_4.c @@ -300,8 +300,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i, if ( n2 & 1 ) { cgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha); - a_ptr += lda; - y_ptr += 2; + /* a_ptr += lda; + y_ptr += 2; */ } diff --git a/kernel/x86_64/sgemv_n_4.c b/kernel/x86_64/sgemv_n_4.c index 60074d3..fd02896 100644 --- a/kernel/x86_64/sgemv_n_4.c +++ b/kernel/x86_64/sgemv_n_4.c @@ -392,8 +392,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha, FLOAT *a, BLASLO if ( n2 & 1 ) { sgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer,&alpha); - a_ptr += lda; - x_ptr += 1; + /* a_ptr += lda; + x_ptr += 1a; */ } diff --git a/kernel/x86_64/sgemv_t_4.c b/kernel/x86_64/sgemv_t_4.c index 6f9c7ca..f04d461 100644 --- a/kernel/x86_64/sgemv_t_4.c +++ b/kernel/x86_64/sgemv_t_4.c @@ -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); - a_ptr += lda; + // a_ptr += lda; *y_ptr += ybuffer[0] * alpha; - y_ptr += inc_y; + // y_ptr += inc_y; } a += NB; diff --git a/kernel/x86_64/zgemv_n_4.c b/kernel/x86_64/zgemv_n_4.c index 2d7fd57..f6f8815 100644 --- a/kernel/x86_64/zgemv_n_4.c +++ b/kernel/x86_64/zgemv_n_4.c @@ -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 ) { zgemv_kernel_4x1(NB,a_ptr,x_ptr,ybuffer); - x_ptr += 2; - a_ptr += lda; + /* x_ptr += 2; + a_ptr += lda; */ } } diff --git a/kernel/x86_64/zgemv_t_4.c b/kernel/x86_64/zgemv_t_4.c index c4a3820..3e4b7d5 100644 --- a/kernel/x86_64/zgemv_t_4.c +++ b/kernel/x86_64/zgemv_t_4.c @@ -302,8 +302,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i, if ( n2 & 1 ) { zgemv_kernel_4x1(NB,a_ptr,xbuffer,y_ptr,alpha); - a_ptr += lda; - y_ptr += 2; + /* a_ptr += lda; + y_ptr += 2; */ } -- 2.7.4