mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-24 03:14:08 +08:00
re PR middle-end/35130 (OpenMP: Private variable passed to subroutine)
PR middle-end/35130 * tree-nested.c (convert_call_expr): Put FRAME.* vars into OMP_CLAUSE_SHARED rather than OMP_CLAUSE_FIRSTPRIVATE clause. * testsuite/libgomp.fortran/pr35130.f90: New test. * testsuite/libgomp.c/pr35130.c: New test. From-SVN: r132349
This commit is contained in:
parent
92fab505d2
commit
6837b3b895
@ -1,3 +1,9 @@
|
||||
2008-02-15 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR middle-end/35130
|
||||
* tree-nested.c (convert_call_expr): Put FRAME.* vars into
|
||||
OMP_CLAUSE_SHARED rather than OMP_CLAUSE_FIRSTPRIVATE clause.
|
||||
|
||||
2008-02-15 Richard Guenther <rguenther@suse.de>
|
||||
Zdenek Dvorak <ook@ucw.cz>
|
||||
|
||||
|
@ -1739,7 +1739,8 @@ convert_call_expr (tree *tp, int *walk_subtrees, void *data)
|
||||
break;
|
||||
if (c == NULL)
|
||||
{
|
||||
c = build_omp_clause (OMP_CLAUSE_FIRSTPRIVATE);
|
||||
c = build_omp_clause (i ? OMP_CLAUSE_FIRSTPRIVATE
|
||||
: OMP_CLAUSE_SHARED);
|
||||
OMP_CLAUSE_DECL (c) = decl;
|
||||
OMP_CLAUSE_CHAIN (c) = OMP_PARALLEL_CLAUSES (t);
|
||||
OMP_PARALLEL_CLAUSES (t) = c;
|
||||
|
@ -1,3 +1,9 @@
|
||||
2008-02-15 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR middle-end/35130
|
||||
* testsuite/libgomp.fortran/pr35130.f90: New test.
|
||||
* testsuite/libgomp.c/pr35130.c: New test.
|
||||
|
||||
2008-01-25 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR middle-end/33880
|
||||
|
131
libgomp/testsuite/libgomp.c/pr35130.c
Normal file
131
libgomp/testsuite/libgomp.c/pr35130.c
Normal file
@ -0,0 +1,131 @@
|
||||
/* PR middle-end/35130 */
|
||||
|
||||
extern void abort (void);
|
||||
|
||||
void
|
||||
f1 (void)
|
||||
{
|
||||
int a[4], k;
|
||||
void nested (int x)
|
||||
{
|
||||
a[x] = 42;
|
||||
}
|
||||
|
||||
for (k = 0; k < 4; k++)
|
||||
a[k] = 0;
|
||||
#pragma omp parallel for
|
||||
for (k = 0; k < 4; k++)
|
||||
nested (k);
|
||||
|
||||
if (a[0] != 42 || a[1] != 42 || a[2] != 42 || a[3] != 42)
|
||||
abort ();
|
||||
}
|
||||
|
||||
void
|
||||
f2 (void)
|
||||
{
|
||||
int a[4], k;
|
||||
void nested (void)
|
||||
{
|
||||
int l;
|
||||
void nested2 (int x)
|
||||
{
|
||||
a[x] = 42;
|
||||
}
|
||||
#pragma omp parallel for
|
||||
for (l = 0; l < 4; l++)
|
||||
nested2 (l);
|
||||
}
|
||||
|
||||
for (k = 0; k < 4; k++)
|
||||
a[k] = 0;
|
||||
|
||||
nested ();
|
||||
|
||||
if (a[0] != 42 || a[1] != 42 || a[2] != 42 || a[3] != 42)
|
||||
abort ();
|
||||
}
|
||||
|
||||
void
|
||||
f3 (void)
|
||||
{
|
||||
int a[4], b[4], c[4], k;
|
||||
void nested (int x)
|
||||
{
|
||||
a[x] = b[x] = c[x] = 42;
|
||||
}
|
||||
|
||||
for (k = 0; k < 4; k++)
|
||||
a[k] = b[k] = c[k] = 0;
|
||||
nested (0);
|
||||
|
||||
#pragma omp parallel
|
||||
{
|
||||
#pragma omp single
|
||||
{
|
||||
a[1] = 43;
|
||||
b[1] = 43;
|
||||
}
|
||||
#pragma omp parallel
|
||||
{
|
||||
#pragma omp single
|
||||
{
|
||||
b[2] = 44;
|
||||
c[2] = 44;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (a[0] != 42 || a[1] != 43 || a[2] != 0 || a[3] != 0)
|
||||
abort ();
|
||||
if (b[0] != 42 || b[1] != 43 || b[2] != 44 || b[3] != 0)
|
||||
abort ();
|
||||
if (c[0] != 42 || c[1] != 0 || c[2] != 44 || c[3] != 0)
|
||||
abort ();
|
||||
}
|
||||
|
||||
void
|
||||
f4 (void)
|
||||
{
|
||||
int a[4], b[4], c[4], k;
|
||||
void nested ()
|
||||
{
|
||||
#pragma omp parallel
|
||||
{
|
||||
#pragma omp single
|
||||
{
|
||||
a[1] = 43;
|
||||
b[1] = 43;
|
||||
}
|
||||
#pragma omp parallel
|
||||
{
|
||||
#pragma omp single
|
||||
{
|
||||
b[2] = 44;
|
||||
c[2] = 44;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (k = 0; k < 4; k++)
|
||||
a[k] = b[k] = c[k] = k == 0 ? 42 : 0;
|
||||
nested ();
|
||||
|
||||
if (a[0] != 42 || a[1] != 43 || a[2] != 0 || a[3] != 0)
|
||||
abort ();
|
||||
if (b[0] != 42 || b[1] != 43 || b[2] != 44 || b[3] != 0)
|
||||
abort ();
|
||||
if (c[0] != 42 || c[1] != 0 || c[2] != 44 || c[3] != 0)
|
||||
abort ();
|
||||
}
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
f1 ();
|
||||
f2 ();
|
||||
f3 ();
|
||||
f4 ();
|
||||
return 0;
|
||||
}
|
20
libgomp/testsuite/libgomp.fortran/pr35130.f90
Normal file
20
libgomp/testsuite/libgomp.fortran/pr35130.f90
Normal file
@ -0,0 +1,20 @@
|
||||
! PR middle-end/35130
|
||||
|
||||
program pr35130
|
||||
implicit none
|
||||
real, dimension(20) :: a
|
||||
integer :: k
|
||||
a(:) = 0.0
|
||||
!$omp parallel do private(k)
|
||||
do k=1,size(a)
|
||||
call inner(k)
|
||||
end do
|
||||
!$omp end parallel do
|
||||
if (any (a.ne.42)) call abort
|
||||
contains
|
||||
subroutine inner(i)
|
||||
implicit none
|
||||
integer :: i
|
||||
a(i) = 42
|
||||
end subroutine inner
|
||||
end program pr35130
|
Loading…
Reference in New Issue
Block a user