diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2023-02-15 11:20:32 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2023-02-15 11:21:11 +0100 |
| commit | edaf1d607860075c5ff4ade20c58b3f578ed5489 (patch) | |
| tree | 0cf7e54a07af25ca400d326d5a6487b11d980afd | |
| parent | c7a9655be60cb4f224d1e5906bfe8ae227b5a3a0 (diff) | |
| download | gcc-edaf1d607860075c5ff4ade20c58b3f578ed5489.zip gcc-edaf1d607860075c5ff4ade20c58b3f578ed5489.tar.gz gcc-edaf1d607860075c5ff4ade20c58b3f578ed5489.tar.bz2 | |
libgomp: Fix reverse-offload for GOMP_MAP_TO_PSET
libgomp/
* target.c (gomp_target_rev): Dereference ptr
to get device address.
* testsuite/libgomp.fortran/reverse-offload-5.f90: Add test
for unallocated allocatable.
| -rw-r--r-- | libgomp/target.c | 8 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/reverse-offload-5.f90 | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index b4ea2c5..483851c 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -3580,8 +3580,14 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, } int k; n2 = NULL; - cdata[i].present = true; + /* Dereference devaddrs[j] to get the device addr. */ + assert (devaddrs[j] - sizes[j] == cdata[i].devaddr); + devaddrs[j] = *(uint64_t *) (uintptr_t) (devaddrs[i] + + sizes[j]); + cdata[j].present = true; cdata[j].devaddr = devaddrs[j]; + if (devaddrs[j] == 0) + continue; k = gomp_map_cdata_lookup (cdata, devaddrs, kinds, sizes, j, devaddrs[j], devaddrs[j] + sizeof (void*), diff --git a/libgomp/testsuite/libgomp.fortran/reverse-offload-5.f90 b/libgomp/testsuite/libgomp.fortran/reverse-offload-5.f90 index ef7eb7b..16810eb 100644 --- a/libgomp/testsuite/libgomp.fortran/reverse-offload-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/reverse-offload-5.f90 @@ -24,7 +24,7 @@ s2 = 55 !$omp target map(to: A, A2, s1, s2) block - integer, allocatable :: ai(:), ai2(:), si1, si2 + integer, allocatable :: ai(:), ai2(:), ai3(:), si1, si2, si3 a = a * 2 a2 = a2 * 3 @@ -38,7 +38,7 @@ block !$omp target device (ancestor:1) & !$omp& map(to: A, s1, ai, si1) map(always, to: a2, s2) & - !$omp& map(tofrom: ai2, si2) + !$omp& map(tofrom: ai2, si2, ai3, si3) if (shared_mem) then if (any (a /= 2 * [1,2,3,4])) stop 1 if (s1 /= 4 * 532) stop 2 @@ -52,6 +52,7 @@ block if (any (ai2 /= [8,4,7,1])) stop 8 if (si1 /= 64) stop 9 if (si2 /= 765) stop 10 + if (allocated (ai3) .or. allocated(si3)) stop 26 a = a*3 a2 = a2*7 @@ -80,6 +81,7 @@ block endif if (any (ai2 /= 21 * [8,4,7,1])) stop 24 if (si2 /= 31 * 765) stop 25 + if (allocated (ai3) .or. allocated(si3)) stop 27 deallocate (ai, ai2, si1, si2) end block |