1fbf33cd40
This adds support for using `ATTACH` map-type for proper pointer-attachment when mapping list-items that have base-pointers. For example, for the following: ```c int *p; #pragma omp target enter data map(p[1:10]) ``` The following maps are now emitted by clang: ``` (A) &p[0], &p[1], 10 * sizeof(p[1]), TO | FROM &p, &p[1], sizeof(p), ATTACH ``` Previously, the two possible maps emitted by clang were: ``` (B) &p[0], &p[1], 10 * sizeof(p[1]), TO | FROM (C) &p, &p[1], 10 * sizeof(p[1]), TO | FROM | PTR_AND_OBJ ```` (B) does not perform any pointer attachment, while (C) also maps the pointer p, both of which are incorrect. ----- With this change, we are using ATTACH-style maps, like `(A)`, for cases where the expression has a base-pointer. For example: ```cpp int *p, **pp; S *ps, **pps; ... map(p[0]) ... map(p[10:20]) ... map(*p) ... map(([20])p) ... map(ps->a) ... map(pps->p->a) ... map(pp[0][0]) ... map(*(pp + 10)[0]) ``` #### Grouping of maps based on attach base-pointers We also group mapping of clauses with the same base decl in the order of the increasing complexity of their base-pointers, e.g. for something like: ``` S **spp; map(spp[0][0], spp[0][0].a), // attach-ptr: spp[0] map(spp[0]), // attach-ptr: spp map(spp), // attach-ptr: N/A ``` We first map `spp`, then `spp[0]` then `spp[0][0]` and `spp[0][0].a`. This allows us to also group "struct" allocation based on their attach pointers. This resolves the issues of us always mapping everything from the beginning of the symbol `spp`. Each group is mapped independently, and at the same level, like `spp[0][0]` and its member `spp[0][0].a`, we still get map them together as part of the same contiguous struct `spp[0][0]`. This resolves issue #141042. #### use_device_ptr/addr fixes The handling of `use_device_ptr/addr` was updated to use the attach-ptr information, and works for many cases that were failing before. It has to be done as part of this series because otherwise, the switch from ptr_to_obj to attach-style mapping would have caused regressions in existing use_device_ptr/addr tests. #### Handling of attach-pointers that are members of implicitly mapped structs: * When a struct member-pointer, like `p` below, is a base-pointer in a `map` clause on a target construct (like `map(p[0:1])`, and the base of that struct is either the `this` pointer (implicitly or explicitly), or a struct that is implicitly mapped on that construct, we add an implicit `map(p)` so that we don't implicitly map the full struct. ```c struct S { int *p; void f1() { #pragma omp target map(p[0:1]) // Implicitly map this->p, to ensure // that the implicit map of `this[:]` does // not map the full struct printf("%p %p\n", &p, p); } ``` #### Scope for improvement: * We may be able to compute attach-ptr expr while collecting component-lists in Sema. * But we cache the computation results already, and `findAttachPtrExpr` is fairly simple, and fast. * There may be a better way to implement semantic expr comparison. #### Needs future work: * Attach-style maps not yet emitted for declare mappers. * Mapping of class member references: We are still using PTR_AND_OBJ maps for them. We will likely need to change that to handle `ref_ptr/ref_ptee`, and `attach` map-type-modifier on them. * Implicit capturing of "this" needs to map the full `this[0:1]` unless there is an explicit map on one of the members, or a map with a member as its base-pointer. * Implicit map added for capturing a class member pointer needs to also add a zero-length-array-section map. * `use_device_addr` on array-sections-on-pointers need further improvements (documented using FIXMEs) #### Why a large PR While it's unfortunate that this PR has gotten large and difficult to review, the issue is that all the functional changes have to be made together, to prevent regressions from partially implemented changes. For example, the changes to capturing were previously done separately (#145454), but they would still cause stability issues in absence of full attach-mapping. And attach-mapping needs those changes to be able to launch kernels. We extracted the utilities and functions, like those for finding attach-ptrs, or comparing exprs, out as a separate NFC PR that doesn't call those functions, just adds them (#155625). Maybe the change that adds a new error message for use_device_addr on array-sections with non-var base-pointers could have been extracted out too (but that would have had to be a follow-up change in that case, and we would get comp-fails with this PR when the erroneous case was not caught/diagnosed). --------- Co-authored-by: Alex Duran <alejandro.duran@intel.com>
83 lines
2.5 KiB
C
83 lines
2.5 KiB
C
// RUN: %libomptarget-compilexx-run-and-check-generic
|
|
|
|
// REQUIRES: libc
|
|
|
|
#include <omp.h>
|
|
#include <stdio.h>
|
|
|
|
int x[10];
|
|
|
|
void f1() {
|
|
int *p;
|
|
p = &x[0];
|
|
p[0] = 111;
|
|
p[1] = 222;
|
|
p[2] = 333;
|
|
p[3] = 444;
|
|
|
|
#pragma omp target enter data map(to : p)
|
|
#pragma omp target enter data map(to : p[0 : 5])
|
|
|
|
int **p_mappedptr = (int **)omp_get_mapped_ptr(&p, omp_get_default_device());
|
|
int *x0_mappedptr =
|
|
(int *)omp_get_mapped_ptr(&x[0], omp_get_default_device());
|
|
int *x0_hostaddr = &x[0];
|
|
|
|
printf("p_mappedptr %s null\n", p_mappedptr == (int **)NULL ? "==" : "!=");
|
|
printf("x0_mappedptr %s null\n", x0_mappedptr == (int *)NULL ? "==" : "!=");
|
|
|
|
// CHECK: p_mappedptr != null
|
|
// CHECK: x0_mappedptr != null
|
|
|
|
// p is predetermined firstprivate, so its address will be different from
|
|
// the mapped address for this construct. So, any changes to p within the
|
|
// region will not be visible after the construct.
|
|
#pragma omp target map(p[0]) map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
|
|
{
|
|
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
|
|
x0_hostaddr == &p[0]);
|
|
// CHECK: 111 0 1 0
|
|
p++;
|
|
}
|
|
|
|
// For the remaining constructs, p is not firstprivate, so its address will
|
|
// be the same as the mapped address, and changes to p will be visible to any
|
|
// subsequent regions.
|
|
#pragma omp target map(to : p[0], p) \
|
|
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
|
|
{
|
|
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
|
|
x0_hostaddr == &p[0]);
|
|
// CHECK: 111 1 1 0
|
|
p++;
|
|
}
|
|
|
|
#pragma omp target map(to : p, p[0]) \
|
|
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
|
|
{
|
|
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
|
|
x0_hostaddr == &p[-1]);
|
|
// CHECK: 222 1 1 0
|
|
p++;
|
|
}
|
|
|
|
#pragma omp target map(present, alloc : p) \
|
|
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
|
|
{
|
|
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-2],
|
|
x0_hostaddr == &p[-2]);
|
|
// CHECK: 333 1 1 0
|
|
}
|
|
|
|
// The following map(from:p) should not bring back p, because p is an
|
|
// attached pointer. So, it should still point to the same original
|
|
// location, &x[0], on host.
|
|
#pragma omp target exit data map(always, from : p)
|
|
printf("%d %d\n", p[0], p == &x[0]);
|
|
// CHECK: 111 1
|
|
|
|
#pragma omp target exit data map(delete : p[0 : 5], p)
|
|
}
|
|
|
|
int main() { f1(); }
|