Merge pull request #2791 from martin-frbg/issue2787

martin-frbg · web-flow · commit a073fa870e85 · 2020-08-23T19:33:03.000+02:00
Fix crashes in parallelized x86_64 ZDOT particularly on Windows
diff --git a/kernel/x86_64/zdot.c b/kernel/x86_64/zdot.c
@@ -168,7 +168,7 @@ static void zdot_compute (BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLO
 
 #if defined(SMP)
 static int zdot_thread_function(BLASLONG n, BLASLONG dummy0,
-BLASLONG dummy1, FLOAT dummy2, FLOAT *x, BLASLONG inc_x, FLOAT *y,
+BLASLONG dummy1, FLOAT dummy2r, FLOAT dummy2i, FLOAT *x, BLASLONG inc_x, FLOAT *y,
 BLASLONG inc_y, FLOAT *result, BLASLONG dummy3)
 {
         zdot_compute(n, x, inc_x, y, inc_y, (void *)result);

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ static void zdot_compute (BLASLONG n, FLOAT x, BLASLONG inc_x, FLOAT y, BLASLO`
`168`	`168`
`169`	`169`	`#if defined(SMP)`
`170`	`170`	`static int zdot_thread_function(BLASLONG n, BLASLONG dummy0,`
`171`		`-BLASLONG dummy1, FLOAT dummy2, FLOAT x, BLASLONG inc_x, FLOAT y,`
	`171`	`+BLASLONG dummy1, FLOAT dummy2r, FLOAT dummy2i, FLOAT x, BLASLONG inc_x, FLOAT y,`
`172`	`172`	`BLASLONG inc_y, FLOAT *result, BLASLONG dummy3)`
`173`	`173`	`{`
`174`	`174`	`zdot_compute(n, x, inc_x, y, inc_y, (void *)result);`