Hi!
linear clause should have the effect of firstprivate+lastprivate (or for IVs
not declared in the construct lastprivate) on outer constructs and eventually
map(tofrom:) on target when combined with it.
Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
Further work to follow.
2021-05-20 Jakub Jelinek <ja...@redhat.com>
PR middle-end/99928
* gimplify.c (gimplify_scan_omp_clauses) <case OMP_CLAUSE_LINEAR>: For
explicit linear clause when combined with target, make it map(tofrom:)
instead of no clause or firstprivate.
* c-c++-common/gomp/pr99928-4.c: Remove all xfails.
* c-c++-common/gomp/pr99928-5.c: Likewise.
--- gcc/gimplify.c.jj 2021-05-19 09:20:57.762095883 +0200
+++ gcc/gimplify.c 2021-05-19 14:39:38.345041396 +0200
@@ -8884,9 +8884,8 @@ gimplify_scan_omp_clauses (tree *list_p,
else if (octx
&& octx->region_type == ORT_COMBINED_TARGET)
{
- flags &= ~GOVD_LASTPRIVATE;
- if (flags == GOVD_SEEN)
- break;
+ if (flags & GOVD_LASTPRIVATE)
+ flags = GOVD_SEEN | GOVD_MAP;
}
else
break;
--- gcc/testsuite/c-c++-common/gomp/pr99928-4.c.jj 2021-05-13
16:53:31.062368335 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr99928-4.c 2021-05-19 14:46:26.065471252
+0200
@@ -44,15 +44,15 @@ bar (void)
#pragma omp parallel master taskloop simd linear (l04)
for (int i = 0; i < 64; i++)
l04++;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l05"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l05\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l05"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l05\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp parallel\[^\n\r]*shared\\(l05\\)"
"gimple" } } */
/* { dg-final { scan-tree-dump "omp for\[^\n\r]*linear\\(l05:1\\)" "gimple"
} } */
#pragma omp target parallel for linear (l05)
for (int i = 0; i < 64; i++)
l05++;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l06"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l06\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l06"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l06\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp parallel\[^\n\r]*firstprivate\\(l06\\)"
"gimple" } } *//* FIXME: This should be on for instead. */
/* { dg-final { scan-tree-dump "omp parallel\[^\n\r]*lastprivate\\(l06\\)"
"gimple" } } *//* FIXME: This should be on for instead. */
/* { dg-final { scan-tree-dump-not "omp for\[^\n\r]*firstprivate\\(l06\\)"
"gimple" } } *//* FIXME. */
@@ -61,8 +61,8 @@ bar (void)
#pragma omp target parallel for simd linear (l06)
for (int i = 0; i < 64; i++)
l06++;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l07"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l07\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:l07"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(l07\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*linear\\(l07:1\\)" "gimple"
} } */
#pragma omp target simd linear (l07)
for (int i = 0; i < 64; i++)
--- gcc/testsuite/c-c++-common/gomp/pr99928-5.c.jj 2021-05-13
16:53:31.063368324 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr99928-5.c 2021-05-19 14:46:53.314165802
+0200
@@ -52,22 +52,22 @@ bar (void)
#pragma omp parallel master taskloop simd linear (j05)
for (j05 = 0; j05 < 64; j05++)
;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j06"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j06\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j06"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j06\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp parallel\[^\n\r]*lastprivate\\(j06\\)"
"gimple" } } *//* FIXME: This should be on for instead. */
/* { dg-final { scan-tree-dump-not "omp for\[^\n\r]*lastprivate\\(j06\\)"
"gimple" } } *//* FIXME. */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*linear\\(j06:1\\)" "gimple"
} } */
#pragma omp target parallel for simd linear (j06)
for (j06 = 0; j06 < 64; j06++)
;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j07"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j07\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j07"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j07\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*linear\\(j07:1\\)" "gimple"
} } */
#pragma omp target simd linear (j07)
for (j07 = 0; j07 < 64; j07++)
;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j08"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j08\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j08"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j08\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp teams\[^\n\r]*shared\\(j08\\)" "gimple"
} } */
/* { dg-final { scan-tree-dump "omp distribute\[^\n\r]*lastprivate\\(j08\\)"
"gimple" } } */
/* { dg-final { scan-tree-dump "omp parallel\[^\n\r]*lastprivate\\(j08\\)"
"gimple" } } *//* FIXME: This should be on for instead. */
@@ -76,8 +76,8 @@ bar (void)
#pragma omp target teams distribute parallel for simd linear (j08)
for (j08 = 0; j08 < 64; j08++)
;
- /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j09"
"gimple" { xfail *-*-* } } } */
- /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j09\\)" "gimple" { xfail *-*-* } } } */
+ /* { dg-final { scan-tree-dump "omp target\[^\n\r]*map\\(tofrom:j09"
"gimple" } } */
+ /* { dg-final { scan-tree-dump-not "omp
target\[^\n\r]*firstprivate\\(j09\\)" "gimple" } } */
/* { dg-final { scan-tree-dump "omp teams\[^\n\r]*shared\\(j09\\)" "gimple"
} } */
/* { dg-final { scan-tree-dump "omp distribute\[^\n\r]*lastprivate\\(j09\\)"
"gimple" } } */
/* { dg-final { scan-tree-dump "omp simd\[^\n\r]*linear\\(j09:1\\)" "gimple"
} } */
Jakub
