From 03faa3c06629fc32f96f45fcef51039886bafefb Mon Sep 17 00:00:00 2001 From: Ralph Campbell Date: Thu, 3 Sep 2015 17:57:06 +0530 Subject: [PATCH] Minor C code fixes in driver/ --- driver/level2/spmv_thread.c | 3 +-- driver/level2/spr2_thread.c | 3 +-- driver/level2/spr_thread.c | 4 ++-- driver/level2/symv_thread.c | 3 +-- driver/level2/tbmv_L.c | 2 -- driver/level2/tbmv_U.c | 2 -- driver/level2/tbsv_L.c | 2 -- driver/level2/tbsv_U.c | 2 -- driver/level2/tpsv_L.c | 2 -- driver/level2/tpsv_U.c | 2 -- driver/level2/ztbmv_L.c | 2 -- driver/level2/ztbmv_U.c | 2 -- driver/level2/ztbsv_L.c | 2 -- driver/level2/ztbsv_U.c | 2 -- driver/level2/ztpmv_L.c | 2 -- driver/level2/ztpmv_U.c | 2 -- driver/level2/ztpsv_L.c | 2 -- driver/level2/ztpsv_U.c | 2 -- driver/level3/.level3.c.swp | Bin 0 -> 16384 bytes driver/level3/gemm_thread_mn.c | 2 +- driver/level3/level3_thread.c | 6 ++---- driver/others/memory.c | 1 - 22 files changed, 8 insertions(+), 42 deletions(-) create mode 100644 driver/level3/.level3.c.swp 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/.level3.c.swp b/driver/level3/.level3.c.swp new file mode 100644 index 0000000000000000000000000000000000000000..f917425313d17f52010ecd6bba035aebf6a9afba GIT binary patch literal 16384 zcmeHNO^h3786KcO3>2#7!jFXBBs8_R&f2>x1j!O$)}GxRV$ZlU<7AfvZEVjtJDah` znHldU(9m8Gxl#4fN^k&)14mSG=m81D0ihlc0xEH!P=1OETo4BY5)_{Io3TCiZj-cK zL?mXU$Meni^M3F9eDC+~cKN(or;p7qN_ZZSq|a=eZ2F&nQ9AmNB(=irJ-5#Zw|}mC zr`ld{s=RdjY*J|u_&ZJ~3QL_qcq-g0#T6v4t8W2CFx0E9gu+M-hujoJn+)nQ9tlB&;i=OIp7084*21H zlJpdC4JZKx;14)(cow(?tOB0`P6L0#LB|h(Zvt)LB47a~unhbIJbV{84KOE*z|3>P z@j^#BVLM&7?~q#28=G5tLosAa)wO)RNLrEPBGsz+*(lOxkye_ktBO&eHKktPQY|i# zIIBq$87>@&DhkXXWsVu4PrS*sPPoC;i$a)MP(XR(%Epi?xGU!=T-D8wYSh{8}k zX*@2KZabk$kys4sNWNGC+E6G^;WmH`5D|MpZ0h0Jc(MGsxUP!}2;6h_9Q=*0DyoT&FM5>d57SPCA!&}RZ8xN@>p6sX ziz25t@LG{WT|Xf4cP3gQ{Oc)bMXukcxe^yTjHkqvqYfAKxsF{VzYAR)YWDe`RG}N) z5HZg67SxJJ9)^+IpXYI9>VZO#o_0&=c%wh(2A4TBup?+kk=7aQ9O9E!I6&|ytbf?7j-2GFN(Q@HI9J)8P|L~UoH zQY?oJ*>#=0IBUo6cf4T;{z5`HYGH7;p|g+~`rT-cYht03Czdn$exsqWoQ7_i>WW%Z ztxeKb$!u2EsVdjyHDy1k2UIqegR*3;D@09GVL|v%O(IiYwJyj8CIV8$5s{T!n(p`QMZPPNwW;OVin1>47GwXsf?(_(v4|3D^1j-m?jEaieWSxJY^PW zUB3W(464Ym7pBNsmGoE})TJAO%(Pu=x?TkzsDezzIImU|bD3%&Kc)dvKv7lZDT6aL z41HC#kVTX@kRP6;p{u4_u%WJ6P=iN(E?Q|CN?p;cxJ6e?OSPKTG|!+}ts;wz*@?^s zh6D~N8w$n}*}w`wR1CUI<ny?dWH4StD1unIZpV$o#pjq(D&aQ$im75Ub@;hmkiK`(}pQ zzFoqE;ES=jhdC&~s2wIYq~vt`!HvMZvK{f@>vo(Xbi&-_K`9=nF~Zs|YZec_JZ^V= z&-3wr;VToK7w5@v(sqQbRNL*hf*U;d^{9s#N6aL?J?!vAfFZi=?>ezUDSh4q%M*Pd zWWvuKI6bJsls<>T&%%Cwz-{Oc18~vtZD+&}&t|jaK*5wg2dR74aj~3qn_{Z$InkNB zmJnx*<**0)!-#r5b^&fjO!GzJ*%vFEo*VJ{VeIbFHr5?8?vvOx?K)!W9%7jQCK85t zGEX@Z)*Pbqz`c{_aQTrvk3^T?wNK~-yN>-jeJIwaGVWT7TpXMqR^fdIG$w1E~-2L6S!fPVrn1HT7e0Dca90|
$z>~mNfIYwmwt*`^3HT83LEu%KA^aKm9q>HxCEy9*abN)Wz%p_J7Xaqzr$F{(3}g&s3}g&s3}g)4Qw-dc2n)1m81$*UJU)$<_!!#uhi%U(nv zv3C@PTb}WO_4pK_UM~(iijlqeZWSu}SGq#w8mC`ht|Z zN#d>swZx*&CW$DMDlv*hM_c4#Qf`zx87sih>Uy@ zd;}TT7YY!T+=;QF!s0u56)sw04@rdcu#?|`ubyHr!Pb9#D~O=Cz(++k4rxZ-6pw81 zDB)7Kcc#~N(vdIzPn3yW`!()i-mnLcM-}0Wxm?&jnBW8XMVXvFbKlD?oH+dsm_(2E zZ2sZyyc1$%o9#|KDvh3z`|a#d;<1UZ<4~LhBR+A 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 */