From 3f1fd7de5e4de061acfeffb07d37b2f9b5c78d16 Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Fri, 20 Sep 2019 13:53:10 -0700 Subject: Handle references in OpenACC "private" clauses Combination of OG14 commits 141a592bf147c91c28de7864fa12259687e827e3 8d7562192cc814c6d0d48b424d7751762871a37b + new testsuite fixes to add xfails for tests that already failed on OG14. gcc/ChangeLog * gimplify.cc (localize_reductions): Rewrite references for OMP_CLAUSE_PRIVATE also. Do not create local variable for privatized arrays as the size is not directly known by the type. gcc/testsuite/ChangeLog * gfortran.dg/goacc/privatization-1-compute-loop.f90: Add xfails. * gfortran.dg/goacc/privatization-1-compute.f90: Likewise. libgomp/ChangeLog * testsuite/libgomp.oacc-c++/privatized-ref-3.C: Add xfails. * testsuite/libgomp.oacc-fortran/optional-private.f90: Likewise. * testsuite/libgomp.oacc-fortran/privatized-ref-1.f95: Likewise. Co-Authored-By: Tobias Burnus Co-Authored-By: Sandra Loosemore --- gcc/gimplify.cc | 16 ++++++++++++++++ .../gfortran.dg/goacc/privatization-1-compute-loop.f90 | 6 ++---- .../gfortran.dg/goacc/privatization-1-compute.f90 | 12 ++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) (limited to 'gcc') diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 2a351b0..bd45816 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -16243,6 +16243,22 @@ localize_reductions (tree clauses, tree body) OMP_CLAUSE_REDUCTION_PRIVATE_DECL (c) = new_var; } + else if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_PRIVATE) + { + var = OMP_CLAUSE_DECL (c); + + if (!lang_hooks.decls.omp_privatize_by_reference (var)) + continue; + type = TREE_TYPE (TREE_TYPE (var)); + if (TREE_CODE (type) == ARRAY_TYPE) + continue; + new_var = create_tmp_var (type, IDENTIFIER_POINTER (DECL_NAME (var))); + + pr.ref_var = var; + pr.local_var = new_var; + + walk_tree (&body, localize_reductions_r, &pr, NULL); + } } diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 index ad5e11a..c3fc774 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 @@ -40,7 +40,8 @@ contains ! (See C/C++ example.) a = g (i, j, a, c) - ! { dg-warning {'a' is used uninitialized} TODO { xfail *-*-* } .-1 } + ! { dg-warning {'a\.[0-9]+' is used uninitialized} "" { target *-*-* } .-1 } + ! { dg-note {'a\.[0-9]+' was declared here} "" { target *-*-* } l_loop$c_loop } x = a !$acc atomic write y = a @@ -51,9 +52,6 @@ contains ! { dg-note {variable 'j\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_compute$c_compute } ! { dg-note {variable 'i\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'j\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } - ! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } - ! { dg-note {variable 'j' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } - ! { dg-note {variable 'a' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'x' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'y' in 'private' clause is candidate for adjusting OpenACC privatization level} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } l_loop$c_loop } diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 index 68d084d..d4d548a 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 @@ -37,12 +37,12 @@ contains ! (See C/C++ example.) a = g (i, j, a, c) - ! { dg-warning {'i' is used uninitialized} {} { target *-*-* } .-1 } - ! { dg-note {'i' was declared here} {} { target *-*-* } l_function$c_function } - ! { dg-warning {'j' is used uninitialized} {} { target *-*-* } .-3 } - ! { dg-note {'j' was declared here} {} { target *-*-* } l_function$c_function } - ! { dg-warning {'a' is used uninitialized} {} { target *-*-* } .-5 } - ! { dg-note {'a' was declared here} {} { target *-*-* } l_function$c_function } + ! { dg-warning {'i\.[0-9]+' is used uninitialized} {} { target *-*-* } .-1 } + ! { dg-note {'i\.[0-9]+' was declared here} {} { target *-*-* } l_compute$c_compute } + ! { dg-warning {'j\.[0-9]+' is used uninitialized} {} { target *-*-* } .-3 } + ! { dg-note {'j\.[0-9]+' was declared here} {} { target *-*-* } l_compute$c_compute } + ! { dg-warning {'a\.[0-9]+' is used uninitialized} {} { target *-*-* } .-5 } + ! { dg-note {'a\.[0-9]+' was declared here} {} { target *-*-* } l_compute$c_compute } x = a !$acc atomic write ! ... to force 'TREE_ADDRESSABLE'. y = a -- cgit v1.1