Merge pull request #1419 from brada4/develop

Initialize unitialized values for repeated calls

Author: martin-frbg

driver/others/init.c

@@ -903,6 +903,7 @@ void gotoblas_affinity_init(void) {
     }
 #else
     common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
+    }
 #endif
 
 #endif

driver/others/memory.c

@@ -177,7 +177,7 @@ int get_num_procs(void) {
 cpu_set_t *cpusetp;
 size_t size;
 int ret;
-int i,n;
+// int i,n;
 
   if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF);
 #if !defined(OS_LINUX)

kernel/generic/laswp_ncopy_2.c

@@ -116,7 +116,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
 	      *b2 = A2;
 	      *b4 = A4;
 	    }
-	} else
+	} else {
 	  if (b1 == a2) {
 	    if (b2 == a2) {
 	      *(buffer + 0) = A2;
@@ -139,7 +139,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
 	      *(buffer + 3) = A4;
 	      *b1 = A1;
 	      *b3 = A3;
-	    } else
+	    } else {
 	      if (b2 == b1) {
 		*(buffer + 0) = B1;
 		*(buffer + 1) = B3;
@@ -157,6 +157,8 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
 		*b3 = A3;
 		*b4 = A4;
 	      }
+	    }
+	  }
 	  }
 
 	  buffer += 4;

kernel/generic/trmm_ltcopy_2.c

@@ -120,30 +120,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  ao2 += 1; */
 	  b += 2;
 	} else
+#ifdef UNIT
 	  if (X < posY) {
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-	    // ao1 += lda;
-	    b += 2;
-	  } else {
+#endif 
+	     b[ 0] = *(ao1 + 0);
 #ifdef UNIT
-	    data02 = *(ao1 + 1);
+	  } else {
 
 	    b[ 0] = ONE;
-	    b[ 1] = data02;
-#else
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-#endif
-	    // ao1 += 2;
-	    b += 2;
 	  }
+#endif 
+	  b[ 1] = *(ao1 + 1);
+	  b += 2;
       }
 
       posY += 2;

kernel/generic/trmm_ltcopy_4.c

@@ -410,36 +410,17 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 
       i = (m & 1);
       if (i) {
-
-	if (X > posY) {
-	  /* ao1 += 1;
-	  ao2 += 1; */
-
-	  b += 2;
-	} else
-	  if (X < posY) {
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
-	    // ao1 += lda;
-	    b += 2;
-	  } else {
 #ifdef UNIT
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = ONE;
-	    b[ 1] = data02;
-#else
-	    data01 = *(ao1 + 0);
-	    data02 = *(ao1 + 1);
-
-	    b[ 0] = data01;
-	    b[ 1] = data02;
+	if (X < posY) {
 #endif
-	    b += 2;
-	  }
+	  b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	} else {
+	  b[ 0] = ONE;
+	}
+#endif
+	b[ 1] = *(ao1 + 1);
+	b += 2;
       }
       posY += 2;
   }

kernel/generic/trmm_utcopy_16.c

@@ -1487,23 +1487,19 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
       if (X < posY) {
 	a01 ++;
 	a02 ++;
-	b += 2;
-      } else
+      } else {
+#ifdef UNIT
 	if (X > posY) {
+#endif
 	  b[  0] = *(a01 +  0);
-	  b[  1] = *(a01 +  1);
-	  // a01 += lda;
-	  b += 2;
-	} else {
 #ifdef UNIT
+	} else {
 	  b[  0] = ONE;
-	  b[  1] = *(a01 +  1);
-#else
-	  b[  0] = *(a01 +  0);
-	  b[  1] = *(a01 +  1);
-#endif
-	  b += 2;
 	}
+#endif
+	b[  1] = *(a01 +  1);
+      }
+      b += 2;
     }
     posY += 2;
   }
@@ -1522,25 +1518,22 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     if (i > 0) {
       do {
 	if (X < posY) {
-	  a01 += 1;
-	  b ++;
-	} else
+	  a01 ++;
+	} else {
+#ifdef UNIT
 	  if (X > posY) {
+#endif
 	    b[  0] = *(a01 +  0);
-	    a01 += lda;
-	    b ++;
-	  } else {
 #ifdef UNIT
+	  } else {
 	    b[ 0] = ONE;
-#else
-	    b[ 0] = *(a01 +  0);
-#endif
-	    a01 += lda;
-	    b ++;
 	  }
-
-	  X += 1;
-	  i --;
+#endif
+	  a01 += lda;
+	}
+	b ++;
+	X ++;
+	i --;
       } while (i > 0);
     }
     // posY += 1;

kernel/generic/trmm_utcopy_2.c

@@ -161,27 +161,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
     i = m;
     if (m > 0) {
       do {
-	if (X < posY) {
-	  b += 1;
-  	  ao1 += 1;
-	} else
-	  if (X > posY) {
-	    data01 = *(ao1 + 0);
-	    b[ 0] = data01;
-	    b += 1;
-	    ao1 += lda;
-	  } else {
 #ifdef UNIT
-	    b[ 0] = ONE;
-#else
-	    data01 = *(ao1 + 0);
-	    b[ 0] = data01;
+        if (X > posY) {
 #endif
-	    b += 1;
-	    ao1 += lda;
-	  }
-
-	X += 1;
+	  b[ 0] = *(ao1 + 0);
+#ifdef UNIT
+	} else {
+	  b[ 0] = ONE;
+	}
+#endif
+        b ++;
+        ao1 += lda;
+	X ++;
 	i --;
       } while (i > 0);
     }

kernel/generic/trmm_utcopy_4.c

@@ -443,26 +443,21 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	do {
 
 	  if (X < posY) {
-	    b += 1;
 	    ao1 += 1;
-	  } else
+	  } else {
+#ifdef UNIT
 	    if (X > posY) {
-	      data01 = *(ao1 + 0);
-	      b[ 0] = data01;
-	      ao1 += lda;
-	      b += 1;
-	    } else {
+#endif
+	      b[ 0] = *(ao1 + 0);
 #ifdef UNIT
+	    } else {
 	      b[ 0] = ONE;
-#else
-	      data01 = *(ao1 + 0);
-	      b[ 0] = data01;
-#endif
-	      ao1 += lda;
-	      b += 1;
 	    }
-
-	  X += 1;
+#endif
+	    ao1 += lda;
+	  }
+	  b ++;
+	  X ++;
 	  i --;
 	} while (i > 0);
       }

kernel/generic/trmmkernel_16x2.c

@@ -52,6 +52,8 @@ int CNAME(BLASLONG bm,BLASLONG bn,BLASLONG bk,FLOAT alpha,FLOAT* ba,FLOAT* bb,FL
 
 #if !defined(LEFT)
    off = -offset;
+#else
+   off = 0;
 #endif
 
 

kernel/generic/trmmkernel_2x2.c

@@ -11,6 +11,8 @@ int CNAME(BLASLONG bm,BLASLONG bn,BLASLONG bk,FLOAT alpha,FLOAT* ba,FLOAT* bb,FL
    BLASLONG off, temp;
 #if defined(TRMMKERNEL) && !defined(LEFT)
    off = -offset;
+#else
+   off = 0;
 #endif
    for (j=0; j<bn/2; j+=1)
      {