public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r8-10882] openmp: Temporarily disable into_ssa when gimplifying OpenMP reduction clauses [PR99007] Date: Thu, 22 Apr 2021 16:50:35 +0000 (GMT) [thread overview] Message-ID: <20210422165035.387BF3846402@sourceware.org> (raw) https://gcc.gnu.org/g:5dfeb10fd2d21eebf329272cce687ad34c2ae2a9 commit r8-10882-g5dfeb10fd2d21eebf329272cce687ad34c2ae2a9 Author: Jakub Jelinek <jakub@redhat.com> Date: Wed Feb 10 10:34:58 2021 +0100 openmp: Temporarily disable into_ssa when gimplifying OpenMP reduction clauses [PR99007] gimplify_scan_omp_clauses was already calling gimplify_expr with false as last argument to make sure it is not an SSA_NAME, but as the testcases show, that is not enough, SSA_NAME temporaries created during that gimplification can be reused too and we can't allow SSA_NAMEs to be used across OpenMP region boundaries, as we can only firstprivatize decls. Fixed by temporarily disabling into_ssa. 2021-02-10 Jakub Jelinek <jakub@redhat.com> PR middle-end/99007 * gimplify.c (gimplify_scan_omp_clauses): For MEM_REF on reductions, temporarily disable gimplify_ctxp->into_ssa around gimplify_expr calls. * g++.dg/gomp/pr99007.C: New test. * gcc.dg/gomp/pr99007-1.c: New test. * gcc.dg/gomp/pr99007-2.c: New test. * gcc.dg/gomp/pr99007-3.c: New test. (cherry picked from commit deba6b20a3889aa23f0e4b3a5248de4172a0167d) Diff: --- gcc/gimplify.c | 7 +++++++ gcc/testsuite/g++.dg/gomp/pr99007.C | 19 +++++++++++++++++++ gcc/testsuite/gcc.dg/gomp/pr99007-1.c | 14 ++++++++++++++ gcc/testsuite/gcc.dg/gomp/pr99007-2.c | 16 ++++++++++++++++ gcc/testsuite/gcc.dg/gomp/pr99007-3.c | 16 ++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 12b0dc70f1e..634a022bb25 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7729,13 +7729,17 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, if (TREE_CODE (decl) == MEM_REF) { tree type = TREE_TYPE (decl); + bool saved_into_ssa = gimplify_ctxp->into_ssa; + gimplify_ctxp->into_ssa = false; if (gimplify_expr (&TYPE_MAX_VALUE (TYPE_DOMAIN (type)), pre_p, NULL, is_gimple_val, fb_rvalue, false) == GS_ERROR) { + gimplify_ctxp->into_ssa = saved_into_ssa; remove = true; break; } + gimplify_ctxp->into_ssa = saved_into_ssa; tree v = TYPE_MAX_VALUE (TYPE_DOMAIN (type)); if (DECL_P (v)) { @@ -7745,13 +7749,16 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, decl = TREE_OPERAND (decl, 0); if (TREE_CODE (decl) == POINTER_PLUS_EXPR) { + gimplify_ctxp->into_ssa = false; if (gimplify_expr (&TREE_OPERAND (decl, 1), pre_p, NULL, is_gimple_val, fb_rvalue, false) == GS_ERROR) { + gimplify_ctxp->into_ssa = saved_into_ssa; remove = true; break; } + gimplify_ctxp->into_ssa = saved_into_ssa; v = TREE_OPERAND (decl, 1); if (DECL_P (v)) { diff --git a/gcc/testsuite/g++.dg/gomp/pr99007.C b/gcc/testsuite/g++.dg/gomp/pr99007.C new file mode 100644 index 00000000000..f50d933e7ac --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr99007.C @@ -0,0 +1,19 @@ +// PR middle-end/99007 +// { dg-additional-options "-Wno-div-by-zero" } + +template <typename T> +void +bar (T *) +{ + T s[0/0]; + #pragma omp target + #pragma omp teams distribute parallel for reduction(+:s) + for (int i = 0; i < 8; i++) + ; +} + +void +foo (long *a) +{ + bar (a); +} diff --git a/gcc/testsuite/gcc.dg/gomp/pr99007-1.c b/gcc/testsuite/gcc.dg/gomp/pr99007-1.c new file mode 100644 index 00000000000..6a107841a7d --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr99007-1.c @@ -0,0 +1,14 @@ +/* PR middle-end/99007 */ + +void +bar (int n) +{ + int i; + long s[n]; + for (i = 0; i < n; i++) + s[i] = 0; + #pragma omp target map(tofrom:s) + #pragma omp teams distribute parallel for reduction(+:s) + for (i = 0; i < 8; i++) + s[3]++; +} diff --git a/gcc/testsuite/gcc.dg/gomp/pr99007-2.c b/gcc/testsuite/gcc.dg/gomp/pr99007-2.c new file mode 100644 index 00000000000..671c68e2f7b --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr99007-2.c @@ -0,0 +1,16 @@ +/* PR middle-end/99007 */ + +int +bar (int n) +{ + int s[n]; + int i, j; + for (i = 0; i < n; i++) + s[i] = 0; + #pragma omp target map(tofrom:s) + #pragma omp teams distribute parallel for reduction(+:s) private (j) + for (i = 0; i < 8; i++) + for (j = 0; j < n; j++) + s[j] += i; + return s[0] + s[n - 1]; +} diff --git a/gcc/testsuite/gcc.dg/gomp/pr99007-3.c b/gcc/testsuite/gcc.dg/gomp/pr99007-3.c new file mode 100644 index 00000000000..c6db941a277 --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr99007-3.c @@ -0,0 +1,16 @@ +/* PR middle-end/99007 */ + +int +bar (int n) +{ + int s[n]; + int i, j; + for (i = 0; i < n; i++) + s[i] = 0; + #pragma omp parallel reduction(+:s) num_threads(2) + #pragma omp parallel for reduction(+:s) private (j) + for (i = 0; i < 8; i++) + for (j = 0; j < n; j++) + s[j] += i; + return s[0] + s[n - 1]; +}
reply other threads:[~2021-04-22 16:50 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210422165035.387BF3846402@sourceware.org \ --to=jakub@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).