This is the mail archive of the gcc-bugs@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Bug middle-end/66199] [4.9/5 Regression] lastprivate/linear clause issues on combined constructs


https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66199

--- Comment #2 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Author: jakub
Date: Fri May 22 08:10:32 2015
New Revision: 223521

URL: https://gcc.gnu.org/viewcvs?rev=223521&root=gcc&view=rev
Log:
        Backported from mainline
        2015-05-19  Jakub Jelinek  <jakub@redhat.com>

        PR middle-end/66199
        * tree.h (OMP_TEAMS_COMBINED): Define.
        * gimplify.c (enum gimplify_omp_var_data): Add
        GOVD_LINEAR_LASTPRIVATE_NO_OUTER.
        (enum omp_region_type): Add ORT_COMBINED_TEAMS.
        (omp_notice_variable): Accept both ORT_TEAMS
        and ORT_COMBINED_TEAMS.  Don't recurse if
        GOVD_LINEAR_LASTPRIVATE_NO_OUTER is set and either
        GOVD_LINEAR is set, or GOVD_LASTPRIVATE without
        GOVD_FIRSTPRIVATE.
        (omp_no_lastprivate): New function.
        (gimplify_scan_omp_clauses): For OMP_CLAUSE_LASTPRIVATE
        and OMP_CLAUSE_LINEAR, if omp_no_lastprivate, don't
        notice_outer and set appropriate bits, otherwise make
        sure default(none) combined constructs won't complain.
        (gimplify_adjust_omp_clauses): Remove OMP_CLAUSE_LINEAR
        outer special casing, for OMP_CLAUSE_LASTPRIVATE if
        omp_no_lastprivate either remove the clause or turn it
        into OMP_CLAUSE_PRIVATE.
        (gimplify_omp_for): Fix up handling of implicit
        lastprivate or linear iterators.
        (gimplify_omp_workshare): For OMP_TEAMS_COMBINED use
        ORT_COMBINED_TEAMS.
        * omp-low.c (lower_omp_for_lastprivate): For combined
        for simd use fd.loop.n2 from the for rather than simd.
gcc/c/
        * c-parser.c (c_parser_omp_for_loop): Don't add
        OMP_CLAUSE_SHARED to OMP_PARALLEL_CLAUSES when moving
        OMP_CLAUSE_LASTPRIVATE clause to OMP_FOR_CLAUSES.
        (c_parser_omp_teams): Set OMP_TEAMS_COMBINED for combined
        constructs.
gcc/cp/
        * parser.c (cp_parser_omp_for_loop): Don't add
        OMP_CLAUSE_SHARED to OMP_PARALLEL_CLAUSES when moving
        OMP_CLAUSE_LASTPRIVATE clause to OMP_FOR_CLAUSES.
        (cp_parser_omp_teams): Set OMP_TEAMS_COMBINED for combined
        constructs.
gcc/fortran/
        * trans-openmp.c (gfc_trans_omp_teams): Set OMP_TEAMS_COMBINED for
        combined constructs.
        (gfc_trans_omp_target): Make sure BIND_EXPR has non-NULL
        BIND_EXPR_BLOCK.
libgomp/
        * testsuite/libgomp.c/pr66199-1.c: New test.
        * testsuite/libgomp.c/pr66199-2.c: New test.
        * testsuite/libgomp.c++/pr66199-1.C: New test.
        * testsuite/libgomp.c++/pr66199-2.C: New test.
        * testsuite/libgomp.fortran/pr66199-1.f90: New test.
        * testsuite/libgomp.fortran/pr66199-2.f90: New test.

Added:
    branches/gcc-5-branch/libgomp/testsuite/libgomp.c++/pr66199-1.C
    branches/gcc-5-branch/libgomp/testsuite/libgomp.c++/pr66199-2.C
    branches/gcc-5-branch/libgomp/testsuite/libgomp.c/pr66199-1.c
    branches/gcc-5-branch/libgomp/testsuite/libgomp.c/pr66199-2.c
    branches/gcc-5-branch/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
    branches/gcc-5-branch/libgomp/testsuite/libgomp.fortran/pr66199-2.f90
Modified:
    branches/gcc-5-branch/gcc/ChangeLog
    branches/gcc-5-branch/gcc/c/ChangeLog
    branches/gcc-5-branch/gcc/c/c-parser.c
    branches/gcc-5-branch/gcc/cp/ChangeLog
    branches/gcc-5-branch/gcc/cp/parser.c
    branches/gcc-5-branch/gcc/fortran/ChangeLog
    branches/gcc-5-branch/gcc/fortran/trans-openmp.c
    branches/gcc-5-branch/gcc/gimplify.c
    branches/gcc-5-branch/gcc/omp-low.c
    branches/gcc-5-branch/gcc/tree.h
    branches/gcc-5-branch/libgomp/ChangeLog


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]