diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2015-01-23 18:30:51 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2015-01-23 18:30:51 +0000 |
| commit | 4943b3e2dadb6bbc0091db9576e2345e3f942477 (patch) | |
| tree | 070d2b3ce5598ab6670d105e278fa1e60d8d6944 | |
| parent | f0817fdbc7eb7f08195c3911c8173fa340fe6595 (diff) | |
PR middle-end/64734
* omp-low.c (scan_sharing_clauses): Don't ignore
OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION GOMP_MAP_POINTER clauses
on target data/update constructs.
* libgomp.c/pr64734.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@220054 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/omp-low.c | 3 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/pr64734.c | 55 |
4 files changed, 69 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80a5090166a..5ac33b2a4a3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-01-23 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/64734 + * omp-low.c (scan_sharing_clauses): Don't ignore + OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION GOMP_MAP_POINTER clauses + on target data/update constructs. + 2015-01-23 Wei Mi <wmi@google.com> Backported from trunk. diff --git a/gcc/omp-low.c b/gcc/omp-low.c index ea45e205bb9..6d9206c9530 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1633,7 +1633,8 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) #pragma omp target data, there is nothing to map for those. */ if (gimple_omp_target_kind (ctx->stmt) == GF_OMP_TARGET_KIND_DATA - && !POINTER_TYPE_P (TREE_TYPE (decl))) + && !POINTER_TYPE_P (TREE_TYPE (decl)) + && !OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION (c)) break; } if (DECL_P (decl)) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 0c5042774e9..81c62da380b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-23 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/64734 + * libgomp.c/pr64734.c: New test. + 2014-12-03 Uros Bizjak <ubizjak@gmail.com> * configure.tgt (x86_64-*-linux*): Tune -m32 multilib to generic. diff --git a/libgomp/testsuite/libgomp.c/pr64734.c b/libgomp/testsuite/libgomp.c/pr64734.c new file mode 100644 index 00000000000..457f481ae0b --- /dev/null +++ b/libgomp/testsuite/libgomp.c/pr64734.c @@ -0,0 +1,55 @@ +/* PR middle-end/64734 */ + +#include <stdlib.h> + +void +foo (int *x, int *y) +{ + #pragma omp target map (alloc:x[0]) map (alloc:y[0:8]) + { + int i; + for (i = 0; i < 8; i++) + if (y[i] != 2 + i) + break; + if (i != 8 || *x != 1) + *x = 6; + else + { + *x = 8; + for (i = 0; i < 8; i++) + y[i] = 9 + i; + } + } + #pragma omp target update from (y[0:8]) from (x[0]) +} + +void +bar (void) +{ + int x = 1, y[32] = { 0 }; + #pragma omp target data map (to:y[0:32]) map (to:x) + ; +} + +int +main () +{ + int x = 1, y[8] = { 2, 3, 4, 5, 6, 7, 8, 9 }, i; + #pragma omp target data map (to:y[0:8]) map (to:x) + ; + #pragma omp target data map (to:y[0:8]) map (to:x) + { + #pragma omp target update from (y[0:8]) from (x) + } + + #pragma omp target data map (to:y[0:8]) map (to:x) + foo (&x, &y[0]); + + if (x != 8) + abort (); + for (i = 0; i < 8; i++) + if (y[i] != 9 + i) + abort (); + + return 0; +} |