diff --git a/driver/level2/spmv_thread.c b/driver/level2/spmv_thread.c index 0f47344df..f8ae3cdcd 100644 --- a/driver/level2/spmv_thread.c +++ b/driver/level2/spmv_thread.c @@ -55,7 +55,7 @@ static int spmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *dummy1, FLOAT *buffer, BLASLONG pos){ FLOAT *a, *x, *y; - BLASLONG incx, incy; + BLASLONG incx; BLASLONG m_from, m_to, i; #ifndef COMPLEX FLOAT result; @@ -68,7 +68,6 @@ static int spmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F y = (FLOAT *)args -> c; incx = args -> ldb; - incy = args -> ldc; m_from = 0; m_to = args -> m; diff --git a/driver/level2/spr2_thread.c b/driver/level2/spr2_thread.c index 10edb1eb1..b72524a0d 100644 --- a/driver/level2/spr2_thread.c +++ b/driver/level2/spr2_thread.c @@ -43,7 +43,7 @@ static int syr_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *dummy1, FLOAT *buffer, BLASLONG pos){ FLOAT *a, *x, *y; - BLASLONG lda, incx, incy; + BLASLONG incx, incy; BLASLONG i, m_from, m_to; FLOAT alpha_r; #ifdef COMPLEX @@ -56,7 +56,6 @@ static int syr_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FL incx = args -> lda; incy = args -> ldb; - lda = args -> ldc; alpha_r = *((FLOAT *)args -> alpha + 0); #ifdef COMPLEX diff --git a/driver/level2/spr_thread.c b/driver/level2/spr_thread.c index 4a194cbd6..b1a066867 100644 --- a/driver/level2/spr_thread.c +++ b/driver/level2/spr_thread.c @@ -46,7 +46,7 @@ static int syr_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FL BLASLONG incx; BLASLONG i, m_from, m_to; FLOAT alpha_r; -#if defined(COMPLEX) && !defined(HER) && !defined(HERREV) +#if defined(COMPLEX) && !defined(HEMV) && !defined(HEMVREV) FLOAT alpha_i; #endif @@ -56,7 +56,7 @@ static int syr_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FL incx = args -> lda; alpha_r = *((FLOAT *)args -> alpha + 0); -#if defined(COMPLEX) && !defined(HER) && !defined(HERREV) +#if defined(COMPLEX) && !defined(HEMV) && !defined(HEMVREV) alpha_i = *((FLOAT *)args -> alpha + 1); #endif diff --git a/driver/level2/symv_thread.c b/driver/level2/symv_thread.c index 95d6c9bb5..6580178f1 100644 --- a/driver/level2/symv_thread.c +++ b/driver/level2/symv_thread.c @@ -55,7 +55,7 @@ static int symv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *dummy1, FLOAT *buffer, BLASLONG pos){ FLOAT *a, *x, *y; - BLASLONG lda, incx, incy; + BLASLONG lda, incx; BLASLONG m_from, m_to; a = (FLOAT *)args -> a; @@ -64,7 +64,6 @@ static int symv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F lda = args -> lda; incx = args -> ldb; - incy = args -> ldc; m_from = 0; m_to = args -> m; diff --git a/driver/level2/tbmv_L.c b/driver/level2/tbmv_L.c index b41b4141e..e40e79396 100644 --- a/driver/level2/tbmv_L.c +++ b/driver/level2/tbmv_L.c @@ -45,13 +45,11 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/tbmv_U.c b/driver/level2/tbmv_U.c index 50c10326b..529fd863f 100644 --- a/driver/level2/tbmv_U.c +++ b/driver/level2/tbmv_U.c @@ -45,13 +45,11 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/tbsv_L.c b/driver/level2/tbsv_L.c index 0d036440d..f62400b5e 100644 --- a/driver/level2/tbsv_L.c +++ b/driver/level2/tbsv_L.c @@ -45,13 +45,11 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/tbsv_U.c b/driver/level2/tbsv_U.c index 1dc1a99e7..1dc7f2006 100644 --- a/driver/level2/tbsv_U.c +++ b/driver/level2/tbsv_U.c @@ -45,13 +45,11 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/tpsv_L.c b/driver/level2/tpsv_L.c index 3fafa9054..7baf5b73e 100644 --- a/driver/level2/tpsv_L.c +++ b/driver/level2/tpsv_L.c @@ -43,12 +43,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level2/tpsv_U.c b/driver/level2/tpsv_U.c index fb5ef02b2..763ea07b1 100644 --- a/driver/level2/tpsv_U.c +++ b/driver/level2/tpsv_U.c @@ -43,12 +43,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level2/ztbmv_L.c b/driver/level2/ztbmv_L.c index 1ac1cdef1..e7bd35796 100644 --- a/driver/level2/ztbmv_L.c +++ b/driver/level2/ztbmv_L.c @@ -45,7 +45,6 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; #if (TRANSA == 2) || (TRANSA == 4) @@ -57,7 +56,6 @@ int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG inc if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) * COMPSIZE+ 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/ztbmv_U.c b/driver/level2/ztbmv_U.c index 9aa203396..c2d810a04 100644 --- a/driver/level2/ztbmv_U.c +++ b/driver/level2/ztbmv_U.c @@ -45,7 +45,6 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; #if (TRANSA == 2) || (TRANSA == 4) @@ -57,7 +56,6 @@ int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG inc if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) * COMPSIZE + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/ztbsv_L.c b/driver/level2/ztbsv_L.c index 9aa701841..44329f5c7 100644 --- a/driver/level2/ztbsv_L.c +++ b/driver/level2/ztbsv_L.c @@ -45,7 +45,6 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; #if (TRANSA == 2) || (TRANSA == 4) @@ -57,7 +56,6 @@ int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG inc if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) * COMPSIZE + 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/ztbsv_U.c b/driver/level2/ztbsv_U.c index 3722b1f71..530194aa3 100644 --- a/driver/level2/ztbsv_U.c +++ b/driver/level2/ztbsv_U.c @@ -45,7 +45,6 @@ const static FLOAT dp1 = 1.; int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG incb, void *buffer){ BLASLONG i; - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; BLASLONG length; #if (TRANSA == 2) || (TRANSA == 4) @@ -57,7 +56,6 @@ int CNAME(BLASLONG n, BLASLONG k, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG inc if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + n * sizeof(FLOAT) * COMPSIZE+ 4095) & ~4095); COPY_K(n, b, incb, buffer, 1); } diff --git a/driver/level2/ztpmv_L.c b/driver/level2/ztpmv_L.c index 47e6df56c..76a7b8ca1 100644 --- a/driver/level2/ztpmv_L.c +++ b/driver/level2/ztpmv_L.c @@ -49,12 +49,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ #ifndef UNIT FLOAT atemp1, atemp2, btemp1, btemp2; #endif - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) * 2 + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level2/ztpmv_U.c b/driver/level2/ztpmv_U.c index da911fb4e..290b9ef40 100644 --- a/driver/level2/ztpmv_U.c +++ b/driver/level2/ztpmv_U.c @@ -49,12 +49,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ #ifndef UNIT FLOAT atemp1, atemp2, btemp1, btemp2; #endif - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) * 2 + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level2/ztpsv_L.c b/driver/level2/ztpsv_L.c index a497e42a4..5ce07f43b 100644 --- a/driver/level2/ztpsv_L.c +++ b/driver/level2/ztpsv_L.c @@ -51,12 +51,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ #ifndef UNIT FLOAT ar, ai, br, bi, ratio, den; #endif - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) * 2 + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level2/ztpsv_U.c b/driver/level2/ztpsv_U.c index 28b824e3a..fa9d99054 100644 --- a/driver/level2/ztpsv_U.c +++ b/driver/level2/ztpsv_U.c @@ -49,12 +49,10 @@ int CNAME(BLASLONG m, FLOAT *a, FLOAT *b, BLASLONG incb, void *buffer){ #ifndef UNIT FLOAT ar, ai, br, bi, ratio, den; #endif - FLOAT *gemvbuffer = (FLOAT *)buffer; FLOAT *B = b; if (incb != 1) { B = buffer; - gemvbuffer = (FLOAT *)(((BLASLONG)buffer + m * sizeof(FLOAT) * 2 + 4095) & ~4095); COPY_K(m, b, incb, buffer, 1); } diff --git a/driver/level3/gemm_thread_mn.c b/driver/level3/gemm_thread_mn.c index 2966eac82..6b52df884 100644 --- a/driver/level3/gemm_thread_mn.c +++ b/driver/level3/gemm_thread_mn.c @@ -65,7 +65,7 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int ( blas_queue_t queue[MAX_CPU_NUMBER]; BLASLONG range_M[MAX_CPU_NUMBER + 1], range_N[MAX_CPU_NUMBER + 1]; - BLASLONG procs, total_procs, num_cpu_m, num_cpu_n; + BLASLONG procs, num_cpu_m, num_cpu_n; BLASLONG width, i, j; BLASLONG divM, divN; diff --git a/driver/level3/level3_thread.c b/driver/level3/level3_thread.c index 6162a9f0d..096342a32 100644 --- a/driver/level3/level3_thread.c +++ b/driver/level3/level3_thread.c @@ -230,7 +230,7 @@ static int inner_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, BLASLONG is, min_i, div_n; BLASLONG i, current; - BLASLONG l1stride, l2size; + BLASLONG l1stride; #ifdef TIMING BLASULONG rpcc_counter; @@ -298,8 +298,6 @@ static int inner_thread(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, #endif ) return 0; - l2size = GEMM_P * GEMM_Q; - #if 0 fprintf(stderr, "Thread[%ld] m_from : %ld m_to : %ld n_from : %ld n_to : %ld N_from : %ld N_to : %ld\n", mypos, m_from, m_to, n_from, n_to, N_from, N_to); @@ -706,7 +704,7 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO n = n_to - n_from; } - if ((args -> m < nthreads * SWITCH_RATIO) || (args -> n < nthreads * SWITCH_RATIO)) { + if ((m < nthreads * SWITCH_RATIO) || (n < nthreads * SWITCH_RATIO)) { GEMM_LOCAL(args, range_m, range_n, sa, sb, 0); return 0; } diff --git a/driver/others/memory.c b/driver/others/memory.c index ba3dc8a23..3d83a4037 100644 --- a/driver/others/memory.c +++ b/driver/others/memory.c @@ -914,7 +914,6 @@ static volatile struct { } memory[NUM_BUFFERS]; static int memory_initialized = 0; -static void gotoblas_memory_init(void); /* Memory allocation routine */ /* procpos ... indicates where it comes from */