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.
This commit is contained in:
parent
c7a9655be6
commit
edaf1d6078
2 changed files with 11 additions and 3 deletions
|
@ -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*),
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue