From 459cc838034d91436c06bb842c6231c1a7189c62 Mon Sep 17 00:00:00 2001 From: Andrew <16061801+brada4@users.noreply.github.com> Date: Tue, 20 Nov 2018 20:59:35 +0100 Subject: [PATCH] initialize z/cdot result variable at declaration time to avoid confusing static checker --- kernel/arm/zdot.c | 5 +---- kernel/arm64/zdot_thunderx2t99.c | 4 +--- kernel/mips/cdot_msa.c | 5 +---- kernel/mips/zdot.c | 5 +---- kernel/mips/zdot_msa.c | 5 +---- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/kernel/arm/zdot.c b/kernel/arm/zdot.c index 733c235c6..c90e544a5 100644 --- a/kernel/arm/zdot.c +++ b/kernel/arm/zdot.c @@ -42,16 +42,13 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA BLASLONG i=0; BLASLONG ix=0,iy=0; FLOAT dot[2]; - OPENBLAS_COMPLEX_FLOAT result; + OPENBLAS_COMPLEX_FLOAT result=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0); BLASLONG inc_x2; BLASLONG inc_y2; dot[0]=0.0; dot[1]=0.0; - CREAL(result) = 0.0 ; - CIMAG(result) = 0.0 ; - if ( n < 1 ) return(result); inc_x2 = 2 * inc_x ; diff --git a/kernel/arm64/zdot_thunderx2t99.c b/kernel/arm64/zdot_thunderx2t99.c index 6185bc7d9..f9bba5610 100644 --- a/kernel/arm64/zdot_thunderx2t99.c +++ b/kernel/arm64/zdot_thunderx2t99.c @@ -312,9 +312,7 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA int nthreads; FLOAT dummy_alpha; #endif - OPENBLAS_COMPLEX_FLOAT zdot; - CREAL(zdot) = 0.0; - CIMAG(zdot) = 0.0; + OPENBLAS_COMPLEX_FLOAT zdot = OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0); #if defined(SMP) if (inc_x == 0 || inc_y == 0 || n <= 10000) diff --git a/kernel/mips/cdot_msa.c b/kernel/mips/cdot_msa.c index 0999fa08d..ffe3a168f 100644 --- a/kernel/mips/cdot_msa.c +++ b/kernel/mips/cdot_msa.c @@ -58,14 +58,11 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA v4f32 dot5 = {0, 0, 0, 0}; v4f32 dot6 = {0, 0, 0, 0}; v4f32 dot7 = {0, 0, 0, 0}; - OPENBLAS_COMPLEX_FLOAT result; + OPENBLAS_COMPLEX_FLOAT result=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0); dot[0] = 0.0; dot[1] = 0.0; - CREAL(result) = 0.0; - CIMAG(result) = 0.0; - if (n < 1) return (result); if ((1 == inc_x) && (1 == inc_y)) diff --git a/kernel/mips/zdot.c b/kernel/mips/zdot.c index df99bae85..ee35fc79b 100644 --- a/kernel/mips/zdot.c +++ b/kernel/mips/zdot.c @@ -32,16 +32,13 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA BLASLONG i=0; BLASLONG ix=0,iy=0; FLOAT dot[2]; - OPENBLAS_COMPLEX_FLOAT result; + OPENBLAS_COMPLEX_FLOAT result=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0); BLASLONG inc_x2; BLASLONG inc_y2; dot[0]=0.0; dot[1]=0.0; - CREAL(result) = 0.0 ; - CIMAG(result) = 0.0 ; - if ( n < 1 ) return(result); inc_x2 = 2 * inc_x ; diff --git a/kernel/mips/zdot_msa.c b/kernel/mips/zdot_msa.c index 0d9b3c4fa..156219d05 100644 --- a/kernel/mips/zdot_msa.c +++ b/kernel/mips/zdot_msa.c @@ -58,14 +58,11 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA v2f64 dot6 = {0, 0}; v2f64 dot7 = {0, 0}; v2f64 zero = {0, 0}; - OPENBLAS_COMPLEX_FLOAT result; + OPENBLAS_COMPLEX_FLOAT result=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0); dot[0] = 0.0; dot[1] = 0.0; - CREAL(result) = 0.0; - CIMAG(result) = 0.0; - if (n < 1) return (result); inc_x2 = 2 * inc_x;