Hi!
tree-nested.c didn't handle C array sections in {,task_,in_}reduction clauses.
The following patch implements that, bootstrapped/regtested on x86_64-linux
and i686-linux, committed to trunk so far.
2020-03-14 Jakub Jelinek <ja...@redhat.com>
PR middle-end/93566
* tree-nested.c (convert_nonlocal_omp_clauses,
convert_local_omp_clauses): Handle {,in_,task_}reduction clauses
with C/C++ array sections.
* testsuite/libgomp.c/pr93566.c: New test.
--- gcc/tree-nested.c.jj 2020-03-13 11:23:23.593724452 +0100
+++ gcc/tree-nested.c 2020-03-14 09:54:53.319358556 +0100
@@ -1188,7 +1188,7 @@ convert_nonlocal_omp_clauses (tree *pcla
{
struct nesting_info *const info = (struct nesting_info *) wi->info;
bool need_chain = false, need_stmts = false;
- tree clause, decl;
+ tree clause, decl, *pdecl;
int dummy;
bitmap new_suppress;
@@ -1197,6 +1197,7 @@ convert_nonlocal_omp_clauses (tree *pcla
for (clause = *pclauses; clause ; clause = OMP_CLAUSE_CHAIN (clause))
{
+ pdecl = NULL;
switch (OMP_CLAUSE_CODE (clause))
{
case OMP_CLAUSE_REDUCTION:
@@ -1204,6 +1205,15 @@ convert_nonlocal_omp_clauses (tree *pcla
case OMP_CLAUSE_TASK_REDUCTION:
if (OMP_CLAUSE_REDUCTION_PLACEHOLDER (clause))
need_stmts = true;
+ if (TREE_CODE (OMP_CLAUSE_DECL (clause)) == MEM_REF)
+ {
+ pdecl = &TREE_OPERAND (OMP_CLAUSE_DECL (clause), 0);
+ if (TREE_CODE (*pdecl) == POINTER_PLUS_EXPR)
+ pdecl = &TREE_OPERAND (*pdecl, 0);
+ if (TREE_CODE (*pdecl) == INDIRECT_REF
+ || TREE_CODE (*pdecl) == ADDR_EXPR)
+ pdecl = &TREE_OPERAND (*pdecl, 0);
+ }
goto do_decl_clause;
case OMP_CLAUSE_LASTPRIVATE:
@@ -1230,7 +1240,9 @@ convert_nonlocal_omp_clauses (tree *pcla
case OMP_CLAUSE_USE_DEVICE_ADDR:
case OMP_CLAUSE_IS_DEVICE_PTR:
do_decl_clause:
- decl = OMP_CLAUSE_DECL (clause);
+ if (pdecl == NULL)
+ pdecl = &OMP_CLAUSE_DECL (clause);
+ decl = *pdecl;
if (VAR_P (decl)
&& (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
break;
@@ -1239,7 +1251,7 @@ convert_nonlocal_omp_clauses (tree *pcla
if (OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_SHARED)
OMP_CLAUSE_SHARED_READONLY (clause) = 0;
bitmap_set_bit (new_suppress, DECL_UID (decl));
- OMP_CLAUSE_DECL (clause) = get_nonlocal_debug_decl (info, decl);
+ *pdecl = get_nonlocal_debug_decl (info, decl);
if (OMP_CLAUSE_CODE (clause) != OMP_CLAUSE_PRIVATE)
need_chain = true;
}
@@ -1909,7 +1921,7 @@ convert_local_omp_clauses (tree *pclause
{
struct nesting_info *const info = (struct nesting_info *) wi->info;
bool need_frame = false, need_stmts = false;
- tree clause, decl;
+ tree clause, decl, *pdecl;
int dummy;
bitmap new_suppress;
@@ -1918,6 +1930,7 @@ convert_local_omp_clauses (tree *pclause
for (clause = *pclauses; clause ; clause = OMP_CLAUSE_CHAIN (clause))
{
+ pdecl = NULL;
switch (OMP_CLAUSE_CODE (clause))
{
case OMP_CLAUSE_REDUCTION:
@@ -1925,6 +1938,15 @@ convert_local_omp_clauses (tree *pclause
case OMP_CLAUSE_TASK_REDUCTION:
if (OMP_CLAUSE_REDUCTION_PLACEHOLDER (clause))
need_stmts = true;
+ if (TREE_CODE (OMP_CLAUSE_DECL (clause)) == MEM_REF)
+ {
+ pdecl = &TREE_OPERAND (OMP_CLAUSE_DECL (clause), 0);
+ if (TREE_CODE (*pdecl) == POINTER_PLUS_EXPR)
+ pdecl = &TREE_OPERAND (*pdecl, 0);
+ if (TREE_CODE (*pdecl) == INDIRECT_REF
+ || TREE_CODE (*pdecl) == ADDR_EXPR)
+ pdecl = &TREE_OPERAND (*pdecl, 0);
+ }
goto do_decl_clause;
case OMP_CLAUSE_LASTPRIVATE:
@@ -1951,7 +1973,9 @@ convert_local_omp_clauses (tree *pclause
case OMP_CLAUSE_USE_DEVICE_ADDR:
case OMP_CLAUSE_IS_DEVICE_PTR:
do_decl_clause:
- decl = OMP_CLAUSE_DECL (clause);
+ if (pdecl == NULL)
+ pdecl = &OMP_CLAUSE_DECL (clause);
+ decl = *pdecl;
if (VAR_P (decl)
&& (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
break;
@@ -1964,8 +1988,7 @@ convert_local_omp_clauses (tree *pclause
if (OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_SHARED)
OMP_CLAUSE_SHARED_READONLY (clause) = 0;
bitmap_set_bit (new_suppress, DECL_UID (decl));
- OMP_CLAUSE_DECL (clause)
- = get_local_debug_decl (info, decl, field);
+ *pdecl = get_local_debug_decl (info, decl, field);
need_frame = true;
}
}
--- libgomp/testsuite/libgomp.c/pr93566.c.jj 2020-03-13 12:53:56.247508784
+0100
+++ libgomp/testsuite/libgomp.c/pr93566.c 2020-03-13 12:39:42.994132358
+0100
@@ -0,0 +1,113 @@
+/* PR middle-end/93566 */
+/* { dg-additional-options "-std=c99" } */
+
+extern void abort (void);
+
+void
+foo (int *x)
+{
+ void nest (void) {
+ #pragma omp parallel for reduction(+:x[:10])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 0; j < 10; j++)
+ x[j] += j * i;
+ }
+ nest ();
+ for (int i = 0; i < 10; i++)
+ if (x[i] != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+void
+bar (void)
+{
+ int x[10] = {};
+ void nest (void) {
+ #pragma omp parallel for reduction(+:x[:10])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 0; j < 10; j++)
+ x[j] += j * i;
+ }
+ nest ();
+ for (int i = 0; i < 10; i++)
+ if (x[i] != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+void
+baz (void)
+{
+ int x[10] = {};
+ void nest (void) {
+ #pragma omp parallel for reduction(+:x[2:5])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 2; j < 7; j++)
+ x[j] += j * i;
+ }
+ nest ();
+ for (int i = 2; i < 7; i++)
+ if (x[i] != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+void
+qux (int *x)
+{
+ void nest (void) { x++; }
+ nest ();
+ #pragma omp parallel for reduction(+:x[:9])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 0; j < 9; j++)
+ x[j] += j * i;
+ nest ();
+ for (int i = 0; i < 9; i++)
+ if (x[i - 1] != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+void
+quux (void)
+{
+ int x[10];
+ void nest (void) { for (int i = 0; i < 10; i++) x[i] = 0; }
+ int nest2 (int i) { return x[i]; }
+ nest ();
+ #pragma omp parallel for reduction(+:x[:7])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 0; j < 7; j++)
+ x[j] += j * i;
+ for (int i = 0; i < 7; i++)
+ if (nest2 (i) != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+void
+corge (void)
+{
+ int x[10];
+ void nest (void) { for (int i = 0; i < 10; i++) x[i] = 0; }
+ int nest2 (int i) { return x[i]; }
+ nest ();
+ #pragma omp parallel for reduction(+:x[2:4])
+ for (int i = 0; i < 1024; i++)
+ for (int j = 2; j < 6; j++)
+ x[j] += j * i;
+ for (int i = 2; i < 6; i++)
+ if (nest2 (i) != 1023 * 1024 / 2 * i)
+ abort ();
+}
+
+int
+main ()
+{
+ int a[10] = {};
+ foo (a);
+ bar ();
+ baz ();
+ for (int i = 0; i < 10; i++)
+ a[i] = 0;
+ qux (a);
+ quux ();
+ corge ();
+ return 0;
+}
Jakub
