OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/49897 (nesting lastprivate gives incorrect result)

Browse Source 
PR middle-end/49897
	PR middle-end/49898
	* omp-low.c (use_pointer_for_field): If disallowing copy-in/out
	in nested parallel and outer is a gimple_reg, mark it as addressable
	and set its bit in task_shared_vars bitmap too.

	* testsuite/libgomp.c/pr49897-1.c: New test.
	* testsuite/libgomp.c/pr49897-2.c: New test.
	* testsuite/libgomp.c/pr49898-1.c: New test.
	* testsuite/libgomp.c/pr49898-2.c: New test.

From-SVN: r176945
This commit is contained in:
Jakub Jelinek 2011-07-29 19:45:42 +02:00 committed by Jakub Jelinek
parent 8984005841
commit 2514265077
7 changed files with 121 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2011-07-29 Jakub Jelinek <jakub@redhat.com>
PR middle-end/49897
PR middle-end/49898
* omp-low.c (use_pointer_for_field): If disallowing copy-in/out
in nested parallel and outer is a gimple_reg, mark it as addressable
and set its bit in task_shared_vars bitmap too.
2011-07-29 Uros Bizjak <ubizjak@gmail.com>
* config/i386/predicates.md (tp_or_register_operand): Remove predicate.

6
gcc/omp-low.c
View File

@ -781,7 +781,7 @@ use_pointer_for_field (tree decl, omp_context *shared_ctx)
break;
if (c)
return true;
goto maybe_mark_addressable_and_ret;
}
}
@ -791,7 +791,9 @@ use_pointer_for_field (tree decl, omp_context *shared_ctx)
returns, the task hasn't necessarily terminated. */
if (!TREE_READONLY (decl) && is_task_ctx (shared_ctx))
{
tree outer = maybe_lookup_decl_in_outer_ctx (decl, shared_ctx);
tree outer;
maybe_mark_addressable_and_ret:
outer = maybe_lookup_decl_in_outer_ctx (decl, shared_ctx);
if (is_gimple_reg (outer))
{
/* Taking address of OUTER in lower_send_shared_vars

9
libgomp/ChangeLog
View File

@ -1,3 +1,12 @@
2011-07-29 Jakub Jelinek <jakub@redhat.com>
PR middle-end/49897
PR middle-end/49898
* testsuite/libgomp.c/pr49897-1.c: New test.
* testsuite/libgomp.c/pr49897-2.c: New test.
* testsuite/libgomp.c/pr49898-1.c: New test.
* testsuite/libgomp.c/pr49898-2.c: New test.
2011-07-28 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/lib/libgomp.exp (libgomp_init): Add -march=i486

31
libgomp/testsuite/libgomp.c/pr49897-1.c Normal file
View File

@ -0,0 +1,31 @@
/* PR middle-end/49897 */
/* { dg-do run } */
extern void abort (void);
int
main ()
{
int i, j, x = 0, y, sum = 0;
#pragma omp parallel reduction(+:sum)
{
#pragma omp for firstprivate(x) lastprivate(x, y)
for (i = 0; i < 10; i++)
{
x = i;
y = 0;
#pragma omp parallel reduction(+:sum)
{
#pragma omp for firstprivate(y) lastprivate(y)
for (j = 0; j < 10; j++)
{
y = j;
sum += y;
}
}
}
}
if (x != 9 || y != 9 || sum != 450)
abort ();
return 0;
}

25
libgomp/testsuite/libgomp.c/pr49897-2.c Normal file
View File

@ -0,0 +1,25 @@
/* PR middle-end/49897 */
/* { dg-do run } */
extern void abort (void);
int
main ()
{
int i, j, x = 0, y, sum = 0;
#pragma omp parallel for reduction(+:sum) firstprivate(x) lastprivate(x, y)
for (i = 0; i < 10; i++)
{
x = i;
y = 0;
#pragma omp parallel for reduction(+:sum) firstprivate(y) lastprivate(y)
for (j = 0; j < 10; j++)
{
y = j;
sum += y;
}
}
if (x != 9 || y != 9 || sum != 450)
abort ();
return 0;
}

26
libgomp/testsuite/libgomp.c/pr49898-1.c Normal file
View File

@ -0,0 +1,26 @@
/* PR middle-end/49898 */
/* { dg-do run } */
extern void abort (void);
int
main ()
{
int i, j, sum = 0;
#pragma omp parallel
{
#pragma omp for reduction(+:sum)
for (i = 0; i < 10; i++)
{
#pragma omp parallel
{
#pragma omp for reduction(+:sum)
for (j = 0; j < 10; j++)
sum += j;
}
}
}
if (sum != 450)
abort ();
return 0;
}

18
libgomp/testsuite/libgomp.c/pr49898-2.c Normal file
View File

@ -0,0 +1,18 @@
/* PR middle-end/49898 */
/* { dg-do run } */
extern void abort (void);
int
main ()
{
int i, j, sum = 0;
#pragma omp parallel for reduction(+:sum)
for (i = 0; i < 10; i++)
#pragma omp parallel for reduction(+:sum)
for (j = 0; j < 10; j++)
sum += j;
if (sum != 450)
abort ();
return 0;
}