Refs xianyi/OpenBLAS-CI#10 , Fix sdot for scipy test_iterative.test_convergence test failure on AMD bulldozer and piledriver.

xianyi · xianyi · commit d4380c1fe4b9 · 2016-04-07T01:44:18.000+08:00
diff --git a/kernel/x86_64/sdot.c b/kernel/x86_64/sdot.c
@@ -72,18 +72,20 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
 {
 	BLASLONG i=0;
 	BLASLONG ix=0,iy=0;
+	double dot = 0.0 ;
 
-	FLOAT  dot = 0.0 ;
+	FLOAT mydot=0.0;
+	BLASLONG n1;
 
 	if ( n <= 0 )  return(dot);
 
 	if ( (inc_x == 1) && (inc_y == 1) )
 	{
 
-		BLASLONG n1 = n & -32;
+	        n1 = n & (BLASLONG)(-32);
 
 		if ( n1 )
-			sdot_kernel_16(n1, x, y , &dot );
+			sdot_kernel_16(n1, x, y , &mydot );
 
 
 		i = n1;
@@ -94,12 +96,13 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
 			i++ ;
 
 		}
+		dot+=mydot;
 		return(dot);
 
 
 	}
 
-	BLASLONG n1 = n & -2;
+	n1 = n & (BLASLONG)(-2);
 
 	while(i < n1)
 	{
@@ -124,4 +127,3 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
 
 }
 
-

Original file line number	Diff line number	Diff line change
`@@ -72,18 +72,20 @@ FLOAT CNAME(BLASLONG n, FLOAT x, BLASLONG inc_x, FLOAT y, BLASLONG inc_y)`
`72`	`72`	`{`
`73`	`73`	`BLASLONG i=0;`
`74`	`74`	`BLASLONG ix=0,iy=0;`
	`75`	`+ double dot = 0.0 ;`
`75`	`76`
`76`		`- FLOAT dot = 0.0 ;`
	`77`	`+ FLOAT mydot=0.0;`
	`78`	`+ BLASLONG n1;`
`77`	`79`
`78`	`80`	`if ( n <= 0 ) return(dot);`
`79`	`81`
`80`	`82`	`if ( (inc_x == 1) && (inc_y == 1) )`
`81`	`83`	`{`
`82`	`84`
`83`		`- BLASLONG n1 = n & -32;`
	`85`	`+ n1 = n & (BLASLONG)(-32);`
`84`	`86`
`85`	`87`	`if ( n1 )`
`86`		`- sdot_kernel_16(n1, x, y , &dot );`
	`88`	`+ sdot_kernel_16(n1, x, y , &mydot );`
`87`	`89`
`88`	`90`
`89`	`91`	`i = n1;`
`@@ -94,12 +96,13 @@ FLOAT CNAME(BLASLONG n, FLOAT x, BLASLONG inc_x, FLOAT y, BLASLONG inc_y)`
`94`	`96`	`i++ ;`
`95`	`97`
`96`	`98`	`}`
	`99`	`+ dot+=mydot;`
`97`	`100`	`return(dot);`
`98`	`101`
`99`	`102`
`100`	`103`	`}`
`101`	`104`
`102`		`- BLASLONG n1 = n & -2;`
	`105`	`+ n1 = n & (BLASLONG)(-2);`
`103`	`106`
`104`	`107`	`while(i < n1)`
`105`	`108`	`{`
`@@ -124,4 +127,3 @@ FLOAT CNAME(BLASLONG n, FLOAT x, BLASLONG inc_x, FLOAT y, BLASLONG inc_y)`
`124`	`127`
`125`	`128`	`}`
`126`	`129`
`127`		`-`