Skip to content

Commit 2912c9c

Browse files
authored
[NFC][Offload] Add missing maps to OpenMP offloading tests. (#153103)
A few tests were only mapping a pointee, like: `map(pp[0][0])`, on an `int** pp`, but expecting the pointers, like `pp`, `pp[0]` to also be mapped, which is incorrect. This change fixes six such tests.
1 parent 4f00704 commit 2912c9c

6 files changed

+21
-17
lines changed

offload/test/mapping/data_member_ref.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ int main() {
6060
printf("Host %d %d.\n", Bar.VRef.Data, V.Data);
6161
// CHECK: Host 123456.
6262
printf("Host %d.\n", *Baz.VRef.Data);
63-
#pragma omp target map(*Baz.VRef.Data) map(from : D1, D2)
63+
#pragma omp target map(Baz.VRef.Data) map(*Baz.VRef.Data) map(V1.Data[0 : 0]) \
64+
map(from : D1, D2)
6465
{
6566
// CHECK: Device 123456.
6667
D1 = *Baz.VRef.Data;

offload/test/mapping/declare_mapper_nested_default_mappers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ int main() {
4444

4545
int spp00fa = -1, spp00fca = -1, spp00fb_r = -1;
4646
__intptr_t p = reinterpret_cast<__intptr_t>(&x[0]);
47-
#pragma omp target map(tofrom: spp[0][0]) firstprivate(p) \
48-
map(from: spp00fa, spp00fca, spp00fb_r)
47+
#pragma omp target map(tofrom : spp[0][0]) map(alloc : spp[0]) firstprivate(p) \
48+
map(from : spp00fa, spp00fca, spp00fb_r)
4949
{
5050
spp00fa = spp[0][0].f.a;
5151
spp00fca = spp[0][0].f.c.a;

offload/test/mapping/declare_mapper_nested_mappers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ int main() {
4242
int spp00fa = -1, spp00fb_r = -1, spp00fg1 = -1, spp00fg_r = -1;
4343
__intptr_t p = reinterpret_cast<__intptr_t>(&x[0]),
4444
p1 = reinterpret_cast<__intptr_t>(&y[0]);
45-
#pragma omp target map(tofrom : spp[0][0]) firstprivate(p, p1) \
46-
map(from: spp00fa, spp00fb_r, spp00fg1, spp00fg_r)
45+
#pragma omp target map(tofrom : spp[0][0]) map(alloc : spp[0]) \
46+
firstprivate(p, p1) map(from : spp00fa, spp00fb_r, spp00fg1, spp00fg_r)
4747
{
4848
spp00fa = spp[0][0].f.a;
4949
spp00fb_r = spp[0][0].f.b == reinterpret_cast<void *>(p) ? 1 : 0;

offload/test/mapping/ptr_and_obj_motion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void init(double vertexx[]) {
1717
}
1818

1919
void change(DV *dvptr) {
20-
#pragma omp target map(dvptr->dataptr[0 : 100])
20+
#pragma omp target map(dvptr->dataptr[0 : 100]) map(alloc : dvptr -> dataptr)
2121
{
2222
printf("In change: %lf, expected 77.0\n", dvptr->dataptr[77]);
2323
dvptr->dataptr[77] += 1.0;

offload/test/mapping/target_derefence_array_pointrs.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,24 @@ void foo(int **t1d) {
1818

1919
for (j = 0; j < 3; j++)
2020
(*t1d)[j] = 0;
21-
#pragma omp target map(tofrom : (*t1d)[0 : 3])
21+
#pragma omp target map(tofrom : (*t1d)[0 : 3]) map(alloc : *t1d)
2222
{ (*t1d)[1] = 1; }
2323
// CHECK: 1
2424
printf("%d\n", (*t1d)[1]);
25-
#pragma omp target map(tofrom : (**t2d)[0 : 3])
25+
#pragma omp target map(tofrom : (**t2d)[0 : 3]) map(alloc : **t2d, *t2d)
2626
{ (**t2d)[1] = 2; }
2727
// CHECK: 2
2828
printf("%d\n", (**t2d)[1]);
29-
#pragma omp target map(tofrom : (***t3d)[0 : 3])
29+
#pragma omp target map(tofrom : (***t3d)[0 : 3]) \
30+
map(alloc : ***t3d, **t3d, *t3d)
3031
{ (***t3d)[1] = 3; }
3132
// CHECK: 3
3233
printf("%d\n", (***t3d)[1]);
33-
#pragma omp target map(tofrom : (**t1d))
34+
#pragma omp target map(tofrom : (**t1d)) map(alloc : *t1d)
3435
{ (*t1d)[0] = 4; }
3536
// CHECK: 4
3637
printf("%d\n", (*t1d)[0]);
37-
#pragma omp target map(tofrom : (*(*(t1d + a) + b)))
38+
#pragma omp target map(tofrom : (*(*(t1d + a) + b))) map(to : *(t1d + a))
3839
{ *(*(t1d + a) + b) = 5; }
3940
// CHECK: 5
4041
printf("%d\n", *(*(t1d + a) + b));
@@ -49,7 +50,7 @@ void bar() {
4950
for (int i = 0; i < 3; i++) {
5051
(**a)[1] = i;
5152
}
52-
#pragma omp target map((**a)[ : 3])
53+
#pragma omp target map((**a)[ : 3]) map(alloc : **a, *a)
5354
{
5455
(**a)[1] = 6;
5556
// CHECK: 6
@@ -73,7 +74,8 @@ void zoo(int **f, SSA *sa) {
7374
*(f + sa->i + 1) = t;
7475
*(sa->sa->i + *(f + sa->i + 1)) = 4;
7576
printf("%d\n", *(sa->sa->i + *(1 + sa->i + f)));
76-
#pragma omp target map(sa, *(sa->sa->i + *(1 + sa->i + f)))
77+
#pragma omp target map(*(sa->sa->i + *(1 + sa->i + f))) map(alloc : sa->sa) \
78+
map(to : sa->i) map(to : sa->sa->i) map(to : *(1 + sa->i + f))
7779
{ *(sa->sa->i + *(1 + sa->i + f)) = 7; }
7880
// CHECK: 7
7981
printf("%d\n", *(sa->sa->i + *(1 + sa->i + f)));
@@ -87,13 +89,13 @@ void xoo() {
8789

8890
void yoo(int **x) {
8991
*x = (int *)malloc(2 * sizeof(int));
90-
#pragma omp target map(**x)
92+
#pragma omp target map(**x) map(alloc : *x)
9193
{
9294
**x = 8;
9395
// CHECK: 8
9496
printf("%d\n", **x);
9597
}
96-
#pragma omp target map(*(*x + 1))
98+
#pragma omp target map(*(*x + 1)) map(alloc : *x)
9799
{
98100
*(*x + 1) = 9;
99101
// CHECK: 9

offload/test/mapping/target_has_device_addr.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ void zoo() {
6666
short **xpp = &xp[0];
6767

6868
x[1] = 111;
69-
#pragma omp target data map(tofrom : xpp[1][1]) use_device_addr(xpp[1][1])
70-
#pragma omp target has_device_addr(xpp[1][1])
69+
#pragma omp target data map(tofrom : xpp[1][1]) map(xpp[1]) \
70+
use_device_addr(xpp[1])
71+
#pragma omp target has_device_addr(xpp[1])
7172
{
7273
xpp[1][1] = 222;
7374
// CHECK: 222

0 commit comments

Comments
 (0)