Hi!
When a directive isn't combined with worksharing-loop, it takes much
simpler clause splitting path for reduction, and that one was missing
handling of teams when combined with simd.
Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux,
committed to trunk.
2021-05-25 Jakub Jelinek <ja...@redhat.com>
PR middle-end/99928
gcc/c-family/
* c-omp.c (c_omp_split_clauses): Copy reduction to teams when teams is
combined with simd and not with taskloop or for.
gcc/testsuite/
* c-c++-common/gomp/pr99928-8.c: Remove xfails from omp teams r21 and
r28 checks.
* c-c++-common/gomp/pr99928-9.c: Likewise.
* c-c++-common/gomp/pr99928-10.c: Likewise.
libgomp/
* testsuite/libgomp.c-c++-common/reduction-17.c: New test.
--- gcc/c-family/c-omp.c.jj 2021-05-21 21:16:03.079850750 +0200
+++ gcc/c-family/c-omp.c 2021-05-24 17:34:13.514132206 +0200
@@ -2059,6 +2059,23 @@ c_omp_split_clauses (location_t loc, enu
OMP_CLAUSE_CHAIN (c) = cclauses[C_OMP_CLAUSE_SPLIT_TASKLOOP];
cclauses[C_OMP_CLAUSE_SPLIT_TASKLOOP] = c;
}
+ else if ((mask & (OMP_CLAUSE_MASK_1
+ << PRAGMA_OMP_CLAUSE_NUM_TEAMS)) != 0)
+ {
+ c = build_omp_clause (OMP_CLAUSE_LOCATION (clauses),
+ OMP_CLAUSE_REDUCTION);
+ OMP_CLAUSE_DECL (c) = OMP_CLAUSE_DECL (clauses);
+ OMP_CLAUSE_REDUCTION_CODE (c)
+ = OMP_CLAUSE_REDUCTION_CODE (clauses);
+ OMP_CLAUSE_REDUCTION_PLACEHOLDER (c)
+ = OMP_CLAUSE_REDUCTION_PLACEHOLDER (clauses);
+ OMP_CLAUSE_REDUCTION_DECL_PLACEHOLDER (c)
+ = OMP_CLAUSE_REDUCTION_DECL_PLACEHOLDER (clauses);
+ OMP_CLAUSE_REDUCTION_INSCAN (c)
+ = OMP_CLAUSE_REDUCTION_INSCAN (clauses);
+ OMP_CLAUSE_CHAIN (c) = cclauses[C_OMP_CLAUSE_SPLIT_TEAMS];
+ cclauses[C_OMP_CLAUSE_SPLIT_TEAMS] = c;
+ }
s = C_OMP_CLAUSE_SPLIT_SIMD;
}
else
--- gcc/testsuite/c-c++-common/gomp/pr99928-8.c.jj 2021-05-13
16:53:31.063368324 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr99928-8.c 2021-05-24 17:57:15.809001673
+0200
@@ -155,7 +155,7 @@ bar (void)
r20++;
/* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:r21"
"gimple" { xfail *-*-* } } } */
/* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(r21\\)" "gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump "omp teams\[^\n\r]*reduction\\(\\+:r21\\)"
"gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp teams\[^\n\r]*reduction\\(\\+:r21\\)"
"gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:r21\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*reduction\\(\\+:r21\\)"
"gimple" } } */
#pragma omp target teams distribute simd reduction(+:r21)
@@ -202,7 +202,7 @@ bar (void)
#pragma omp teams distribute parallel for simd reduction(+:r27)
for (int i = 0; i < 64; i++)
r27++;
- /* { dg-final { scan-tree-dump "omp teams\[^\n\r]*reduction\\(\\+:r28\\)"
"gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp teams\[^\n\r]*reduction\\(\\+:r28\\)"
"gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:r28\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*reduction\\(\\+:r28\\)"
"gimple" } } */
#pragma omp teams distribute simd reduction(+:r28)
--- gcc/testsuite/c-c++-common/gomp/pr99928-9.c.jj 2021-05-13
16:53:31.064368313 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr99928-9.c 2021-05-24 17:58:22.022277334
+0200
@@ -155,7 +155,7 @@ bar (void)
r20[1]++;
/* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:r21\\\[1\\\]
\\\[len: 8\\\]" "gimple" { xfail *-*-* } } } */
/* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(r21\\)" "gimple" } } */
- /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r21 \\+ 4" "gimple" { xfail *-*-* }
} } */
+ /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r21 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r21 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump "omp
simd\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r21 \\+ 4" "gimple" } } */
#pragma omp target teams distribute simd reduction(+:r21[1:2])
@@ -202,7 +202,7 @@ bar (void)
#pragma omp teams distribute parallel for simd reduction(+:r27[1:2])
for (int i = 0; i < 64; i++)
r27[1]++;
- /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r28 \\+ 4" "gimple" { xfail *-*-* }
} } */
+ /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r28 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r28 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump "omp
simd\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*&r28 \\+ 4" "gimple" } } */
#pragma omp teams distribute simd reduction(+:r28[1:2])
--- gcc/testsuite/c-c++-common/gomp/pr99928-10.c.jj 2021-05-13
16:53:31.064368313 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr99928-10.c 2021-05-24
17:58:48.314989700 +0200
@@ -165,7 +165,7 @@ bar (void)
/* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:\\\*_\[0-9]*
\\\[len: 92\\\]" "gimple" { xfail *-*-* } } } */
/* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(firstprivate:r21
\\\[pointer assign, bias: 4\\\]\\)" "gimple" { xfail *-*-* } } } */
/* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(r21\\)" "gimple" } } */
- /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r21 \\+ 4" "gimple" { xfail *-*-*
} } } */
+ /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r21 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r21 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump "omp
simd\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r21 \\+ 4" "gimple" } } */
#pragma omp target teams distribute simd reduction(+:r21[1:23])
@@ -214,7 +214,7 @@ bar (void)
#pragma omp teams distribute parallel for simd reduction(+:r27[1:29])
for (int i = 0; i < 64; i++)
r27[1]++;
- /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r28 \\+ 4" "gimple" { xfail *-*-*
} } } */
+ /* { dg-final { scan-tree-dump "omp
teams\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r28 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump-not "omp
distribute\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r28 \\+ 4" "gimple" } } */
/* { dg-final { scan-tree-dump "omp
simd\[^\n\r]*reduction\\(\\+:MEM\[^\n\r]*\\)r28 \\+ 4" "gimple" } } */
#pragma omp teams distribute simd reduction(+:r28[1:30])
--- libgomp/testsuite/libgomp.c-c++-common/reduction-17.c.jj 2021-05-24
18:06:32.677909808 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/reduction-17.c 2021-05-24
18:05:40.101484971 +0200
@@ -0,0 +1,16 @@
+/* PR middle-end/99928 */
+/* { dg-do run } */
+
+#define N 64
+
+int
+main ()
+{
+ int r = 0, i;
+ #pragma omp teams distribute simd reduction(+:r)
+ for (i = 0; i < N; i++)
+ r += i;
+ if (r != N * (N - 1) / 2)
+ __builtin_abort ();
+ return 0;
+}
Jakub
