[clang] [llvm] [Clang][OpenMP] Capture mapped pointers on `target` by reference. (PR #145454)
Abhinav Gaba via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 8 13:52:21 PDT 2025
https://github.com/abhinavgaba updated https://github.com/llvm/llvm-project/pull/145454
>From d867ab3a20b1999cb5b00554fdb21cbe6766a1d5 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Sun, 22 Jun 2025 18:36:16 -0700
Subject: [PATCH 01/12] [Clang][OpenMP] Capture mapped pointers on `target` by
reference.
For the following:
```c
int *p;
\#pragma omp target map(p[0]) // (A)
(void)p;
\#pragma omp target map(p) // (B)
(void)p;
\#pragma omp target map(p, p[0]) // (C)
(void)p;
\#pragma omp target map(p[0], p) // (D)
(void)p;
```
For (A), the pointer `p` is predetermined `firstprivate`, so it
should be (and is) captured by-copy. However, for (B), (C), and
(D), since `p` is already listed in a `map` clause, it's not
predetermined `firstprivate`, and hence, should be captured
by-reference, like any other mapped variable.
To ensure the correct handling of (C) and (D), the following
changes were made:
1. In SemaOpenMP, we now ensure that `p` is marked to be
captured by-reference in these cases.
2. We no longer ignore `map(p)` during codegen of `target`
constructs, even if there's another map like `map(p[0])` that
would have been mapped using a PTR_AND_OBJ map.
3. For cases like (D), we now handle `map(p)` before `map(p[0])`,
so the former gets the TARGET_PARAM flag and sets the kernel
argument.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 37 ++-
clang/lib/Sema/SemaOpenMP.cpp | 51 ++-
...arget_map_both_pointer_pointee_codegen.cpp | 290 +++++++++---------
.../mapping/map_ptr_and_subscript_global.c | 65 ++++
4 files changed, 287 insertions(+), 156 deletions(-)
create mode 100644 offload/test/mapping/map_ptr_and_subscript_global.c
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 8ccc37ef98a74..39571105e26b2 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -7270,8 +7270,14 @@ class MappableExprsHandler {
// of arguments, hence MEMBER_OF(4)
//
// map(p, p[:100])
+ // For "pragma omp target":
+ // &p, &p, sizeof(p), TARGET_PARAM | TO | FROM
+ // &p, &p[0], 100*sizeof(float), PTR_AND_OBJ | TO | FROM (*)
+ // Otherwise:
// ===> map(p[:100])
// &p, &p[0], 100*sizeof(float), TARGET_PARAM | PTR_AND_OBJ | TO | FROM
+ // (*) We need to use PTR_AND_OBJ here to ensure that the mapped copies of
+ // p and p[0] get attached.
// Track if the map information being generated is the first for a capture.
bool IsCaptureFirstInfo = IsFirstComponentList;
@@ -7289,14 +7295,26 @@ class MappableExprsHandler {
// components.
bool IsExpressionFirstInfo = true;
bool FirstPointerInComplexData = false;
+ bool SkipStandalonePtrMapping = false;
Address BP = Address::invalid();
const Expr *AssocExpr = I->getAssociatedExpression();
const auto *AE = dyn_cast<ArraySubscriptExpr>(AssocExpr);
const auto *OASE = dyn_cast<ArraySectionExpr>(AssocExpr);
const auto *OAShE = dyn_cast<OMPArrayShapingExpr>(AssocExpr);
- if (AreBothBasePtrAndPteeMapped && std::next(I) == CE)
+ // For map(p, p[0]) on a "target" construct, we need to map "p" by itself
+ // as it has to be passed by-reference as the kernel argument.
+ // For other constructs, we can skip mapping "p" because the PTR_AND_OBJ
+ // mapping for map(p[0]) will take care of mapping p as well.
+ SkipStandalonePtrMapping =
+ AreBothBasePtrAndPteeMapped &&
+ (!isa<const OMPExecutableDirective *>(CurDir) ||
+ !isOpenMPTargetExecutionDirective(
+ cast<const OMPExecutableDirective *>(CurDir)->getDirectiveKind()));
+
+ if (SkipStandalonePtrMapping && std::next(I) == CE)
return;
+
if (isa<MemberExpr>(AssocExpr)) {
// The base is the 'this' pointer. The content of the pointer is going
// to be the base of the field being mapped.
@@ -7672,7 +7690,7 @@ class MappableExprsHandler {
getMapTypeBits(MapType, MapModifiers, MotionModifiers, IsImplicit,
!IsExpressionFirstInfo || RequiresReference ||
FirstPointerInComplexData || IsMemberReference,
- AreBothBasePtrAndPteeMapped ||
+ SkipStandalonePtrMapping ||
(IsCaptureFirstInfo && !RequiresReference),
IsNonContiguous);
@@ -8811,8 +8829,19 @@ class MappableExprsHandler {
++EI;
}
}
- llvm::stable_sort(DeclComponentLists, [](const MapData &LHS,
- const MapData &RHS) {
+ llvm::stable_sort(DeclComponentLists, [VD](const MapData &LHS,
+ const MapData &RHS) {
+ // For cases like map(p, p[0], p[0][0]), the shortest map, like map(p)
+ // in this case, should be handled first, to ensure that it gets the
+ // TARGET_PARAM flag.
+ OMPClauseMappableExprCommon::MappableExprComponentListRef Components =
+ std::get<0>(LHS);
+ OMPClauseMappableExprCommon::MappableExprComponentListRef ComponentsR =
+ std::get<0>(RHS);
+ if (VD && VD->getType()->isAnyPointerType() && Components.size() == 1 &&
+ ComponentsR.size() > 1)
+ return true;
+
ArrayRef<OpenMPMapModifierKind> MapModifiers = std::get<2>(LHS);
OpenMPMapClauseKind MapType = std::get<1>(RHS);
bool HasPresent =
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 00f4658180807..02e4e7b910d2e 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -2146,6 +2146,7 @@ bool SemaOpenMP::isOpenMPCapturedByRef(const ValueDecl *D, unsigned Level,
// | ptr | n.a. | - | x | - | - | bycopy|
// | ptr | n.a. | x | - | - | - | null |
// | ptr | n.a. | - | - | - | x | byref |
+ // | ptr | n.a. | - | - | - | x, x[] | bycopy|
// | ptr | n.a. | - | - | - | x[] | bycopy|
// | ptr | n.a. | - | - | x | | bycopy|
// | ptr | n.a. | - | - | x | x | bycopy|
@@ -2171,18 +2172,22 @@ bool SemaOpenMP::isOpenMPCapturedByRef(const ValueDecl *D, unsigned Level,
// - For pointers mapped by value that have either an implicit map or an
// array section, the runtime library may pass the NULL value to the
// device instead of the value passed to it by the compiler.
+ // - If both a pointer an a dereference of it are mapped, then the pointer
+ // should be passed by reference.
if (Ty->isReferenceType())
Ty = Ty->castAs<ReferenceType>()->getPointeeType();
- // Locate map clauses and see if the variable being captured is referred to
- // in any of those clauses. Here we only care about variables, not fields,
- // because fields are part of aggregates.
+ // Locate map clauses and see if the variable being captured is mapped by
+ // itself, or referred to, in any of those clauses. Here we only care about
+ // variables, not fields, because fields are part of aggregates.
bool IsVariableAssociatedWithSection = false;
+ bool IsVariableItselfMapped = false;
DSAStack->checkMappableExprComponentListsForDeclAtLevel(
D, Level,
[&IsVariableUsedInMapClause, &IsVariableAssociatedWithSection,
+ &IsVariableItselfMapped,
D](OMPClauseMappableExprCommon::MappableExprComponentListRef
MapExprComponents,
OpenMPClauseKind WhereFoundClauseKind) {
@@ -2198,8 +2203,19 @@ bool SemaOpenMP::isOpenMPCapturedByRef(const ValueDecl *D, unsigned Level,
assert(EI != EE && "Invalid map expression!");
- if (isa<DeclRefExpr>(EI->getAssociatedExpression()))
- IsVariableUsedInMapClause |= EI->getAssociatedDeclaration() == D;
+ if (isa<DeclRefExpr>(EI->getAssociatedExpression()) &&
+ EI->getAssociatedDeclaration() == D) {
+ IsVariableUsedInMapClause = true;
+
+ // If the component list has only one element, it's for mapping the
+ // variable itself, like map(p). This takes precedence in
+ // determining how it's captured, so we don't need to look further
+ // for any other maps that use the variable (like map(p[0]) etc.)
+ if (MapExprComponents.size() == 1) {
+ IsVariableItselfMapped = true;
+ return true;
+ }
+ }
++EI;
if (EI == EE)
@@ -2213,8 +2229,10 @@ bool SemaOpenMP::isOpenMPCapturedByRef(const ValueDecl *D, unsigned Level,
isa<MemberExpr>(EI->getAssociatedExpression()) ||
isa<OMPArrayShapingExpr>(Last->getAssociatedExpression())) {
IsVariableAssociatedWithSection = true;
- // There is nothing more we need to know about this variable.
- return true;
+ // We've found a case like map(p[0]) or map(p->a) or map(*p),
+ // so we are done with this particular map, but we need to keep
+ // looking in case we find a map(p).
+ return false;
}
// Keep looking for more map info.
@@ -2223,8 +2241,23 @@ bool SemaOpenMP::isOpenMPCapturedByRef(const ValueDecl *D, unsigned Level,
if (IsVariableUsedInMapClause) {
// If variable is identified in a map clause it is always captured by
- // reference except if it is a pointer that is dereferenced somehow.
- IsByRef = !(Ty->isPointerType() && IsVariableAssociatedWithSection);
+ // reference except if it is a pointer that is dereferenced somehow, but
+ // not itself mapped.
+ //
+ // OpenMP 6.0, 7.1.1: Data sharing attribute rules, variables referenced
+ // in a construct::
+ // If a list item in a has_device_addr clause or in a map clause on the
+ // target construct has a base pointer, and the base pointer is a scalar
+ // variable *that is not a list item in a map clause on the construct*,
+ // the base pointer is firstprivate.
+ //
+ // OpenMP 4.5, 2.15.1.1: Data-sharing Attribute Rules for Variables
+ // Referenced in a Construct:
+ // If an array section is a list item in a map clause on the target
+ // construct and the array section is derived from a variable for which
+ // the type is pointer then that variable is firstprivate.
+ IsByRef = IsVariableItselfMapped ||
+ !(Ty->isPointerType() && IsVariableAssociatedWithSection);
} else {
// By default, all the data that has a scalar type is mapped by copy
// (except for reduction variables).
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
index 87fa7fe462daa..9a8f234da718c 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
@@ -1,174 +1,178 @@
-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=i386-pc-linux-gnu -x c++ -std=c++11 -triple i386-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=i386-pc-linux-gnu -x c++ -triple i386-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
// expected-no-diagnostics
#ifndef HEADER
#define HEADER
+// CHECK: @.[[KERNEL00:__omp_offloading_.*foov_l[0-9]+]].region_id = weak constant i8 0
+// CHECK: [[SIZE00:@.+]] = private unnamed_addr constant [2 x i64] [i64 {{8|4}}, i64 8]
+// CHECK: [[MYTYPE00:@.+]] = private unnamed_addr constant [2 x i64] [i64 35, i64 19]
+
+// CHECK: @.[[KERNEL01:__omp_offloading_.*foov_l[0-9]+]].region_id = weak constant i8 0
+// CHECK: [[SIZE01:@.+]] = private unnamed_addr constant [2 x i64] [i64 {{8|4}}, i64 4]
+// CHECK: [[MYTYPE01:@.+]] = private unnamed_addr constant [2 x i64] [i64 35, i64 19]
+
+// CHECK: @.[[KERNEL02:__omp_offloading_.*foov_l[0-9]+]].region_id = weak constant i8 0
+// CHECK: [[SIZE02:@.+]] = private unnamed_addr constant [2 x i64] [i64 {{8|4}}, i64 4]
+// CHECK: [[MYTYPE02:@.+]] = private unnamed_addr constant [2 x i64] [i64 35, i64 19]
+
+// CHECK: [[SIZE03:@.+]] = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: [[MYTYPE03:@.+]] = private unnamed_addr constant [1 x i64] [i64 51]
+
extern void *malloc (int __size) throw () __attribute__ ((__malloc__));
+// CHECK-LABEL: define{{.*}}@_Z3foov{{.*}}(
void foo() {
int *ptr = (int *) malloc(3 * sizeof(int));
+// Region 00
+// &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+// &ptr, &ptr[0], 2 * sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ
+//
+// CHECK-DAG: call i32 @__tgt_target_kernel(ptr @{{.+}}, i64 -1, i32 -1, i32 0, ptr @.[[KERNEL00]].region_id, ptr [[ARGS:%.+]])
+// CHECK-DAG: [[BPARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 2
+// CHECK-DAG: store ptr [[BPGEP:%.+]], ptr [[BPARG]]
+// CHECK-DAG: [[PARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 3
+// CHECK-DAG: store ptr [[PGEP:%.+]], ptr [[PARG]]
+// CHECK-DAG: [[BPGEP]] = getelementptr inbounds {{.+}}[[BP:%[^,]+]]
+// CHECK-DAG: [[PGEP]] = getelementptr inbounds {{.+}}[[P:%[^,]+]]
+//
+// CHECK-DAG: [[BP0:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: [[P0:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP0]]
+// CHECK-DAG: store ptr [[VAR0]], ptr [[P0]]
+//
+// CHECK-DAG: [[BP1:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: [[P1:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP1]]
+// CHECK-DAG: store ptr [[RVAR00:%.+]], ptr [[P1]]
+//
+// CHECK-DAG: [[RVAR00]] = getelementptr inbounds {{.*}}[[RVAR0:%.+]], i{{.+}} 0
+// CHECK-DAG: [[RVAR0]] = load ptr, ptr [[VAR0]]
+//
+// CHECK-DAG: call void @[[KERNEL00]](ptr [[VAR0]])
#pragma omp target map(ptr, ptr[0:2])
{
ptr[1] = 6;
}
+
+// Region 01
+// &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+// &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PTR_AND_OBJ
+//
+// CHECK-DAG: call i32 @__tgt_target_kernel(ptr @{{.+}}, i64 -1, i32 -1, i32 0, ptr @.[[KERNEL01]].region_id, ptr [[ARGS:%.+]])
+// CHECK-DAG: [[BPARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 2
+// CHECK-DAG: store ptr [[BPGEP:%.+]], ptr [[BPARG]]
+// CHECK-DAG: [[PARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 3
+// CHECK-DAG: store ptr [[PGEP:%.+]], ptr [[PARG]]
+// CHECK-DAG: [[BPGEP]] = getelementptr inbounds {{.+}}[[BP:%[^,]+]]
+// CHECK-DAG: [[PGEP]] = getelementptr inbounds {{.+}}[[P:%[^,]+]]
+//
+// CHECK-DAG: [[BP0:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: [[P0:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP0]]
+// CHECK-DAG: store ptr [[VAR0]], ptr [[P0]]
+//
+// CHECK-DAG: [[BP1:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: [[P1:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP1]]
+// CHECK-DAG: store ptr [[RVAR02:%.+]], ptr [[P1]]
+//
+// CHECK-DAG: [[RVAR02]] = getelementptr inbounds {{.*}}[[RVAR0:%.+]], i{{.+}} 2
+// CHECK-DAG: [[RVAR0]] = load ptr, ptr [[VAR0]]
+//
+// CHECK-DAG: call void @[[KERNEL01]](ptr [[VAR0]])
#pragma omp target map(ptr, ptr[2])
{
ptr[2] = 8;
}
- #pragma omp target data map(ptr, ptr[2])
+
+// Region 02
+// &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+// &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PTR_AND_OBJ
+//
+// CHECK-DAG: call i32 @__tgt_target_kernel(ptr @{{.+}}, i64 -1, i32 -1, i32 0, ptr @.[[KERNEL02]].region_id, ptr [[ARGS:%.+]])
+// CHECK-DAG: [[BPARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 2
+// CHECK-DAG: store ptr [[BPGEP:%.+]], ptr [[BPARG]]
+// CHECK-DAG: [[PARG:%.+]] = getelementptr inbounds {{.+}}[[ARGS]], i32 0, i32 3
+// CHECK-DAG: store ptr [[PGEP:%.+]], ptr [[PARG]]
+// CHECK-DAG: [[BPGEP]] = getelementptr inbounds {{.+}}[[BP:%[^,]+]]
+// CHECK-DAG: [[PGEP]] = getelementptr inbounds {{.+}}[[P:%[^,]+]]
+//
+// CHECK-DAG: [[BP0:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: [[P0:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP0]]
+// CHECK-DAG: store ptr [[VAR0]], ptr [[P0]]
+//
+// CHECK-DAG: [[BP1:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: [[P1:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 1
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP1]]
+// CHECK-DAG: store ptr [[RVAR02:%.+]], ptr [[P1]]
+//
+// CHECK-DAG: [[RVAR02]] = getelementptr inbounds {{.*}}[[RVAR0:%.+]], i{{.+}} 2
+// CHECK-DAG: [[RVAR0]] = load ptr, ptr [[VAR0]]
+//
+// CHECK-DAG: call void @[[KERNEL02]](ptr [[VAR0]])
+ #pragma omp target map(ptr[2], ptr)
{
ptr[2] = 9;
}
+
+// Region 03
+// &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+// FIXME: PARAM seems to be redundant here.
+//
+// CHECK-DAG: call void @__tgt_target_data_begin_mapper(ptr @{{.+}}, i64 -1, i32 1, ptr [[BPGEP:.+]], ptr [[PGEP:.+]], ptr [[SIZE03]], ptr [[MYTYPE03]], ptr null, ptr null)
+// CHECK-DAG: [[BPGEP]] = getelementptr inbounds {{.+}}[[BP:%[^,]+]]
+// CHECK-DAG: [[PGEP]] = getelementptr inbounds {{.+}}[[P:%[^,]+]]
+//
+// CHECK-DAG: [[BP0:%.+]] = getelementptr inbounds {{.+}}[[BP]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: [[P0:%.+]] = getelementptr inbounds {{.+}}[[P]], i{{.+}} 0, i{{.+}} 0
+// CHECK-DAG: store ptr [[VAR0:%ptr]], ptr [[BP0]]
+// CHECK-DAG: store ptr [[RVAR02:%.+]], ptr [[P0]]
+//
+// CHECK-DAG: [[RVAR02]] = getelementptr inbounds {{.*}}[[RVAR0:%.+]], i{{.+}} 2
+// CHECK-DAG: [[RVAR0]] = load ptr, ptr [[VAR0]]
+ #pragma omp target data map(ptr, ptr[2])
+ {
+ ptr[2] = 10;
+ }
}
-#endif
-// CHECK-LABEL: define {{[^@]+}}@_Z3foov
-// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
+
+// CHECK-LABEL: define internal void
+// CHECK-SAME: @[[KERNEL00]](ptr {{[^,]*}}[[PTR:%[^,]+]])
// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[KERNEL_ARGS:%.*]] = alloca [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS2:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS3:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS4:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[KERNEL_ARGS5:%.*]] = alloca [[STRUCT___TGT_KERNEL_ARGUMENTS]], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS9:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS10:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS11:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_Z6malloci(i32 noundef signext 12) #[[ATTR3:[0-9]+]]
-// CHECK-NEXT: store ptr [[CALL]], ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
-// CHECK-NEXT: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP2]], align 8
-// CHECK-NEXT: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP4]], align 8
-// CHECK-NEXT: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK-NEXT: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK-NEXT: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 0
-// CHECK-NEXT: store i32 3, ptr [[TMP7]], align 4
-// CHECK-NEXT: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 1
-// CHECK-NEXT: store i32 1, ptr [[TMP8]], align 4
-// CHECK-NEXT: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 2
-// CHECK-NEXT: store ptr [[TMP5]], ptr [[TMP9]], align 8
-// CHECK-NEXT: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 3
-// CHECK-NEXT: store ptr [[TMP6]], ptr [[TMP10]], align 8
-// CHECK-NEXT: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 4
-// CHECK-NEXT: store ptr @.offload_sizes, ptr [[TMP11]], align 8
-// CHECK-NEXT: [[TMP12:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 5
-// CHECK-NEXT: store ptr @.offload_maptypes, ptr [[TMP12]], align 8
-// CHECK-NEXT: [[TMP13:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 6
-// CHECK-NEXT: store ptr null, ptr [[TMP13]], align 8
-// CHECK-NEXT: [[TMP14:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 7
-// CHECK-NEXT: store ptr null, ptr [[TMP14]], align 8
-// CHECK-NEXT: [[TMP15:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 8
-// CHECK-NEXT: store i64 0, ptr [[TMP15]], align 8
-// CHECK-NEXT: [[TMP16:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 9
-// CHECK-NEXT: store i64 0, ptr [[TMP16]], align 8
-// CHECK-NEXT: [[TMP17:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 10
-// CHECK-NEXT: store [3 x i32] [i32 -1, i32 0, i32 0], ptr [[TMP17]], align 4
-// CHECK-NEXT: [[TMP18:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 11
-// CHECK-NEXT: store [3 x i32] zeroinitializer, ptr [[TMP18]], align 4
-// CHECK-NEXT: [[TMP19:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 12
-// CHECK-NEXT: store i32 0, ptr [[TMP19]], align 4
-// CHECK-NEXT: [[TMP20:%.*]] = call i32 @__tgt_target_kernel(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 -1, i32 0, ptr @.{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15.region_id, ptr [[KERNEL_ARGS]])
-// CHECK-NEXT: [[TMP21:%.*]] = icmp ne i32 [[TMP20]], 0
-// CHECK-NEXT: br i1 [[TMP21]], label [[OMP_OFFLOAD_FAILED:%.*]], label [[OMP_OFFLOAD_CONT:%.*]]
-// CHECK: omp_offload.failed:
-// CHECK-NEXT: call void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15(ptr [[TMP0]]) #[[ATTR3]]
-// CHECK-NEXT: br label [[OMP_OFFLOAD_CONT]]
-// CHECK: omp_offload.cont:
-// CHECK-NEXT: [[TMP22:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP23:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP23]], i64 2
-// CHECK-NEXT: [[TMP24:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS2]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP24]], align 8
-// CHECK-NEXT: [[TMP25:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS3]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX1]], ptr [[TMP25]], align 8
-// CHECK-NEXT: [[TMP26:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS4]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP26]], align 8
-// CHECK-NEXT: [[TMP27:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS2]], i32 0, i32 0
-// CHECK-NEXT: [[TMP28:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS3]], i32 0, i32 0
-// CHECK-NEXT: [[TMP29:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 0
-// CHECK-NEXT: store i32 3, ptr [[TMP29]], align 4
-// CHECK-NEXT: [[TMP30:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 1
-// CHECK-NEXT: store i32 1, ptr [[TMP30]], align 4
-// CHECK-NEXT: [[TMP31:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 2
-// CHECK-NEXT: store ptr [[TMP27]], ptr [[TMP31]], align 8
-// CHECK-NEXT: [[TMP32:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 3
-// CHECK-NEXT: store ptr [[TMP28]], ptr [[TMP32]], align 8
-// CHECK-NEXT: [[TMP33:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 4
-// CHECK-NEXT: store ptr @.offload_sizes.1, ptr [[TMP33]], align 8
-// CHECK-NEXT: [[TMP34:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 5
-// CHECK-NEXT: store ptr @.offload_maptypes.2, ptr [[TMP34]], align 8
-// CHECK-NEXT: [[TMP35:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 6
-// CHECK-NEXT: store ptr null, ptr [[TMP35]], align 8
-// CHECK-NEXT: [[TMP36:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 7
-// CHECK-NEXT: store ptr null, ptr [[TMP36]], align 8
-// CHECK-NEXT: [[TMP37:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 8
-// CHECK-NEXT: store i64 0, ptr [[TMP37]], align 8
-// CHECK-NEXT: [[TMP38:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 9
-// CHECK-NEXT: store i64 0, ptr [[TMP38]], align 8
-// CHECK-NEXT: [[TMP39:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 10
-// CHECK-NEXT: store [3 x i32] [i32 -1, i32 0, i32 0], ptr [[TMP39]], align 4
-// CHECK-NEXT: [[TMP40:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 11
-// CHECK-NEXT: store [3 x i32] zeroinitializer, ptr [[TMP40]], align 4
-// CHECK-NEXT: [[TMP41:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 12
-// CHECK-NEXT: store i32 0, ptr [[TMP41]], align 4
-// CHECK-NEXT: [[TMP42:%.*]] = call i32 @__tgt_target_kernel(ptr @[[GLOB1]], i64 -1, i32 -1, i32 0, ptr @.{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19.region_id, ptr [[KERNEL_ARGS5]])
-// CHECK-NEXT: [[TMP43:%.*]] = icmp ne i32 [[TMP42]], 0
-// CHECK-NEXT: br i1 [[TMP43]], label [[OMP_OFFLOAD_FAILED6:%.*]], label [[OMP_OFFLOAD_CONT7:%.*]]
-// CHECK: omp_offload.failed6:
-// CHECK-NEXT: call void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19(ptr [[TMP22]]) #[[ATTR3]]
-// CHECK-NEXT: br label [[OMP_OFFLOAD_CONT7]]
-// CHECK: omp_offload.cont7:
-// CHECK-NEXT: [[TMP44:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX8:%.*]] = getelementptr inbounds i32, ptr [[TMP44]], i64 2
-// CHECK-NEXT: [[TMP45:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP45]], align 8
-// CHECK-NEXT: [[TMP46:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX8]], ptr [[TMP46]], align 8
-// CHECK-NEXT: [[TMP47:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS11]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP47]], align 8
-// CHECK-NEXT: [[TMP48:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: [[TMP49:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP48]], ptr [[TMP49]], ptr @.offload_sizes.3, ptr @.offload_maptypes.4, ptr null, ptr null)
-// CHECK-NEXT: [[TMP50:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX12:%.*]] = getelementptr inbounds i32, ptr [[TMP50]], i64 2
-// CHECK-NEXT: store i32 9, ptr [[ARRAYIDX12]], align 4
-// CHECK-NEXT: [[TMP51:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: [[TMP52:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP51]], ptr [[TMP52]], ptr @.offload_sizes.3, ptr @.offload_maptypes.4, ptr null, ptr null)
+// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr
+// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP1:%.*]] = load ptr, ptr [[TMP0]]
+// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i{{.*}} 1
+// CHECK-NEXT: store i32 6, ptr [[ARRAYIDX]]
// CHECK-NEXT: ret void
-//
-//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR2:[0-9]+]] {
+
+// CHECK-LABEL: define internal void
+// CHECK-SAME: @[[KERNEL01]](ptr {{[^,]*}}[[PTR:%[^,]+]])
// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
-// CHECK-NEXT: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr
+// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP1:%.*]] = load ptr, ptr [[TMP0]]
+// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i{{.*}} 2
+// CHECK-NEXT: store i32 8, ptr [[ARRAYIDX]]
// CHECK-NEXT: ret void
-//
-//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR2]] {
+
+// CHECK-LABEL: define internal void
+// CHECK-SAME: @[[KERNEL02]](ptr {{[^,]*}}[[PTR:%[^,]+]])
// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
-// CHECK-NEXT: store i32 8, ptr [[ARRAYIDX]], align 4
+// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr
+// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]]
+// CHECK-NEXT: [[TMP1:%.*]] = load ptr, ptr [[TMP0]]
+// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i{{.*}} 2
+// CHECK-NEXT: store i32 9, ptr [[ARRAYIDX]]
// CHECK-NEXT: ret void
-//
+#endif
diff --git a/offload/test/mapping/map_ptr_and_subscript_global.c b/offload/test/mapping/map_ptr_and_subscript_global.c
new file mode 100644
index 0000000000000..1861064bc95df
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_subscript_global.c
@@ -0,0 +1,65 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#include <omp.h>
+#include <stdio.h>
+
+int x[10];
+int *p;
+
+void f1() {
+ 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 *p0_mappedptr =
+ (int *)omp_get_mapped_ptr(&p[0], omp_get_default_device());
+
+ printf("p_mappedptr %s null\n", p_mappedptr == (int **)NULL ? "==" : "!=");
+ printf("p0_mappedptr %s null\n", p0_mappedptr == (int *)NULL ? "==" : "!=");
+
+// CHECK: p_mappedptr != null
+// CHECK: p0_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]) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[0]);
+ // CHECK: 111 0 1
+ 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) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[0]);
+ // CHECK: 111 1 1
+ p++;
+ }
+
+#pragma omp target map(to : p, p[0]) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[-1]);
+ // CHECK: 222 1 1
+ p++;
+ }
+
+#pragma omp target map(present, alloc : p) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[-2]);
+ // CHECK: 333 1 1
+ }
+
+#pragma omp target exit data map(delete:p[0 : 5], p)
+}
+
+int main() { f1(); }
>From 97b2dfff5b85e6e011eb241615fb4babd9bfb7ab Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Mon, 23 Jun 2025 21:19:21 -0700
Subject: [PATCH 02/12] Add another test, minor clang-format fix.
---
.../mapping/map_ptr_and_subscript_global.c | 7 +-
.../mapping/map_ptr_and_subscript_local.c | 66 +++++++++++++++++++
2 files changed, 70 insertions(+), 3 deletions(-)
create mode 100644 offload/test/mapping/map_ptr_and_subscript_local.c
diff --git a/offload/test/mapping/map_ptr_and_subscript_global.c b/offload/test/mapping/map_ptr_and_subscript_global.c
index 1861064bc95df..880a1e405b383 100644
--- a/offload/test/mapping/map_ptr_and_subscript_global.c
+++ b/offload/test/mapping/map_ptr_and_subscript_global.c
@@ -14,7 +14,7 @@ void f1() {
p[3] = 444;
#pragma omp target enter data map(to : p)
-#pragma omp target enter data map(to:p[0 : 5])
+#pragma omp target enter data map(to : p[0 : 5])
int **p_mappedptr = (int **)omp_get_mapped_ptr(&p, omp_get_default_device());
int *p0_mappedptr =
@@ -53,13 +53,14 @@ void f1() {
p++;
}
-#pragma omp target map(present, alloc : p) firstprivate(p_mappedptr, p0_mappedptr)
+#pragma omp target map(present, alloc : p) \
+ firstprivate(p_mappedptr, p0_mappedptr)
{
printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[-2]);
// CHECK: 333 1 1
}
-#pragma omp target exit data map(delete:p[0 : 5], p)
+#pragma omp target exit data map(delete : p[0 : 5], p)
}
int main() { f1(); }
diff --git a/offload/test/mapping/map_ptr_and_subscript_local.c b/offload/test/mapping/map_ptr_and_subscript_local.c
new file mode 100644
index 0000000000000..24c5d0c7c5532
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_subscript_local.c
@@ -0,0 +1,66 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#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 *p0_mappedptr =
+ (int *)omp_get_mapped_ptr(&p[0], omp_get_default_device());
+
+ printf("p_mappedptr %s null\n", p_mappedptr == (int **)NULL ? "==" : "!=");
+ printf("p0_mappedptr %s null\n", p0_mappedptr == (int *)NULL ? "==" : "!=");
+
+// CHECK: p_mappedptr != null
+// CHECK: p0_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]) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[0]);
+ // CHECK: 111 0 1
+ 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) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[0]);
+ // CHECK: 111 1 1
+ p++;
+ }
+
+#pragma omp target map(to : p, p[0]) firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[-1]);
+ // CHECK: 222 1 1
+ p++;
+ }
+
+#pragma omp target map(present, alloc : p) \
+ firstprivate(p_mappedptr, p0_mappedptr)
+ {
+ printf("%d %d %d\n", p[0], p_mappedptr == &p, p0_mappedptr == &p[-2]);
+ // CHECK: 333 1 1
+ }
+
+#pragma omp target exit data map(delete : p[0 : 5], p)
+}
+
+int main() { f1(); }
>From a31ea2a50e0e3206a98bf1c3580343f609db4d63 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Tue, 24 Jun 2025 11:21:01 -0700
Subject: [PATCH 03/12] Update the comparator for sort, plus minor additions to
offload tests.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++---
offload/test/mapping/map_ptr_and_subscript_global.c | 7 +++++++
offload/test/mapping/map_ptr_and_subscript_local.c | 7 +++++++
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 39571105e26b2..f126feb214b6a 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -8838,9 +8838,9 @@ class MappableExprsHandler {
std::get<0>(LHS);
OMPClauseMappableExprCommon::MappableExprComponentListRef ComponentsR =
std::get<0>(RHS);
- if (VD && VD->getType()->isAnyPointerType() && Components.size() == 1 &&
- ComponentsR.size() > 1)
- return true;
+ if (VD && VD->getType()->isAnyPointerType() &&
+ Components.size() != ComponentsR.size())
+ return Components.size() < ComponentsR.size();
ArrayRef<OpenMPMapModifierKind> MapModifiers = std::get<2>(LHS);
OpenMPMapClauseKind MapType = std::get<1>(RHS);
diff --git a/offload/test/mapping/map_ptr_and_subscript_global.c b/offload/test/mapping/map_ptr_and_subscript_global.c
index 880a1e405b383..fdbd050be4cc7 100644
--- a/offload/test/mapping/map_ptr_and_subscript_global.c
+++ b/offload/test/mapping/map_ptr_and_subscript_global.c
@@ -60,6 +60,13 @@ void f1() {
// CHECK: 333 1 1
}
+ // 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)
}
diff --git a/offload/test/mapping/map_ptr_and_subscript_local.c b/offload/test/mapping/map_ptr_and_subscript_local.c
index 24c5d0c7c5532..30ef0ce706be9 100644
--- a/offload/test/mapping/map_ptr_and_subscript_local.c
+++ b/offload/test/mapping/map_ptr_and_subscript_local.c
@@ -60,6 +60,13 @@ void f1() {
// CHECK: 333 1 1
}
+ // 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)
}
>From 001da09d8534d7d25364d6ed7ba3a433ef366ff1 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Wed, 2 Jul 2025 00:32:33 -0700
Subject: [PATCH 04/12] [NFC][Clang] Refactor mapinfo generation for captured
vars on target.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 127 +++++++++++++++++---------
1 file changed, 86 insertions(+), 41 deletions(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index f126feb214b6a..e9c3dece1a501 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -6801,6 +6801,11 @@ class MappableExprsHandler {
llvm::OpenMPIRBuilder::MapNonContiguousArrayTy;
using MapExprsArrayTy = SmallVector<MappingExprInfo, 4>;
using MapValueDeclsArrayTy = SmallVector<const ValueDecl *, 4>;
+ using MapData =
+ std::tuple<OMPClauseMappableExprCommon::MappableExprComponentListRef,
+ OpenMPMapClauseKind, ArrayRef<OpenMPMapModifierKind>,
+ bool /*IsImplicit*/, const ValueDecl *, const Expr *>;
+ using MapDataArrayTy = SmallVector<MapData, 4>;
/// This structure contains combined information generated for mappable
/// clauses, including base pointers, pointers, sizes, map types, user-defined
@@ -8514,6 +8519,7 @@ class MappableExprsHandler {
const StructRangeInfoTy &PartialStruct, bool IsMapThis,
llvm::OpenMPIRBuilder &OMPBuilder,
const ValueDecl *VD = nullptr,
+ unsigned OffsetForMemberOfFlag = 0,
bool NotTargetParams = true) const {
if (CurTypes.size() == 1 &&
((CurTypes.back() & OpenMPOffloadMappingFlags::OMP_MAP_MEMBER_OF) !=
@@ -8601,8 +8607,8 @@ class MappableExprsHandler {
// All other current entries will be MEMBER_OF the combined entry
// (except for PTR_AND_OBJ entries which do not have a placeholder value
// 0xFFFF in the MEMBER_OF field).
- OpenMPOffloadMappingFlags MemberOfFlag =
- OMPBuilder.getMemberOfFlag(CombinedInfo.BasePointers.size() - 1);
+ OpenMPOffloadMappingFlags MemberOfFlag = OMPBuilder.getMemberOfFlag(
+ OffsetForMemberOfFlag + CombinedInfo.BasePointers.size() - 1);
for (auto &M : CurTypes)
OMPBuilder.setCorrectMemberOfFlag(M, MemberOfFlag);
}
@@ -8745,11 +8751,13 @@ class MappableExprsHandler {
}
}
- /// Generate the base pointers, section pointers, sizes, map types, and
- /// mappers associated to a given capture (all included in \a CombinedInfo).
- void generateInfoForCapture(const CapturedStmt::Capture *Cap,
- llvm::Value *Arg, MapCombinedInfoTy &CombinedInfo,
- StructRangeInfoTy &PartialStruct) const {
+ /// For a capture that has an associated clause, generate the base pointers,
+ /// section pointers, sizes, map types, and mappers (all included in
+ /// \a CurCaptureVarInfo).
+ void generateInfoForCaptureFromClauseInfo(
+ const CapturedStmt::Capture *Cap, llvm::Value *Arg,
+ MapCombinedInfoTy &CurCaptureVarInfo, llvm::OpenMPIRBuilder &OMPBuilder,
+ unsigned OffsetForMemberOfFlag) const {
assert(!Cap->capturesVariableArrayType() &&
"Not expecting to generate map info for a variable array type!");
@@ -8767,26 +8775,22 @@ class MappableExprsHandler {
// pass the pointer by value. If it is a reference to a declaration, we just
// pass its value.
if (VD && (DevPointersMap.count(VD) || HasDevAddrsMap.count(VD))) {
- CombinedInfo.Exprs.push_back(VD);
- CombinedInfo.BasePointers.emplace_back(Arg);
- CombinedInfo.DevicePtrDecls.emplace_back(VD);
- CombinedInfo.DevicePointers.emplace_back(DeviceInfoTy::Pointer);
- CombinedInfo.Pointers.push_back(Arg);
- CombinedInfo.Sizes.push_back(CGF.Builder.CreateIntCast(
+ CurCaptureVarInfo.Exprs.push_back(VD);
+ CurCaptureVarInfo.BasePointers.emplace_back(Arg);
+ CurCaptureVarInfo.DevicePtrDecls.emplace_back(VD);
+ CurCaptureVarInfo.DevicePointers.emplace_back(DeviceInfoTy::Pointer);
+ CurCaptureVarInfo.Pointers.push_back(Arg);
+ CurCaptureVarInfo.Sizes.push_back(CGF.Builder.CreateIntCast(
CGF.getTypeSize(CGF.getContext().VoidPtrTy), CGF.Int64Ty,
/*isSigned=*/true));
- CombinedInfo.Types.push_back(
+ CurCaptureVarInfo.Types.push_back(
OpenMPOffloadMappingFlags::OMP_MAP_LITERAL |
OpenMPOffloadMappingFlags::OMP_MAP_TARGET_PARAM);
- CombinedInfo.Mappers.push_back(nullptr);
+ CurCaptureVarInfo.Mappers.push_back(nullptr);
return;
}
- using MapData =
- std::tuple<OMPClauseMappableExprCommon::MappableExprComponentListRef,
- OpenMPMapClauseKind, ArrayRef<OpenMPMapModifierKind>, bool,
- const ValueDecl *, const Expr *>;
- SmallVector<MapData, 4> DeclComponentLists;
+ MapDataArrayTy DeclComponentLists;
// For member fields list in is_device_ptr, store it in
// DeclComponentLists for generating components info.
static const OpenMPMapModifierKind Unknown = OMPC_MAP_MODIFIER_unknown;
@@ -8855,6 +8859,51 @@ class MappableExprsHandler {
return (HasPresent && !HasPresentR) || (HasAllocs && !HasAllocsR);
});
+ auto GenerateInfoForComponentLists =
+ [&](ArrayRef<MapData> DeclComponentLists,
+ bool IsEligibleForTargetParamFlag) {
+ MapCombinedInfoTy CurInfoForComponentLists;
+ StructRangeInfoTy PartialStruct;
+
+ if (DeclComponentLists.empty())
+ return;
+
+ generateInfoForCaptureFromComponentLists(
+ VD, DeclComponentLists, CurInfoForComponentLists, PartialStruct,
+ IsEligibleForTargetParamFlag,
+ /*AreBothBasePtrAndPteeMapped=*/HasMapBasePtr && HasMapArraySec);
+
+ // If there is an entry in PartialStruct it means we have a
+ // struct with individual members mapped. Emit an extra combined
+ // entry.
+ if (PartialStruct.Base.isValid()) {
+ CurCaptureVarInfo.append(PartialStruct.PreliminaryMapData);
+ emitCombinedEntry(
+ CurCaptureVarInfo, CurInfoForComponentLists.Types,
+ PartialStruct, Cap->capturesThis(), OMPBuilder, nullptr,
+ OffsetForMemberOfFlag,
+ /*NotTargetParams*/ !IsEligibleForTargetParamFlag);
+ }
+
+ // Return if we didn't add any entries.
+ if (CurInfoForComponentLists.BasePointers.empty())
+ return;
+
+ CurCaptureVarInfo.append(CurInfoForComponentLists);
+ };
+
+ GenerateInfoForComponentLists(DeclComponentLists,
+ /*IsEligibleForTargetParamFlag=*/true);
+ }
+
+ /// Generate the base pointers, section pointers, sizes, map types, and
+ /// mappers associated to \a DeclComponentLists for a given capture
+ /// \a VD (all included in \a CurComponentListInfo).
+ void generateInfoForCaptureFromComponentLists(
+ const ValueDecl *VD, ArrayRef<MapData> DeclComponentLists,
+ MapCombinedInfoTy &CurComponentListInfo, StructRangeInfoTy &PartialStruct,
+ bool IsListEligibleForTargetParamFlag,
+ bool AreBothBasePtrAndPteeMapped = false) const {
// Find overlapping elements (including the offset from the base element).
llvm::SmallDenseMap<
const MapData *,
@@ -8978,7 +9027,7 @@ class MappableExprsHandler {
// Associated with a capture, because the mapping flags depend on it.
// Go through all of the elements with the overlapped elements.
- bool IsFirstComponentList = true;
+ bool AddTargetParamFlag = IsListEligibleForTargetParamFlag;
MapCombinedInfoTy StructBaseCombinedInfo;
for (const auto &Pair : OverlappedData) {
const MapData &L = *Pair.getFirst();
@@ -8993,11 +9042,11 @@ class MappableExprsHandler {
ArrayRef<OMPClauseMappableExprCommon::MappableExprComponentListRef>
OverlappedComponents = Pair.getSecond();
generateInfoForComponentList(
- MapType, MapModifiers, {}, Components, CombinedInfo,
- StructBaseCombinedInfo, PartialStruct, IsFirstComponentList,
- IsImplicit, /*GenerateAllInfoForClauses*/ false, Mapper,
+ MapType, MapModifiers, {}, Components, CurComponentListInfo,
+ StructBaseCombinedInfo, PartialStruct, AddTargetParamFlag, IsImplicit,
+ /*GenerateAllInfoForClauses*/ false, Mapper,
/*ForDeviceAddr=*/false, VD, VarRef, OverlappedComponents);
- IsFirstComponentList = false;
+ AddTargetParamFlag = false;
}
// Go through other elements without overlapped elements.
for (const MapData &L : DeclComponentLists) {
@@ -9012,12 +9061,12 @@ class MappableExprsHandler {
auto It = OverlappedData.find(&L);
if (It == OverlappedData.end())
generateInfoForComponentList(
- MapType, MapModifiers, {}, Components, CombinedInfo,
- StructBaseCombinedInfo, PartialStruct, IsFirstComponentList,
+ MapType, MapModifiers, {}, Components, CurComponentListInfo,
+ StructBaseCombinedInfo, PartialStruct, AddTargetParamFlag,
IsImplicit, /*GenerateAllInfoForClauses*/ false, Mapper,
/*ForDeviceAddr=*/false, VD, VarRef,
- /*OverlappedElements*/ {}, HasMapBasePtr && HasMapArraySec);
- IsFirstComponentList = false;
+ /*OverlappedElements*/ {}, AreBothBasePtrAndPteeMapped);
+ AddTargetParamFlag = false;
}
}
@@ -9496,7 +9545,6 @@ static void genMapInfoForCaptures(
CE = CS.capture_end();
CI != CE; ++CI, ++RI, ++CV) {
MappableExprsHandler::MapCombinedInfoTy CurInfo;
- MappableExprsHandler::StructRangeInfoTy PartialStruct;
// VLA sizes are passed to the outlined region by copy and do not have map
// information associated.
@@ -9517,13 +9565,18 @@ static void genMapInfoForCaptures(
} else {
// If we have any information in the map clause, we use it, otherwise we
// just do a default mapping.
- MEHandler.generateInfoForCapture(CI, *CV, CurInfo, PartialStruct);
+ MEHandler.generateInfoForCaptureFromClauseInfo(
+ CI, *CV, CurInfo, OMPBuilder,
+ /*OffsetForMemberOfFlag=*/CombinedInfo.BasePointers.size());
+
if (!CI->capturesThis())
MappedVarSet.insert(CI->getCapturedVar());
else
MappedVarSet.insert(nullptr);
- if (CurInfo.BasePointers.empty() && !PartialStruct.Base.isValid())
+
+ if (CurInfo.BasePointers.empty())
MEHandler.generateDefaultMapInfo(*CI, **RI, *CV, CurInfo);
+
// Generate correct mapping for variables captured by reference in
// lambdas.
if (CI->capturesVariable())
@@ -9531,7 +9584,7 @@ static void genMapInfoForCaptures(
CurInfo, LambdaPointers);
}
// We expect to have at least an element of information for this capture.
- assert((!CurInfo.BasePointers.empty() || PartialStruct.Base.isValid()) &&
+ assert(!CurInfo.BasePointers.empty() &&
"Non-existing map pointer for capture!");
assert(CurInfo.BasePointers.size() == CurInfo.Pointers.size() &&
CurInfo.BasePointers.size() == CurInfo.Sizes.size() &&
@@ -9539,14 +9592,6 @@ static void genMapInfoForCaptures(
CurInfo.BasePointers.size() == CurInfo.Mappers.size() &&
"Inconsistent map information sizes!");
- // If there is an entry in PartialStruct it means we have a struct with
- // individual members mapped. Emit an extra combined entry.
- if (PartialStruct.Base.isValid()) {
- CombinedInfo.append(PartialStruct.PreliminaryMapData);
- MEHandler.emitCombinedEntry(CombinedInfo, CurInfo.Types, PartialStruct,
- CI->capturesThis(), OMPBuilder, nullptr,
- /*NotTargetParams*/ false);
- }
// We need to append the results of this capture to what we already have.
CombinedInfo.append(CurInfo);
>From 1ebb7a92ec0ae94771d22e27831253597ecfaf1e Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Wed, 2 Jul 2025 01:34:59 -0700
Subject: [PATCH 05/12] Handle mapping of captured pointers before any
dereference of them.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 50 ++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index e9c3dece1a501..b34be04d4559b 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -8892,8 +8892,56 @@ class MappableExprsHandler {
CurCaptureVarInfo.append(CurInfoForComponentLists);
};
- GenerateInfoForComponentLists(DeclComponentLists,
+ // Next, we break-down the lists of components into lists that should be
+ // handled together.
+ //
+ // For now, we handle maps on pointers by themselves, and everything else
+ // together.
+ //
+ // TODO: Do this based on which lists have the same attachable-base-pointer
+ // e.g. The map clauses below, which are present on the same construct,
+ // should be handled grouped together based on their
+ // attachable-base-pointers:
+ // map-clause | attachable-base-pointer
+ // --------------------------+------------------------
+ // map(p, ps) | none
+ // map(p[0]) | p
+ // map(p[0]->b, p[0]->c) | p[0]
+ // map(ps->d, ps->e, ps->pt) | ps
+ // map(ps->pt->d, ps->pt->e) | ps->pt
+
+ MapDataArrayTy ListsThatMapPointerVDItself;
+ MapDataArrayTy RemainingLists;
+ bool IsVDPointerType = VD && VD->getType()->isPointerType();
+
+ for (const MapData &L : DeclComponentLists) {
+ if (IsVDPointerType) {
+ OMPClauseMappableExprCommon::MappableExprComponentListRef Components =
+ std::get<0>(L);
+ bool IsMapOfPointerVD =
+ Components.size() == 1 &&
+ Components[0].getAssociatedDeclaration() &&
+ Components[0].getAssociatedDeclaration()->getCanonicalDecl() == VD;
+ if (IsMapOfPointerVD) {
+ ListsThatMapPointerVDItself.push_back(L);
+ continue;
+ }
+ }
+ RemainingLists.push_back(L);
+ }
+
+ // If VD is a pointer, and there are component-lists mapping VD itself,
+ // like: `int *p; ... map(p)`, we handle them first, and
+ // the first one from the should get the TARGET_PARAM flag.
+ GenerateInfoForComponentLists(ListsThatMapPointerVDItself,
/*IsEligibleForTargetParamFlag=*/true);
+ // Then we handle all the other lists together. Note that since we already
+ // added TARGET_PARAM for the pointer case, we shouldn't add it again if
+ // if there are other lists that get handled here, for example, the list
+ // for `map(p[0:10]` in `int *p; ... map(p, p[0:10])`.
+ GenerateInfoForComponentLists(
+ RemainingLists,
+ /*IsEligibleForTargetParamFlag=*/ListsThatMapPointerVDItself.empty());
}
/// Generate the base pointers, section pointers, sizes, map types, and
>From 7799d0a97459abc5a3202bb137ef14cdde1a917b Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Wed, 2 Jul 2025 11:42:31 -0700
Subject: [PATCH 06/12] No need to change the sorting since we now handle
mapping of pointers before their derefs.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index b34be04d4559b..3b6db4b62fbd9 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -8833,19 +8833,8 @@ class MappableExprsHandler {
++EI;
}
}
- llvm::stable_sort(DeclComponentLists, [VD](const MapData &LHS,
- const MapData &RHS) {
- // For cases like map(p, p[0], p[0][0]), the shortest map, like map(p)
- // in this case, should be handled first, to ensure that it gets the
- // TARGET_PARAM flag.
- OMPClauseMappableExprCommon::MappableExprComponentListRef Components =
- std::get<0>(LHS);
- OMPClauseMappableExprCommon::MappableExprComponentListRef ComponentsR =
- std::get<0>(RHS);
- if (VD && VD->getType()->isAnyPointerType() &&
- Components.size() != ComponentsR.size())
- return Components.size() < ComponentsR.size();
-
+ llvm::stable_sort(DeclComponentLists, [](const MapData &LHS,
+ const MapData &RHS) {
ArrayRef<OpenMPMapModifierKind> MapModifiers = std::get<2>(LHS);
OpenMPMapClauseKind MapType = std::get<1>(RHS);
bool HasPresent =
>From 9f61909419939491c12384f471df05a504068054 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Wed, 2 Jul 2025 00:32:33 -0700
Subject: [PATCH 07/12] [NFC][Clang] Refactor mapinfo generation for captured
vars on target.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 127 +++++++++++++++++---------
1 file changed, 86 insertions(+), 41 deletions(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 8ccc37ef98a74..1964f91797be2 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -6801,6 +6801,11 @@ class MappableExprsHandler {
llvm::OpenMPIRBuilder::MapNonContiguousArrayTy;
using MapExprsArrayTy = SmallVector<MappingExprInfo, 4>;
using MapValueDeclsArrayTy = SmallVector<const ValueDecl *, 4>;
+ using MapData =
+ std::tuple<OMPClauseMappableExprCommon::MappableExprComponentListRef,
+ OpenMPMapClauseKind, ArrayRef<OpenMPMapModifierKind>,
+ bool /*IsImplicit*/, const ValueDecl *, const Expr *>;
+ using MapDataArrayTy = SmallVector<MapData, 4>;
/// This structure contains combined information generated for mappable
/// clauses, including base pointers, pointers, sizes, map types, user-defined
@@ -8496,6 +8501,7 @@ class MappableExprsHandler {
const StructRangeInfoTy &PartialStruct, bool IsMapThis,
llvm::OpenMPIRBuilder &OMPBuilder,
const ValueDecl *VD = nullptr,
+ unsigned OffsetForMemberOfFlag = 0,
bool NotTargetParams = true) const {
if (CurTypes.size() == 1 &&
((CurTypes.back() & OpenMPOffloadMappingFlags::OMP_MAP_MEMBER_OF) !=
@@ -8583,8 +8589,8 @@ class MappableExprsHandler {
// All other current entries will be MEMBER_OF the combined entry
// (except for PTR_AND_OBJ entries which do not have a placeholder value
// 0xFFFF in the MEMBER_OF field).
- OpenMPOffloadMappingFlags MemberOfFlag =
- OMPBuilder.getMemberOfFlag(CombinedInfo.BasePointers.size() - 1);
+ OpenMPOffloadMappingFlags MemberOfFlag = OMPBuilder.getMemberOfFlag(
+ OffsetForMemberOfFlag + CombinedInfo.BasePointers.size() - 1);
for (auto &M : CurTypes)
OMPBuilder.setCorrectMemberOfFlag(M, MemberOfFlag);
}
@@ -8727,11 +8733,13 @@ class MappableExprsHandler {
}
}
- /// Generate the base pointers, section pointers, sizes, map types, and
- /// mappers associated to a given capture (all included in \a CombinedInfo).
- void generateInfoForCapture(const CapturedStmt::Capture *Cap,
- llvm::Value *Arg, MapCombinedInfoTy &CombinedInfo,
- StructRangeInfoTy &PartialStruct) const {
+ /// For a capture that has an associated clause, generate the base pointers,
+ /// section pointers, sizes, map types, and mappers (all included in
+ /// \a CurCaptureVarInfo).
+ void generateInfoForCaptureFromClauseInfo(
+ const CapturedStmt::Capture *Cap, llvm::Value *Arg,
+ MapCombinedInfoTy &CurCaptureVarInfo, llvm::OpenMPIRBuilder &OMPBuilder,
+ unsigned OffsetForMemberOfFlag) const {
assert(!Cap->capturesVariableArrayType() &&
"Not expecting to generate map info for a variable array type!");
@@ -8749,26 +8757,22 @@ class MappableExprsHandler {
// pass the pointer by value. If it is a reference to a declaration, we just
// pass its value.
if (VD && (DevPointersMap.count(VD) || HasDevAddrsMap.count(VD))) {
- CombinedInfo.Exprs.push_back(VD);
- CombinedInfo.BasePointers.emplace_back(Arg);
- CombinedInfo.DevicePtrDecls.emplace_back(VD);
- CombinedInfo.DevicePointers.emplace_back(DeviceInfoTy::Pointer);
- CombinedInfo.Pointers.push_back(Arg);
- CombinedInfo.Sizes.push_back(CGF.Builder.CreateIntCast(
+ CurCaptureVarInfo.Exprs.push_back(VD);
+ CurCaptureVarInfo.BasePointers.emplace_back(Arg);
+ CurCaptureVarInfo.DevicePtrDecls.emplace_back(VD);
+ CurCaptureVarInfo.DevicePointers.emplace_back(DeviceInfoTy::Pointer);
+ CurCaptureVarInfo.Pointers.push_back(Arg);
+ CurCaptureVarInfo.Sizes.push_back(CGF.Builder.CreateIntCast(
CGF.getTypeSize(CGF.getContext().VoidPtrTy), CGF.Int64Ty,
/*isSigned=*/true));
- CombinedInfo.Types.push_back(
+ CurCaptureVarInfo.Types.push_back(
OpenMPOffloadMappingFlags::OMP_MAP_LITERAL |
OpenMPOffloadMappingFlags::OMP_MAP_TARGET_PARAM);
- CombinedInfo.Mappers.push_back(nullptr);
+ CurCaptureVarInfo.Mappers.push_back(nullptr);
return;
}
- using MapData =
- std::tuple<OMPClauseMappableExprCommon::MappableExprComponentListRef,
- OpenMPMapClauseKind, ArrayRef<OpenMPMapModifierKind>, bool,
- const ValueDecl *, const Expr *>;
- SmallVector<MapData, 4> DeclComponentLists;
+ MapDataArrayTy DeclComponentLists;
// For member fields list in is_device_ptr, store it in
// DeclComponentLists for generating components info.
static const OpenMPMapModifierKind Unknown = OMPC_MAP_MODIFIER_unknown;
@@ -8826,6 +8830,51 @@ class MappableExprsHandler {
return (HasPresent && !HasPresentR) || (HasAllocs && !HasAllocsR);
});
+ auto GenerateInfoForComponentLists =
+ [&](ArrayRef<MapData> DeclComponentLists,
+ bool IsEligibleForTargetParamFlag) {
+ MapCombinedInfoTy CurInfoForComponentLists;
+ StructRangeInfoTy PartialStruct;
+
+ if (DeclComponentLists.empty())
+ return;
+
+ generateInfoForCaptureFromComponentLists(
+ VD, DeclComponentLists, CurInfoForComponentLists, PartialStruct,
+ IsEligibleForTargetParamFlag,
+ /*AreBothBasePtrAndPteeMapped=*/HasMapBasePtr && HasMapArraySec);
+
+ // If there is an entry in PartialStruct it means we have a
+ // struct with individual members mapped. Emit an extra combined
+ // entry.
+ if (PartialStruct.Base.isValid()) {
+ CurCaptureVarInfo.append(PartialStruct.PreliminaryMapData);
+ emitCombinedEntry(
+ CurCaptureVarInfo, CurInfoForComponentLists.Types,
+ PartialStruct, Cap->capturesThis(), OMPBuilder, nullptr,
+ OffsetForMemberOfFlag,
+ /*NotTargetParams*/ !IsEligibleForTargetParamFlag);
+ }
+
+ // Return if we didn't add any entries.
+ if (CurInfoForComponentLists.BasePointers.empty())
+ return;
+
+ CurCaptureVarInfo.append(CurInfoForComponentLists);
+ };
+
+ GenerateInfoForComponentLists(DeclComponentLists,
+ /*IsEligibleForTargetParamFlag=*/true);
+ }
+
+ /// Generate the base pointers, section pointers, sizes, map types, and
+ /// mappers associated to \a DeclComponentLists for a given capture
+ /// \a VD (all included in \a CurComponentListInfo).
+ void generateInfoForCaptureFromComponentLists(
+ const ValueDecl *VD, ArrayRef<MapData> DeclComponentLists,
+ MapCombinedInfoTy &CurComponentListInfo, StructRangeInfoTy &PartialStruct,
+ bool IsListEligibleForTargetParamFlag,
+ bool AreBothBasePtrAndPteeMapped = false) const {
// Find overlapping elements (including the offset from the base element).
llvm::SmallDenseMap<
const MapData *,
@@ -8949,7 +8998,7 @@ class MappableExprsHandler {
// Associated with a capture, because the mapping flags depend on it.
// Go through all of the elements with the overlapped elements.
- bool IsFirstComponentList = true;
+ bool AddTargetParamFlag = IsListEligibleForTargetParamFlag;
MapCombinedInfoTy StructBaseCombinedInfo;
for (const auto &Pair : OverlappedData) {
const MapData &L = *Pair.getFirst();
@@ -8964,11 +9013,11 @@ class MappableExprsHandler {
ArrayRef<OMPClauseMappableExprCommon::MappableExprComponentListRef>
OverlappedComponents = Pair.getSecond();
generateInfoForComponentList(
- MapType, MapModifiers, {}, Components, CombinedInfo,
- StructBaseCombinedInfo, PartialStruct, IsFirstComponentList,
- IsImplicit, /*GenerateAllInfoForClauses*/ false, Mapper,
+ MapType, MapModifiers, {}, Components, CurComponentListInfo,
+ StructBaseCombinedInfo, PartialStruct, AddTargetParamFlag, IsImplicit,
+ /*GenerateAllInfoForClauses*/ false, Mapper,
/*ForDeviceAddr=*/false, VD, VarRef, OverlappedComponents);
- IsFirstComponentList = false;
+ AddTargetParamFlag = false;
}
// Go through other elements without overlapped elements.
for (const MapData &L : DeclComponentLists) {
@@ -8983,12 +9032,12 @@ class MappableExprsHandler {
auto It = OverlappedData.find(&L);
if (It == OverlappedData.end())
generateInfoForComponentList(
- MapType, MapModifiers, {}, Components, CombinedInfo,
- StructBaseCombinedInfo, PartialStruct, IsFirstComponentList,
+ MapType, MapModifiers, {}, Components, CurComponentListInfo,
+ StructBaseCombinedInfo, PartialStruct, AddTargetParamFlag,
IsImplicit, /*GenerateAllInfoForClauses*/ false, Mapper,
/*ForDeviceAddr=*/false, VD, VarRef,
- /*OverlappedElements*/ {}, HasMapBasePtr && HasMapArraySec);
- IsFirstComponentList = false;
+ /*OverlappedElements*/ {}, AreBothBasePtrAndPteeMapped);
+ AddTargetParamFlag = false;
}
}
@@ -9467,7 +9516,6 @@ static void genMapInfoForCaptures(
CE = CS.capture_end();
CI != CE; ++CI, ++RI, ++CV) {
MappableExprsHandler::MapCombinedInfoTy CurInfo;
- MappableExprsHandler::StructRangeInfoTy PartialStruct;
// VLA sizes are passed to the outlined region by copy and do not have map
// information associated.
@@ -9488,13 +9536,18 @@ static void genMapInfoForCaptures(
} else {
// If we have any information in the map clause, we use it, otherwise we
// just do a default mapping.
- MEHandler.generateInfoForCapture(CI, *CV, CurInfo, PartialStruct);
+ MEHandler.generateInfoForCaptureFromClauseInfo(
+ CI, *CV, CurInfo, OMPBuilder,
+ /*OffsetForMemberOfFlag=*/CombinedInfo.BasePointers.size());
+
if (!CI->capturesThis())
MappedVarSet.insert(CI->getCapturedVar());
else
MappedVarSet.insert(nullptr);
- if (CurInfo.BasePointers.empty() && !PartialStruct.Base.isValid())
+
+ if (CurInfo.BasePointers.empty())
MEHandler.generateDefaultMapInfo(*CI, **RI, *CV, CurInfo);
+
// Generate correct mapping for variables captured by reference in
// lambdas.
if (CI->capturesVariable())
@@ -9502,7 +9555,7 @@ static void genMapInfoForCaptures(
CurInfo, LambdaPointers);
}
// We expect to have at least an element of information for this capture.
- assert((!CurInfo.BasePointers.empty() || PartialStruct.Base.isValid()) &&
+ assert(!CurInfo.BasePointers.empty() &&
"Non-existing map pointer for capture!");
assert(CurInfo.BasePointers.size() == CurInfo.Pointers.size() &&
CurInfo.BasePointers.size() == CurInfo.Sizes.size() &&
@@ -9510,14 +9563,6 @@ static void genMapInfoForCaptures(
CurInfo.BasePointers.size() == CurInfo.Mappers.size() &&
"Inconsistent map information sizes!");
- // If there is an entry in PartialStruct it means we have a struct with
- // individual members mapped. Emit an extra combined entry.
- if (PartialStruct.Base.isValid()) {
- CombinedInfo.append(PartialStruct.PreliminaryMapData);
- MEHandler.emitCombinedEntry(CombinedInfo, CurInfo.Types, PartialStruct,
- CI->capturesThis(), OMPBuilder, nullptr,
- /*NotTargetParams*/ false);
- }
// We need to append the results of this capture to what we already have.
CombinedInfo.append(CurInfo);
>From 526157851221dcf100359fcca6f85d79536042f1 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Thu, 3 Jul 2025 07:02:40 -0700
Subject: [PATCH 08/12] Minor clang-format fix.
---
clang/lib/CodeGen/CGOpenMPRuntime.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 1964f91797be2..a5f2f0efa2c3b 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -9563,7 +9563,6 @@ static void genMapInfoForCaptures(
CurInfo.BasePointers.size() == CurInfo.Mappers.size() &&
"Inconsistent map information sizes!");
-
// We need to append the results of this capture to what we already have.
CombinedInfo.append(CurInfo);
}
>From 145160b4f79620d2dee7ce38598f35584ea7ad5a Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Thu, 3 Jul 2025 10:08:14 -0700
Subject: [PATCH 09/12] [NFC][OpenMP] Add tests for mapping pointers and their
dereferences.
The output of the compile-and-run tests is incorrect. These will be
used for reference in future commits that resolve the issues.
Also updated the existing clang LIT test,
target_map_both_pointer_pointee_codegen.cpp, with more regions and
more narrowed-down update_cc_test_checks filters.
---
...arget_map_both_pointer_pointee_codegen.cpp | 355 ++++++++++--------
...ap_both_pointer_pointee_codegen_global.cpp | 212 +++++++++++
.../OpenMP/target_map_ptr_and_star_global.cpp | 161 ++++++++
.../OpenMP/target_map_ptr_and_star_local.cpp | 167 ++++++++
...target_map_structptr_and_member_global.cpp | 275 ++++++++++++++
.../target_map_structptr_and_member_local.cpp | 278 ++++++++++++++
.../test/mapping/map_ptr_and_star_global.c | 83 ++++
offload/test/mapping/map_ptr_and_star_local.c | 83 ++++
.../mapping/map_ptr_and_subscript_global.c | 83 ++++
.../mapping/map_ptr_and_subscript_local.c | 83 ++++
.../mapping/map_structptr_and_member_global.c | 88 +++++
.../mapping/map_structptr_and_member_local.c | 87 +++++
12 files changed, 1799 insertions(+), 156 deletions(-)
create mode 100644 clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
create mode 100644 clang/test/OpenMP/target_map_ptr_and_star_global.cpp
create mode 100644 clang/test/OpenMP/target_map_ptr_and_star_local.cpp
create mode 100644 clang/test/OpenMP/target_map_structptr_and_member_global.cpp
create mode 100644 clang/test/OpenMP/target_map_structptr_and_member_local.cpp
create mode 100644 offload/test/mapping/map_ptr_and_star_global.c
create mode 100644 offload/test/mapping/map_ptr_and_star_local.c
create mode 100644 offload/test/mapping/map_ptr_and_subscript_global.c
create mode 100644 offload/test/mapping/map_ptr_and_subscript_local.c
create mode 100644 offload/test/mapping/map_structptr_and_member_global.c
create mode 100644 offload/test/mapping/map_structptr_and_member_local.c
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
index 87fa7fe462daa..7ad142e51fc09 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
@@ -1,4 +1,4 @@
-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --check-globals --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*"
// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
@@ -7,168 +7,211 @@
#ifndef HEADER
#define HEADER
-extern void *malloc (int __size) throw () __attribute__ ((__malloc__));
+void f1() {
+ int *ptr;
+ // &ptr, &ptr, sizeof(ptr), TO | PARAM
+ #pragma omp target map(ptr)
+ ptr[1] = 5;
+}
-void foo() {
- int *ptr = (int *) malloc(3 * sizeof(int));
+void f2() {
+ int *ptr;
+ // &ptr[0], &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM
+ #pragma omp target map(ptr[2])
+ ptr[1] = 6;
+}
+void f3() {
+ int *ptr;
+ // &ptr, &ptr[0], sizeof(ptr[0:2]), TO | FROM | PARAM | PTR_AND_OBJ
#pragma omp target map(ptr, ptr[0:2])
- {
- ptr[1] = 6;
- }
+ ptr[1] = 7;
+}
+
+void f4() {
+ int *ptr;
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
#pragma omp target map(ptr, ptr[2])
- {
ptr[2] = 8;
- }
- #pragma omp target data map(ptr, ptr[2])
- {
+}
+
+void f5() {
+ int *ptr;
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target data map(ptr[2], ptr)
ptr[2] = 9;
- }
+}
+
+void f6() {
+ int *ptr;
+ // &ptr, &ptr[0], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target data map(ptr, ptr[2])
+ ptr[2] = 10;
}
#endif
-// CHECK-LABEL: define {{[^@]+}}@_Z3foov
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+//.
+// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
-// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[KERNEL_ARGS:%.*]] = alloca [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS2:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS3:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS4:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[KERNEL_ARGS5:%.*]] = alloca [[STRUCT___TGT_KERNEL_ARGUMENTS]], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_BASEPTRS9:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_PTRS10:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[DOTOFFLOAD_MAPPERS11:%.*]] = alloca [1 x ptr], align 8
-// CHECK-NEXT: [[CALL:%.*]] = call noalias noundef ptr @_Z6malloci(i32 noundef signext 12) #[[ATTR3:[0-9]+]]
-// CHECK-NEXT: store ptr [[CALL]], ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
-// CHECK-NEXT: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP2]], align 8
-// CHECK-NEXT: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP4]], align 8
-// CHECK-NEXT: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK-NEXT: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK-NEXT: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 0
-// CHECK-NEXT: store i32 3, ptr [[TMP7]], align 4
-// CHECK-NEXT: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 1
-// CHECK-NEXT: store i32 1, ptr [[TMP8]], align 4
-// CHECK-NEXT: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 2
-// CHECK-NEXT: store ptr [[TMP5]], ptr [[TMP9]], align 8
-// CHECK-NEXT: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 3
-// CHECK-NEXT: store ptr [[TMP6]], ptr [[TMP10]], align 8
-// CHECK-NEXT: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 4
-// CHECK-NEXT: store ptr @.offload_sizes, ptr [[TMP11]], align 8
-// CHECK-NEXT: [[TMP12:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 5
-// CHECK-NEXT: store ptr @.offload_maptypes, ptr [[TMP12]], align 8
-// CHECK-NEXT: [[TMP13:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 6
-// CHECK-NEXT: store ptr null, ptr [[TMP13]], align 8
-// CHECK-NEXT: [[TMP14:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 7
-// CHECK-NEXT: store ptr null, ptr [[TMP14]], align 8
-// CHECK-NEXT: [[TMP15:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 8
-// CHECK-NEXT: store i64 0, ptr [[TMP15]], align 8
-// CHECK-NEXT: [[TMP16:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 9
-// CHECK-NEXT: store i64 0, ptr [[TMP16]], align 8
-// CHECK-NEXT: [[TMP17:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 10
-// CHECK-NEXT: store [3 x i32] [i32 -1, i32 0, i32 0], ptr [[TMP17]], align 4
-// CHECK-NEXT: [[TMP18:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 11
-// CHECK-NEXT: store [3 x i32] zeroinitializer, ptr [[TMP18]], align 4
-// CHECK-NEXT: [[TMP19:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS]], i32 0, i32 12
-// CHECK-NEXT: store i32 0, ptr [[TMP19]], align 4
-// CHECK-NEXT: [[TMP20:%.*]] = call i32 @__tgt_target_kernel(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 -1, i32 0, ptr @.{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15.region_id, ptr [[KERNEL_ARGS]])
-// CHECK-NEXT: [[TMP21:%.*]] = icmp ne i32 [[TMP20]], 0
-// CHECK-NEXT: br i1 [[TMP21]], label [[OMP_OFFLOAD_FAILED:%.*]], label [[OMP_OFFLOAD_CONT:%.*]]
-// CHECK: omp_offload.failed:
-// CHECK-NEXT: call void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15(ptr [[TMP0]]) #[[ATTR3]]
-// CHECK-NEXT: br label [[OMP_OFFLOAD_CONT]]
-// CHECK: omp_offload.cont:
-// CHECK-NEXT: [[TMP22:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[TMP23:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP23]], i64 2
-// CHECK-NEXT: [[TMP24:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS2]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP24]], align 8
-// CHECK-NEXT: [[TMP25:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS3]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX1]], ptr [[TMP25]], align 8
-// CHECK-NEXT: [[TMP26:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS4]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP26]], align 8
-// CHECK-NEXT: [[TMP27:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS2]], i32 0, i32 0
-// CHECK-NEXT: [[TMP28:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS3]], i32 0, i32 0
-// CHECK-NEXT: [[TMP29:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 0
-// CHECK-NEXT: store i32 3, ptr [[TMP29]], align 4
-// CHECK-NEXT: [[TMP30:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 1
-// CHECK-NEXT: store i32 1, ptr [[TMP30]], align 4
-// CHECK-NEXT: [[TMP31:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 2
-// CHECK-NEXT: store ptr [[TMP27]], ptr [[TMP31]], align 8
-// CHECK-NEXT: [[TMP32:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 3
-// CHECK-NEXT: store ptr [[TMP28]], ptr [[TMP32]], align 8
-// CHECK-NEXT: [[TMP33:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 4
-// CHECK-NEXT: store ptr @.offload_sizes.1, ptr [[TMP33]], align 8
-// CHECK-NEXT: [[TMP34:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 5
-// CHECK-NEXT: store ptr @.offload_maptypes.2, ptr [[TMP34]], align 8
-// CHECK-NEXT: [[TMP35:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 6
-// CHECK-NEXT: store ptr null, ptr [[TMP35]], align 8
-// CHECK-NEXT: [[TMP36:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 7
-// CHECK-NEXT: store ptr null, ptr [[TMP36]], align 8
-// CHECK-NEXT: [[TMP37:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 8
-// CHECK-NEXT: store i64 0, ptr [[TMP37]], align 8
-// CHECK-NEXT: [[TMP38:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 9
-// CHECK-NEXT: store i64 0, ptr [[TMP38]], align 8
-// CHECK-NEXT: [[TMP39:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 10
-// CHECK-NEXT: store [3 x i32] [i32 -1, i32 0, i32 0], ptr [[TMP39]], align 4
-// CHECK-NEXT: [[TMP40:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 11
-// CHECK-NEXT: store [3 x i32] zeroinitializer, ptr [[TMP40]], align 4
-// CHECK-NEXT: [[TMP41:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS]], ptr [[KERNEL_ARGS5]], i32 0, i32 12
-// CHECK-NEXT: store i32 0, ptr [[TMP41]], align 4
-// CHECK-NEXT: [[TMP42:%.*]] = call i32 @__tgt_target_kernel(ptr @[[GLOB1]], i64 -1, i32 -1, i32 0, ptr @.{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19.region_id, ptr [[KERNEL_ARGS5]])
-// CHECK-NEXT: [[TMP43:%.*]] = icmp ne i32 [[TMP42]], 0
-// CHECK-NEXT: br i1 [[TMP43]], label [[OMP_OFFLOAD_FAILED6:%.*]], label [[OMP_OFFLOAD_CONT7:%.*]]
-// CHECK: omp_offload.failed6:
-// CHECK-NEXT: call void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19(ptr [[TMP22]]) #[[ATTR3]]
-// CHECK-NEXT: br label [[OMP_OFFLOAD_CONT7]]
-// CHECK: omp_offload.cont7:
-// CHECK-NEXT: [[TMP44:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX8:%.*]] = getelementptr inbounds i32, ptr [[TMP44]], i64 2
-// CHECK-NEXT: [[TMP45:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[PTR]], ptr [[TMP45]], align 8
-// CHECK-NEXT: [[TMP46:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: store ptr [[ARRAYIDX8]], ptr [[TMP46]], align 8
-// CHECK-NEXT: [[TMP47:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS11]], i64 0, i64 0
-// CHECK-NEXT: store ptr null, ptr [[TMP47]], align 8
-// CHECK-NEXT: [[TMP48:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: [[TMP49:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP48]], ptr [[TMP49]], ptr @.offload_sizes.3, ptr @.offload_maptypes.4, ptr null, ptr null)
-// CHECK-NEXT: [[TMP50:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK-NEXT: [[ARRAYIDX12:%.*]] = getelementptr inbounds i32, ptr [[TMP50]], i64 2
-// CHECK-NEXT: store i32 9, ptr [[ARRAYIDX12]], align 4
-// CHECK-NEXT: [[TMP51:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS9]], i32 0, i32 0
-// CHECK-NEXT: [[TMP52:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS10]], i32 0, i32 0
-// CHECK-NEXT: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP51]], ptr [[TMP52]], ptr @.offload_sizes.3, ptr @.offload_maptypes.4, ptr null, ptr null)
-// CHECK-NEXT: ret void
-//
-//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l15
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR2:[0-9]+]] {
-// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
-// CHECK-NEXT: store i32 6, ptr [[ARRAYIDX]], align 4
-// CHECK-NEXT: ret void
-//
-//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z3foov_l19
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR2]] {
-// CHECK-NEXT: entry:
-// CHECK-NEXT: [[PTR_ADDR:%.*]] = alloca ptr, align 8
-// CHECK-NEXT: store ptr [[PTR]], ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
-// CHECK-NEXT: store i32 8, ptr [[ARRAYIDX]], align 4
-// CHECK-NEXT: ret void
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR:%.*]], ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l13
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
+// CHECK: store i32 5, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f2v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP2]], i64 2
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l20
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f3v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l27
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 7, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f4v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l34
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f5v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: [[TMP6:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
+// CHECK: store i32 9, ptr [[ARRAYIDX1]], align 4
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: [[TMP6:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
+// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: ret void
//
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
new file mode 100644
index 0000000000000..8f0f27e6f8e94
--- /dev/null
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
@@ -0,0 +1,212 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --check-globals --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*"
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+int *ptr;
+
+void f1() {
+ // &ptr, &ptr, sizeof(ptr), TO | PARAM
+ #pragma omp target map(ptr)
+ ptr[1] = 5;
+}
+
+void f2() {
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target map(ptr[2])
+ ptr[1] = 6;
+}
+
+void f3() {
+ // &ptr, &ptr[0], sizeof(ptr[0:2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target map(ptr, ptr[0:2])
+ ptr[1] = 7;
+}
+
+void f4() {
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target map(ptr, ptr[2])
+ ptr[2] = 8;
+}
+
+void f5() {
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target data map(ptr[2], ptr)
+ ptr[2] = 9;
+}
+
+void f6() {
+ // &ptr, &ptr[0], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target data map(ptr, ptr[2])
+ ptr[2] = 10;
+}
+#endif
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+//.
+// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
+// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l14
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
+// CHECK: store i32 5, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f2v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l20
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f3v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l26
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 7, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f4v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l32
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f5v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: [[TMP6:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
+// CHECK: store i32 9, ptr [[ARRAYIDX1]], align 4
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: [[TMP6:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
+// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: ret void
+//
diff --git a/clang/test/OpenMP/target_map_ptr_and_star_global.cpp b/clang/test/OpenMP/target_map_ptr_and_star_global.cpp
new file mode 100644
index 0000000000000..84899cb8e4fad
--- /dev/null
+++ b/clang/test/OpenMP/target_map_ptr_and_star_global.cpp
@@ -0,0 +1,161 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --check-globals --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*"
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+int *ptr;
+void f1() {
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ #pragma omp target map(ptr)
+ ptr[1] = 6;
+}
+
+void f2() {
+ // &ptr, &ptr[0], sizeof(ptr[0]), TO | FROM | PARAM | PTR_AND_OBJ
+ #pragma omp target map(*ptr)
+ ptr[1] = 6;
+}
+
+void f3() {
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[0], sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ
+ #pragma omp target map(ptr, *ptr)
+ ptr[1] = 6;
+}
+
+void f4() {
+ // &ptr, &ptr[0], sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ | PARAM
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ #pragma omp target map(*ptr, ptr)
+ ptr[2] = 8;
+}
+
+#endif
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 4, i64 8]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x33]], i64 [[#0x3]]]
+//.
+// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
+// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l13
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f2v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l19
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f3v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l26
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f4v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l33
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
diff --git a/clang/test/OpenMP/target_map_ptr_and_star_local.cpp b/clang/test/OpenMP/target_map_ptr_and_star_local.cpp
new file mode 100644
index 0000000000000..246c0c5f99a68
--- /dev/null
+++ b/clang/test/OpenMP/target_map_ptr_and_star_local.cpp
@@ -0,0 +1,167 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --check-globals --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*"
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+void f1() {
+ int *ptr;
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ #pragma omp target map(ptr)
+ ptr[1] = 6;
+}
+
+void f2() {
+ int *ptr;
+ // &ptr[0], &ptr[0], sizeof(ptr[0]), TO | FROM | PARAM
+ #pragma omp target map(*ptr)
+ ptr[1] = 6;
+}
+
+void f3() {
+ int *ptr;
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr[0], &ptr[0], sizeof(ptr[0]), TO | FROM
+ #pragma omp target map(ptr, *ptr)
+ ptr[1] = 6;
+}
+
+void f4() {
+ int *ptr;
+ // &ptr[0], &ptr[0], sizeof(ptr[0]), TO | FROM
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ #pragma omp target map(*ptr, ptr)
+ ptr[2] = 8;
+}
+
+#endif
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x3]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 4, i64 8]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x3]]]
+//.
+// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
+// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR:%.*]], ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l13
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f2v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP2]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l20
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f3v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP2]], ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l28
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f4v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP2]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[PTR]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[PTR]], ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l36
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
diff --git a/clang/test/OpenMP/target_map_structptr_and_member_global.cpp b/clang/test/OpenMP/target_map_structptr_and_member_global.cpp
new file mode 100644
index 0000000000000..523f88dc8dba3
--- /dev/null
+++ b/clang/test/OpenMP/target_map_structptr_and_member_global.cpp
@@ -0,0 +1,275 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals all --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*" --version 5
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+struct S {
+ short x;
+ int y;
+ int *p;
+};
+
+S s, *ps;
+
+void f1() {
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ #pragma omp target map(to: ps)
+ ps->y = 5;
+}
+
+void f2() {
+ // &ps[0], &ps->y, sizeof(ps->y), TO | PARAM
+ #pragma omp target map(to: ps->y)
+ ps->y = 6;
+}
+
+void f3() {
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps, ps->y)
+ ps->y = 7;
+}
+
+void f4() {
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps->y, ps)
+ ps->y = 8;
+}
+
+void f5() {
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps->y, ps, ps->x)
+ ps->y = 9;
+}
+
+#endif
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [3 x i64] [i64 0, i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [3 x i64] [i64 0, i64 4, i64 8]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 0, i64 4, i64 8, i64 2]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+//.
+// CHECK-LABEL: define dso_local void @_Z2f1v(
+// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l20(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13:![0-9]+]], !align [[META14:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: store i32 5, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f2v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[Y]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l26(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 6, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f3v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
+// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.3, i64 24, i1 false)
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ps, ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr @ps, ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[TMP1]], ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[Y]], ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l34(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 7, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f4v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
+// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.5, i64 24, i1 false)
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr @ps, ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr @ps, ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l42(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 8, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f5v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[TMP4:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP4]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[TMP5]] to i64
+// CHECK: [[TMP7:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP8:%.*]] = sub i64 [[TMP6]], [[TMP7]]
+// CHECK: [[TMP9:%.*]] = sdiv exact i64 [[TMP8]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.7, i64 32, i1 false)
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP9]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr @ps, ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr @ps, ptr [[TMP18]], align 8
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP19]], align 8
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
+// CHECK: store ptr [[TMP3]], ptr [[TMP20]], align 8
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
+// CHECK: store ptr [[X]], ptr [[TMP21]], align 8
+// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
+// CHECK: store ptr null, ptr [[TMP22]], align 8
+// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP25:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP26:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l51(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 9, ptr [[Y]], align 4
+// CHECK: ret void
+//
diff --git a/clang/test/OpenMP/target_map_structptr_and_member_local.cpp b/clang/test/OpenMP/target_map_structptr_and_member_local.cpp
new file mode 100644
index 0000000000000..b366f331941b7
--- /dev/null
+++ b/clang/test/OpenMP/target_map_structptr_and_member_local.cpp
@@ -0,0 +1,278 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals all --filter-out-after "getelem.*kernel" --filter-out "= alloca.*" --include-generated-funcs --replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex "\.offload_.*" --global-hex-value-regex ".offload_maptypes.*" --version 5
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=powerpc64le-ibm-linux-gnu -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
+
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+struct S {
+ short x;
+ int y;
+ int *p;
+};
+
+void f1() {
+ S s, *ps;
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ #pragma omp target map(to: ps)
+ ps->y = 5;
+}
+
+void f2() {
+ S s, *ps;
+ // &ps[0], &ps->y, sizeof(ps->y), TO | PARAM
+ #pragma omp target map(to: ps->y)
+ ps->y = 6;
+}
+
+void f3() {
+ S s, *ps;
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps, ps->y)
+ ps->y = 7;
+}
+
+void f4() {
+ S s, *ps;
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps->y, ps)
+ ps->y = 8;
+}
+
+void f5() {
+ S s, *ps;
+ // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(1)
+ #pragma omp target map(to: ps->y, ps, ps->x)
+ ps->y = 9;
+}
+
+#endif
+//.
+// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
+// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
+// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [3 x i64] [i64 0, i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [3 x i64] [i64 0, i64 4, i64 8]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 0, i64 4, i64 8, i64 2]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+//.
+// CHECK-LABEL: define dso_local void @_Z2f1v(
+// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS:%.*]], ptr [[TMP0]], align 8
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f1v_l19(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1:[0-9]+]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13:![0-9]+]], !align [[META14:![0-9]+]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: store i32 5, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f2v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[Y]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f2v_l26(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 6, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f3v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
+// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.3, i64 24, i1 false)
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[PS]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[PS]], ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[TMP1]], ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[Y]], ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l35(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 7, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f4v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
+// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.5, i64 24, i1 false)
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[PS]], ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[PS]], ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l44(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 8, ptr [[Y]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define dso_local void @_Z2f5v(
+// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
+// CHECK: [[TMP3:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[TMP4:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP4]], i32 0, i32 0
+// CHECK: [[TMP5:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
+// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[TMP5]] to i64
+// CHECK: [[TMP7:%.*]] = ptrtoint ptr [[TMP1]] to i64
+// CHECK: [[TMP8:%.*]] = sub i64 [[TMP6]], [[TMP7]]
+// CHECK: [[TMP9:%.*]] = sdiv exact i64 [[TMP8]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.7, i64 32, i1 false)
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[TMP1]], ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: store i64 [[TMP9]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[PS]], ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[PS]], ptr [[TMP18]], align 8
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP19]], align 8
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
+// CHECK: store ptr [[TMP3]], ptr [[TMP20]], align 8
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
+// CHECK: store ptr [[X]], ptr [[TMP21]], align 8
+// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
+// CHECK: store ptr null, ptr [[TMP22]], align 8
+// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP25:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP26:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l54(
+// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[ENTRY:.*:]]
+// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: store i32 9, ptr [[Y]], align 4
+// CHECK: ret void
+//
diff --git a/offload/test/mapping/map_ptr_and_star_global.c b/offload/test/mapping/map_ptr_and_star_global.c
new file mode 100644
index 0000000000000..c09dc7fff6c17
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_star_global.c
@@ -0,0 +1,83 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#include <omp.h>
+#include <stdio.h>
+
+int x[10];
+int *p;
+
+void f1() {
+ 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) 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, 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]);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 1 0
+ p++;
+ }
+
+#pragma omp target map(to : p, *p) \
+ 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]);
+ // EXPECTED: 222 1 1 0
+ // CHECK: {{[0-9]+}} 0 0 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]);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 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(); }
diff --git a/offload/test/mapping/map_ptr_and_star_local.c b/offload/test/mapping/map_ptr_and_star_local.c
new file mode 100644
index 0000000000000..57a9359b6b857
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_star_local.c
@@ -0,0 +1,83 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#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) 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, 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]);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 1 0
+ p++;
+ }
+
+#pragma omp target map(to : p, *p) \
+ 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]);
+ // EXPECTED: 222 1 1 0
+ // CHECK: {{[0-9]+}} 0 0 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]);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 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(); }
diff --git a/offload/test/mapping/map_ptr_and_subscript_global.c b/offload/test/mapping/map_ptr_and_subscript_global.c
new file mode 100644
index 0000000000000..a3a10b6c9b212
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_subscript_global.c
@@ -0,0 +1,83 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#include <omp.h>
+#include <stdio.h>
+
+int x[10];
+int *p;
+
+void f1() {
+ 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]);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 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]);
+ // EXPECTED: 222 1 1 0
+ // CHECK: 111 0 0 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]);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 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(); }
diff --git a/offload/test/mapping/map_ptr_and_subscript_local.c b/offload/test/mapping/map_ptr_and_subscript_local.c
new file mode 100644
index 0000000000000..bb44999541a7b
--- /dev/null
+++ b/offload/test/mapping/map_ptr_and_subscript_local.c
@@ -0,0 +1,83 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#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]);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 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]);
+ // EXPECTED: 222 1 1 0
+ // CHECK: 111 0 0 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]);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 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(); }
diff --git a/offload/test/mapping/map_structptr_and_member_global.c b/offload/test/mapping/map_structptr_and_member_global.c
new file mode 100644
index 0000000000000..10e72e070dbc5
--- /dev/null
+++ b/offload/test/mapping/map_structptr_and_member_global.c
@@ -0,0 +1,88 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#include <omp.h>
+#include <stdio.h>
+
+typedef struct {
+ short x;
+ int *p;
+ long y;
+} S;
+
+S s[10], *ps;
+
+void f1() {
+ ps = &s[0];
+ s[0].x = 111;
+ s[1].x = 222;
+ s[2].x = 333;
+ s[3].x = 444;
+
+#pragma omp target enter data map(to : s)
+#pragma omp target enter data map(to : ps, ps->x)
+
+ S **ps_mappedptr = (S **)omp_get_mapped_ptr(&ps, omp_get_default_device());
+ short *s0_mappedptr =
+ (short *)omp_get_mapped_ptr(&s[0].x, omp_get_default_device());
+ short *s0_hostaddr = &s[0].x;
+
+ printf("ps_mappedptr %s null\n", ps_mappedptr == (S **)NULL ? "==" : "!=");
+ printf("s0_mappedptr %s null\n", s0_mappedptr == (short *)NULL ? "==" : "!=");
+
+// CHECK: ps_mappedptr != null
+// CHECK: s0_mappedptr != null
+
+// ps 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(ps->x) map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
+ s0_hostaddr == &ps->x);
+ // CHECK: 111 0 1 0
+ ps++;
+ }
+
+// For the remaining constructs, ps is not firstprivate, so its address will
+// be the same as the mapped address, and changes to ps will be visible to any
+// subsequent regions.
+#pragma omp target map(to : ps->x, ps) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
+ s0_hostaddr == &ps->x);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 1 0
+ ps++;
+ }
+
+#pragma omp target map(to : ps, ps->x) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
+ s0_mappedptr == &ps[-1].x, s0_hostaddr == &ps[-1].x);
+ // EXPECTED: 222 1 1 0
+ // CHECK: 111 0 0 0
+ ps++;
+ }
+
+#pragma omp target map(present, alloc : ps) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
+ s0_mappedptr == &ps[-2].x, s0_hostaddr == &ps[-2].x);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 0
+ }
+
+ // The following map(from:ps) should not bring back ps, because ps is an
+ // attached pointer. So, it should still point to the same original
+ // location, &s[0], on host.
+#pragma omp target exit data map(always, from : ps)
+ printf("%d %d\n", ps->x, ps == &s[0]);
+ // CHECK: 111 1
+
+#pragma omp target exit data map(delete : ps, s)
+}
+
+int main() { f1(); }
diff --git a/offload/test/mapping/map_structptr_and_member_local.c b/offload/test/mapping/map_structptr_and_member_local.c
new file mode 100644
index 0000000000000..9e59551ad3d6c
--- /dev/null
+++ b/offload/test/mapping/map_structptr_and_member_local.c
@@ -0,0 +1,87 @@
+// RUN: %libomptarget-compilexx-run-and-check-generic
+
+#include <omp.h>
+#include <stdio.h>
+
+typedef struct {
+ short x;
+ int *p;
+ long y;
+} S;
+
+void f1() {
+ S s[10], *ps;
+ ps = &s[0];
+ s[0].x = 111;
+ s[1].x = 222;
+ s[2].x = 333;
+ s[3].x = 444;
+
+#pragma omp target enter data map(to : s)
+#pragma omp target enter data map(to : ps, ps->x)
+
+ S **ps_mappedptr = (S **)omp_get_mapped_ptr(&ps, omp_get_default_device());
+ short *s0_mappedptr =
+ (short *)omp_get_mapped_ptr(&s[0].x, omp_get_default_device());
+ short *s0_hostaddr = &s[0].x;
+
+ printf("ps_mappedptr %s null\n", ps_mappedptr == (S **)NULL ? "==" : "!=");
+ printf("s0_mappedptr %s null\n", s0_mappedptr == (short *)NULL ? "==" : "!=");
+
+// CHECK: ps_mappedptr != null
+// CHECK: s0_mappedptr != null
+
+// ps 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(ps->x) map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
+ s0_hostaddr == &ps->x);
+ // CHECK: 111 0 1 0
+ ps++;
+ }
+
+// For the remaining constructs, ps is not firstprivate, so its address will
+// be the same as the mapped address, and changes to ps will be visible to any
+// subsequent regions.
+#pragma omp target map(to : ps->x, ps) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
+ s0_hostaddr == &ps->x);
+ // EXPECTED: 111 1 1 0
+ // CHECK: 111 0 1 0
+ ps++;
+ }
+
+#pragma omp target map(to : ps, ps->x) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
+ s0_mappedptr == &ps[-1].x, s0_hostaddr == &ps[-1].x);
+ // EXPECTED: 222 1 1 0
+ // CHECK: 111 0 0 0
+ ps++;
+ }
+
+#pragma omp target map(present, alloc : ps) \
+ map(to : ps_mappedptr, s0_mappedptr, s0_hostaddr)
+ {
+ printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
+ s0_mappedptr == &ps[-2].x, s0_hostaddr == &ps[-2].x);
+ // EXPECTED: 333 1 1 0
+ // CHECK: 111 1 0 0
+ }
+
+ // The following map(from:ps) should not bring back ps, because ps is an
+ // attached pointer. So, it should still point to the same original
+ // location, &s[0], on host.
+#pragma omp target exit data map(always, from : ps)
+ printf("%d %d\n", ps->x, ps == &s[0]);
+ // CHECK: 111 1
+
+#pragma omp target exit data map(delete : ps, s)
+}
+
+int main() { f1(); }
>From 15e7d50aefdf8c5dd631ff2ac236c89038f74674 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Thu, 3 Jul 2025 10:50:31 -0700
Subject: [PATCH 10/12] Minor clang-format fix.
---
offload/test/mapping/map_ptr_and_star_global.c | 4 ++--
offload/test/mapping/map_ptr_and_star_local.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/offload/test/mapping/map_ptr_and_star_global.c b/offload/test/mapping/map_ptr_and_star_global.c
index c09dc7fff6c17..c3b0dd2f49e6b 100644
--- a/offload/test/mapping/map_ptr_and_star_global.c
+++ b/offload/test/mapping/map_ptr_and_star_global.c
@@ -41,7 +41,7 @@ void f1() {
// 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, p) \
+#pragma omp target map(to : *p, p) \
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
@@ -51,7 +51,7 @@ void f1() {
p++;
}
-#pragma omp target map(to : p, *p) \
+#pragma omp target map(to : p, *p) \
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
diff --git a/offload/test/mapping/map_ptr_and_star_local.c b/offload/test/mapping/map_ptr_and_star_local.c
index 57a9359b6b857..f0ca84d1cc4dd 100644
--- a/offload/test/mapping/map_ptr_and_star_local.c
+++ b/offload/test/mapping/map_ptr_and_star_local.c
@@ -41,7 +41,7 @@ void f1() {
// 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, p) \
+#pragma omp target map(to : *p, p) \
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
@@ -51,7 +51,7 @@ void f1() {
p++;
}
-#pragma omp target map(to : p, *p) \
+#pragma omp target map(to : p, *p) \
map(to : p_mappedptr, x0_mappedptr, x0_hostaddr)
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
>From b1540b3d28f5fc65d3fc8a79e031bdb3fbfe010f Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Mon, 7 Jul 2025 10:30:39 -0700
Subject: [PATCH 11/12] Minor NFC update to a test.
---
...arget_map_both_pointer_pointee_codegen.cpp | 63 ++++++++++++++----
...ap_both_pointer_pointee_codegen_global.cpp | 66 +++++++++++++++----
2 files changed, 103 insertions(+), 26 deletions(-)
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
index 262e343401d16..d5ca0e366d7bf 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
@@ -39,19 +39,27 @@ void f4() {
void f5() {
int *ptr;
- // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
- #pragma omp target data map(ptr[2], ptr)
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PTR_AND_OBJ
+ #pragma omp target map(ptr[2], ptr)
ptr[2] = 9;
}
void f6() {
int *ptr;
// &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
- // FIXME: PARAM seems to be redundant here.
+ // TODO: PARAM should not be needed here.
#pragma omp target data map(ptr, ptr[2])
ptr[2] = 10;
}
-#endif
+
+void f7() {
+ int *ptr;
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // TODO: PARAM should not be needed here.
+ #pragma omp target data map(ptr[2], ptr)
+ ptr[2] = 11;
+}
//.
// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
@@ -65,6 +73,8 @@ void f6() {
// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.11 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.12 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
//.
// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
@@ -84,7 +94,7 @@ void f6() {
// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13:![0-9]+]], !align [[META14:![0-9]+]]
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 5, ptr [[ARRAYIDX]], align 4
@@ -177,6 +187,33 @@ void f6() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l41
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 9, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
@@ -186,17 +223,17 @@ void f6() {
// CHECK: store ptr null, ptr [[TMP3]], align 8
// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
// CHECK: [[TMP6:%.*]] = load ptr, ptr [[PTR]], align 8
// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
-// CHECK: store i32 9, ptr [[ARRAYIDX1]], align 4
+// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
// CHECK: ret void
//
//
-// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-LABEL: define {{[^@]+}}@_Z2f7v
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
@@ -209,13 +246,13 @@ void f6() {
// CHECK: store ptr null, ptr [[TMP3]], align 8
// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.11, ptr @.offload_maptypes.12, ptr null, ptr null)
// CHECK: [[TMP6:%.*]] = load ptr, ptr [[PTR]], align 8
// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
-// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
+// CHECK: store i32 11, ptr [[ARRAYIDX1]], align 4
// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.11, ptr @.offload_maptypes.12, ptr null, ptr null)
// CHECK: ret void
//
-
+#endif
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
index 8f0f27e6f8e94..02c53202e22dc 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
@@ -22,28 +22,39 @@ void f2() {
}
void f3() {
- // &ptr, &ptr[0], sizeof(ptr[0:2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[0], 2 * sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ
#pragma omp target map(ptr, ptr[0:2])
ptr[1] = 7;
}
void f4() {
- // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PTR_AND_OBJ
#pragma omp target map(ptr, ptr[2])
ptr[2] = 8;
}
void f5() {
- // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
- #pragma omp target data map(ptr[2], ptr)
+ // &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PTR_AND_OBJ
+ #pragma omp target map(ptr[2], ptr)
ptr[2] = 9;
}
void f6() {
- // &ptr, &ptr[0], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // TODO: PARAM should not be needed here.
#pragma omp target data map(ptr, ptr[2])
ptr[2] = 10;
}
+
+void f7() {
+ // &ptr, &ptr[2], sizeof(ptr[2]), TO | FROM | PARAM | PTR_AND_OBJ
+ // TODO: PARAM should not be needed here.
+ #pragma omp target data map(ptr[2], ptr)
+ ptr[2] = 11;
+}
#endif
//.
// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
@@ -58,6 +69,8 @@ void f6() {
// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.11 = private unnamed_addr constant [1 x i64] [i64 4]
+// CHECK: @.offload_maptypes.12 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
//.
// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
@@ -77,7 +90,7 @@ void f6() {
// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1:[0-9]+]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11:![0-9]+]], !align [[META12:![0-9]+]]
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13:![0-9]+]], !align [[META14:![0-9]+]]
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 5, ptr [[ARRAYIDX]], align 4
@@ -169,6 +182,33 @@ void f6() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l38
+// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK: entry:
+// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: store i32 9, ptr [[ARRAYIDX]], align 4
+// CHECK: ret void
+//
+//
+// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-SAME: () #[[ATTR0]] {
+// CHECK: entry:
+// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
// CHECK: [[TMP1:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
@@ -178,17 +218,17 @@ void f6() {
// CHECK: store ptr null, ptr [[TMP3]], align 8
// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1:[0-9]+]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
// CHECK: [[TMP6:%.*]] = load ptr, ptr @ptr, align 8
// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
-// CHECK: store i32 9, ptr [[ARRAYIDX1]], align 4
+// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.7, ptr @.offload_maptypes.8, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
// CHECK: ret void
//
//
-// CHECK-LABEL: define {{[^@]+}}@_Z2f6v
+// CHECK-LABEL: define {{[^@]+}}@_Z2f7v
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
@@ -201,12 +241,12 @@ void f6() {
// CHECK: store ptr null, ptr [[TMP3]], align 8
// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_begin_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP4]], ptr [[TMP5]], ptr @.offload_sizes.11, ptr @.offload_maptypes.12, ptr null, ptr null)
// CHECK: [[TMP6:%.*]] = load ptr, ptr @ptr, align 8
// CHECK: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[TMP6]], i64 2
-// CHECK: store i32 10, ptr [[ARRAYIDX1]], align 4
+// CHECK: store i32 11, ptr [[ARRAYIDX1]], align 4
// CHECK: [[TMP7:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
// CHECK: [[TMP8:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.9, ptr @.offload_maptypes.10, ptr null, ptr null)
+// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.11, ptr @.offload_maptypes.12, ptr null, ptr null)
// CHECK: ret void
//
>From f1746b6b58af3e9609deb4c348de0838129d5523 Mon Sep 17 00:00:00 2001
From: Abhinav Gaba <abhinav.gaba at intel.com>
Date: Mon, 7 Jul 2025 14:56:07 -0700
Subject: [PATCH 12/12] Update tests with the current output.
---
...arget_map_both_pointer_pointee_codegen.cpp | 116 +++++----
...ap_both_pointer_pointee_codegen_global.cpp | 114 +++++----
.../OpenMP/target_map_ptr_and_star_global.cpp | 78 +++---
.../OpenMP/target_map_ptr_and_star_local.cpp | 76 +++---
...target_map_structptr_and_member_global.cpp | 240 ++++++++----------
.../target_map_structptr_and_member_local.cpp | 240 ++++++++----------
.../test/mapping/map_ptr_and_star_global.c | 9 +-
offload/test/mapping/map_ptr_and_star_local.c | 9 +-
.../mapping/map_ptr_and_subscript_global.c | 11 +-
.../mapping/map_ptr_and_subscript_local.c | 11 +-
.../mapping/map_structptr_and_member_global.c | 9 +-
.../mapping/map_structptr_and_member_local.c | 9 +-
12 files changed, 444 insertions(+), 478 deletions(-)
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
index d5ca0e366d7bf..8a167a19ddbc9 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen.cpp
@@ -60,17 +60,18 @@ void f7() {
#pragma omp target data map(ptr[2], ptr)
ptr[2] = 11;
}
+#endif
//.
// CHECK: @.offload_sizes = private unnamed_addr constant [1 x i64] [i64 8]
// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
-// CHECK: @.offload_sizes.3 = private unnamed_addr constant [1 x i64] [i64 8]
-// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [1 x i64] [i64 4]
-// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
-// CHECK: @.offload_sizes.7 = private unnamed_addr constant [1 x i64] [i64 4]
-// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 8]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
// CHECK: @.offload_sizes.11 = private unnamed_addr constant [1 x i64] [i64 4]
@@ -133,25 +134,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP0]], i64 0
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[PTR]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l27
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l28
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 7, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -160,25 +167,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[PTR]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l34
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l36
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -187,25 +200,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[PTR]], ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l41
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l44
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 9, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -255,4 +274,3 @@ void f7() {
// CHECK: call void @__tgt_target_data_end_mapper(ptr @[[GLOB1]], i64 -1, i32 1, ptr [[TMP7]], ptr [[TMP8]], ptr @.offload_sizes.11, ptr @.offload_maptypes.12, ptr null, ptr null)
// CHECK: ret void
//
-#endif
diff --git a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
index 02c53202e22dc..e39d602dca316 100644
--- a/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
+++ b/clang/test/OpenMP/target_map_both_pointer_pointee_codegen_global.cpp
@@ -61,12 +61,12 @@ void f7() {
// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
-// CHECK: @.offload_sizes.3 = private unnamed_addr constant [1 x i64] [i64 8]
-// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [1 x i64] [i64 4]
-// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
-// CHECK: @.offload_sizes.7 = private unnamed_addr constant [1 x i64] [i64 4]
-// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 8]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
// CHECK: @.offload_sizes.9 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.10 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
// CHECK: @.offload_sizes.11 = private unnamed_addr constant [1 x i64] [i64 4]
@@ -128,25 +128,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP1]], i64 0
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds nuw i32, ptr [[TMP0]], i64 0
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l26
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l27
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 7, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -155,25 +161,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l32
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l34
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -182,25 +194,31 @@ void f7() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [1 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[ARRAYIDX]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
-// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l38
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l41
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 9, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
diff --git a/clang/test/OpenMP/target_map_ptr_and_star_global.cpp b/clang/test/OpenMP/target_map_ptr_and_star_global.cpp
index 84899cb8e4fad..40d3cd24ac08f 100644
--- a/clang/test/OpenMP/target_map_ptr_and_star_global.cpp
+++ b/clang/test/OpenMP/target_map_ptr_and_star_global.cpp
@@ -28,8 +28,8 @@ void f3() {
}
void f4() {
- // &ptr, &ptr[0], sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ | PARAM
// &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr, &ptr[0], sizeof(ptr[0]), TO | FROM | PTR_AND_OBJ
#pragma omp target map(*ptr, ptr)
ptr[2] = 8;
}
@@ -42,8 +42,8 @@ void f4() {
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x33]]]
// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 4, i64 8]
-// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x33]], i64 [[#0x3]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x13]]]
//.
// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
// CHECK-SAME: () #[[ATTR0:[0-9]+]] {
@@ -100,30 +100,30 @@ void f4() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr @ptr, ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr @ptr, ptr [[TMP5]], align 8
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP1]], ptr [[TMP6]], align 8
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP7]], align 8
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l26
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11]], !align [[META12]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -132,30 +132,30 @@ void f4() {
// CHECK-SAME: () #[[ATTR0]] {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP1:%.*]] = load ptr, ptr @ptr, align 8
-// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[TMP1:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ptr, ptr [[TMP1]], align 8
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr @ptr, ptr [[TMP2]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr @ptr, ptr [[TMP5]], align 8
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr @ptr, ptr [[TMP6]], align 8
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP7]], align 8
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr @ptr, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l33
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11]], !align [[META12]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
diff --git a/clang/test/OpenMP/target_map_ptr_and_star_local.cpp b/clang/test/OpenMP/target_map_ptr_and_star_local.cpp
index 246c0c5f99a68..2eff1727e0e46 100644
--- a/clang/test/OpenMP/target_map_ptr_and_star_local.cpp
+++ b/clang/test/OpenMP/target_map_ptr_and_star_local.cpp
@@ -31,8 +31,8 @@ void f3() {
void f4() {
int *ptr;
- // &ptr[0], &ptr[0], sizeof(ptr[0]), TO | FROM
// &ptr, &ptr, sizeof(ptr), TO | FROM | PARAM
+ // &ptr[0], &ptr[0], sizeof(ptr[0]), TO | FROM
#pragma omp target map(*ptr, ptr)
ptr[2] = 8;
}
@@ -45,7 +45,7 @@ void f4() {
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x23]]]
// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x3]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 4, i64 8]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x23]], i64 [[#0x3]]]
//.
// CHECK-LABEL: define {{[^@]+}}@_Z2f1v
@@ -105,30 +105,30 @@ void f4() {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
// CHECK: store ptr [[PTR]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[PTR]], ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP5]], align 8
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
// CHECK: store ptr [[TMP1]], ptr [[TMP6]], align 8
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP2]], ptr [[TMP7]], align 8
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l28
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11]], !align [[META12]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 1
// CHECK: store i32 6, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
@@ -138,30 +138,30 @@ void f4() {
// CHECK: entry:
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR:%.*]], align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PTR]], align 8
-// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP3]], align 8
-// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP2]], ptr [[TMP4]], align 8
-// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP5]], align 8
-// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[PTR]], ptr [[TMP6]], align 8
-// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[PTR]], ptr [[TMP7]], align 8
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PTR]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP1]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
//
//
// CHECK-LABEL: define {{[^@]+}}@{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l36
-// CHECK-SAME: (ptr noundef [[PTR:%.*]]) #[[ATTR1]] {
+// CHECK-SAME: (ptr noundef nonnull align 8 dereferenceable(8) [[PTR:%.*]]) #[[ATTR1]] {
// CHECK: entry:
// CHECK: store ptr [[PTR]], ptr [[PTR_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8
-// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP0]], i64 2
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PTR_ADDR]], align 8, !nonnull [[META11]], !align [[META12]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[ARRAYIDX:%.*]] = getelementptr inbounds i32, ptr [[TMP1]], i64 2
// CHECK: store i32 8, ptr [[ARRAYIDX]], align 4
// CHECK: ret void
//
diff --git a/clang/test/OpenMP/target_map_structptr_and_member_global.cpp b/clang/test/OpenMP/target_map_structptr_and_member_global.cpp
index 523f88dc8dba3..dc2df3849f299 100644
--- a/clang/test/OpenMP/target_map_structptr_and_member_global.cpp
+++ b/clang/test/OpenMP/target_map_structptr_and_member_global.cpp
@@ -28,26 +28,24 @@ void f2() {
}
void f3() {
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps->y, sizeof(ps->y), TO
#pragma omp target map(to: ps, ps->y)
ps->y = 7;
}
void f4() {
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps->y, sizeof(ps->y), TO
#pragma omp target map(to: ps->y, ps)
ps->y = 8;
}
void f5() {
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
- // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps[0].x, ((&ps[0].y + 1) - &ps[0].x)/8, ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(2)
+ // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(2)
#pragma omp target map(to: ps->y, ps, ps->x)
ps->y = 9;
}
@@ -58,12 +56,12 @@ void f5() {
// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
-// CHECK: @.offload_sizes.3 = private unnamed_addr constant [3 x i64] [i64 0, i64 8, i64 4]
-// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [3 x i64] [i64 0, i64 4, i64 8]
-// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
-// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 0, i64 4, i64 8, i64 2]
-// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x21]], i64 [[#0x1]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x21]], i64 [[#0x1]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 8, i64 0, i64 4, i64 2]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x21]], i64 [[#0x0]], i64 [[#0x2000000000001]], i64 [[#0x2000000000001]]]
//.
// CHECK-LABEL: define dso_local void @_Z2f1v(
// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
@@ -123,46 +121,31 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
-// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
-// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
-// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
-// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.3, i64 24, i1 false)
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr @ps, ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr @ps, ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr [[TMP1]], ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr [[Y]], ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l34(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l33(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 7, ptr [[Y]], align 4
// CHECK: ret void
//
@@ -172,46 +155,31 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
-// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
-// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
-// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
-// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.5, i64 24, i1 false)
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP1]], ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[Y]], ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr @ps, ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr @ps, ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l42(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l40(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 8, ptr [[Y]], align 4
// CHECK: ret void
//
@@ -221,55 +189,55 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr @ps, align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr @ps, align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: [[TMP2:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
// CHECK: [[TMP3:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[TMP4:%.*]] = load ptr, ptr @ps, align 8
-// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP4]], i32 0, i32 0
-// CHECK: [[TMP5:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[TMP5]] to i64
-// CHECK: [[TMP7:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP8:%.*]] = sub i64 [[TMP6]], [[TMP7]]
-// CHECK: [[TMP9:%.*]] = sdiv exact i64 [[TMP8]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP3]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr i32, ptr [[Y]], i32 1
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP4]] to i64
+// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[X]] to i64
+// CHECK: [[TMP7:%.*]] = sub i64 [[TMP5]], [[TMP6]]
+// CHECK: [[TMP8:%.*]] = sdiv exact i64 [[TMP7]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.7, i64 32, i1 false)
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP9]], ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP1]], ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[Y]], ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr @ps, ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr @ps, ptr [[TMP18]], align 8
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP19]], align 8
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
-// CHECK: store ptr [[TMP3]], ptr [[TMP20]], align 8
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
-// CHECK: store ptr [[X]], ptr [[TMP21]], align 8
-// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
-// CHECK: store ptr null, ptr [[TMP22]], align 8
-// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP25:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP26:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l51(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr @ps, ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[X]], ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 1
+// CHECK: store i64 [[TMP8]], ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[TMP0]], ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[Y]], ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP18]], align 8
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
+// CHECK: store ptr [[TMP2]], ptr [[TMP19]], align 8
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
+// CHECK: store ptr [[X]], ptr [[TMP20]], align 8
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
+// CHECK: store ptr null, ptr [[TMP21]], align 8
+// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP25:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l49(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 9, ptr [[Y]], align 4
// CHECK: ret void
//
diff --git a/clang/test/OpenMP/target_map_structptr_and_member_local.cpp b/clang/test/OpenMP/target_map_structptr_and_member_local.cpp
index b366f331941b7..44a982680bb8b 100644
--- a/clang/test/OpenMP/target_map_structptr_and_member_local.cpp
+++ b/clang/test/OpenMP/target_map_structptr_and_member_local.cpp
@@ -29,28 +29,26 @@ void f2() {
void f3() {
S s, *ps;
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps->y, sizeof(ps->y), TO
#pragma omp target map(to: ps, ps->y)
ps->y = 7;
}
void f4() {
S s, *ps;
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps->y, sizeof(ps->y), TO
#pragma omp target map(to: ps->y, ps)
ps->y = 8;
}
void f5() {
S s, *ps;
- // &ps[0], &ps[0], sizeof(ps[0]), PARAM | ALLOC
- // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(1)
- // &ps, &ps, sizeof(ps), TO | MEMBER_OF(1)
- // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(1)
+ // &ps, &ps, sizeof(ps), TO | PARAM
+ // &ps[0], &ps[0].x, ((&ps[0].y + 1) - &ps[0].x)/8, ALLOC
+ // &ps[0], &ps->y, sizeof(ps->y), TO | MEMBER_OF(2)
+ // &ps[0], &ps->x, sizeof(ps->x), TO | MEMBER_OF(2)
#pragma omp target map(to: ps->y, ps, ps->x)
ps->y = 9;
}
@@ -61,12 +59,12 @@ void f5() {
// CHECK: @.offload_maptypes = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
// CHECK: @.offload_sizes.1 = private unnamed_addr constant [1 x i64] [i64 4]
// CHECK: @.offload_maptypes.2 = private unnamed_addr constant [1 x i64] [i64 [[#0x21]]]
-// CHECK: @.offload_sizes.3 = private unnamed_addr constant [3 x i64] [i64 0, i64 8, i64 4]
-// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
-// CHECK: @.offload_sizes.5 = private unnamed_addr constant [3 x i64] [i64 0, i64 4, i64 8]
-// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [3 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
-// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 0, i64 4, i64 8, i64 2]
-// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x20]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]], i64 [[#0x1000000000001]]]
+// CHECK: @.offload_sizes.3 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.4 = private unnamed_addr constant [2 x i64] [i64 [[#0x21]], i64 [[#0x1]]]
+// CHECK: @.offload_sizes.5 = private unnamed_addr constant [2 x i64] [i64 8, i64 4]
+// CHECK: @.offload_maptypes.6 = private unnamed_addr constant [2 x i64] [i64 [[#0x21]], i64 [[#0x1]]]
+// CHECK: @.offload_sizes.7 = private unnamed_addr constant [4 x i64] [i64 8, i64 0, i64 4, i64 2]
+// CHECK: @.offload_maptypes.8 = private unnamed_addr constant [4 x i64] [i64 [[#0x21]], i64 [[#0x0]], i64 [[#0x2000000000001]], i64 [[#0x2000000000001]]]
//.
// CHECK-LABEL: define dso_local void @_Z2f1v(
// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
@@ -126,46 +124,31 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
-// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
-// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
-// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
-// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.3, i64 24, i1 false)
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[PS]], ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[PS]], ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr [[TMP1]], ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr [[Y]], ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l35(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f3v_l34(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 7, ptr [[Y]], align 4
// CHECK: ret void
//
@@ -175,46 +158,31 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
-// CHECK: [[TMP3:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
-// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP6:%.*]] = sub i64 [[TMP4]], [[TMP5]]
-// CHECK: [[TMP7:%.*]] = sdiv exact i64 [[TMP6]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
-// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.5, i64 24, i1 false)
-// CHECK: [[TMP8:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP8]], align 8
-// CHECK: [[TMP9:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP9]], align 8
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP7]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP1]], ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[Y]], ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr [[PS]], ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr [[PS]], ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [3 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [3 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l44(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
+// CHECK: [[TMP2:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP2]], align 8
+// CHECK: [[TMP3:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP3]], align 8
+// CHECK: [[TMP4:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP4]], align 8
+// CHECK: [[TMP5:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP5]], align 8
+// CHECK: [[TMP6:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[Y]], ptr [[TMP6]], align 8
+// CHECK: [[TMP7:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP7]], align 8
+// CHECK: [[TMP8:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [2 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f4v_l42(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 8, ptr [[Y]], align 4
// CHECK: ret void
//
@@ -224,55 +192,55 @@ void f5() {
// CHECK: [[ENTRY:.*:]]
// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS:%.*]], align 8
// CHECK: [[TMP1:%.*]] = load ptr, ptr [[PS]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: [[TMP2:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP2]], i32 0, i32 1
// CHECK: [[TMP3:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[TMP4:%.*]] = load ptr, ptr [[PS]], align 8
-// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP4]], i32 0, i32 0
-// CHECK: [[TMP5:%.*]] = getelementptr [[STRUCT_S]], ptr [[TMP1]], i32 1
-// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[TMP5]] to i64
-// CHECK: [[TMP7:%.*]] = ptrtoint ptr [[TMP1]] to i64
-// CHECK: [[TMP8:%.*]] = sub i64 [[TMP6]], [[TMP7]]
-// CHECK: [[TMP9:%.*]] = sdiv exact i64 [[TMP8]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
+// CHECK: [[X:%.*]] = getelementptr inbounds nuw [[STRUCT_S]], ptr [[TMP3]], i32 0, i32 0
+// CHECK: [[TMP4:%.*]] = getelementptr i32, ptr [[Y]], i32 1
+// CHECK: [[TMP5:%.*]] = ptrtoint ptr [[TMP4]] to i64
+// CHECK: [[TMP6:%.*]] = ptrtoint ptr [[X]] to i64
+// CHECK: [[TMP7:%.*]] = sub i64 [[TMP5]], [[TMP6]]
+// CHECK: [[TMP8:%.*]] = sdiv exact i64 [[TMP7]], ptrtoint (ptr getelementptr (i8, ptr null, i32 1) to i64)
// CHECK: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DOTOFFLOAD_SIZES:%.*]], ptr align 8 @.offload_sizes.7, i64 32, i1 false)
-// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP10]], align 8
-// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
-// CHECK: store ptr [[TMP1]], ptr [[TMP11]], align 8
-// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: store i64 [[TMP9]], ptr [[TMP12]], align 8
-// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
-// CHECK: store ptr null, ptr [[TMP13]], align 8
-// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
-// CHECK: store ptr [[TMP1]], ptr [[TMP14]], align 8
-// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
-// CHECK: store ptr [[Y]], ptr [[TMP15]], align 8
-// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
-// CHECK: store ptr null, ptr [[TMP16]], align 8
-// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
-// CHECK: store ptr [[PS]], ptr [[TMP17]], align 8
-// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
-// CHECK: store ptr [[PS]], ptr [[TMP18]], align 8
-// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
-// CHECK: store ptr null, ptr [[TMP19]], align 8
-// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
-// CHECK: store ptr [[TMP3]], ptr [[TMP20]], align 8
-// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
-// CHECK: store ptr [[X]], ptr [[TMP21]], align 8
-// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
-// CHECK: store ptr null, ptr [[TMP22]], align 8
-// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
-// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
-// CHECK: [[TMP25:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
-// CHECK: [[TMP26:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
-//
-//
-// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l54(
-// CHECK-SAME: ptr noundef [[PS:%.*]]) #[[ATTR1]] {
+// CHECK: [[TMP9:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP9]], align 8
+// CHECK: [[TMP10:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS:%.*]], i32 0, i32 0
+// CHECK: store ptr [[PS]], ptr [[TMP10]], align 8
+// CHECK: [[TMP11:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS:%.*]], i64 0, i64 0
+// CHECK: store ptr null, ptr [[TMP11]], align 8
+// CHECK: [[TMP12:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 1
+// CHECK: store ptr [[TMP0]], ptr [[TMP12]], align 8
+// CHECK: [[TMP13:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 1
+// CHECK: store ptr [[X]], ptr [[TMP13]], align 8
+// CHECK: [[TMP14:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 1
+// CHECK: store i64 [[TMP8]], ptr [[TMP14]], align 8
+// CHECK: [[TMP15:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 1
+// CHECK: store ptr null, ptr [[TMP15]], align 8
+// CHECK: [[TMP16:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 2
+// CHECK: store ptr [[TMP0]], ptr [[TMP16]], align 8
+// CHECK: [[TMP17:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 2
+// CHECK: store ptr [[Y]], ptr [[TMP17]], align 8
+// CHECK: [[TMP18:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 2
+// CHECK: store ptr null, ptr [[TMP18]], align 8
+// CHECK: [[TMP19:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 3
+// CHECK: store ptr [[TMP2]], ptr [[TMP19]], align 8
+// CHECK: [[TMP20:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 3
+// CHECK: store ptr [[X]], ptr [[TMP20]], align 8
+// CHECK: [[TMP21:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_MAPPERS]], i64 0, i64 3
+// CHECK: store ptr null, ptr [[TMP21]], align 8
+// CHECK: [[TMP22:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_BASEPTRS]], i32 0, i32 0
+// CHECK: [[TMP23:%.*]] = getelementptr inbounds [4 x ptr], ptr [[DOTOFFLOAD_PTRS]], i32 0, i32 0
+// CHECK: [[TMP24:%.*]] = getelementptr inbounds [4 x i64], ptr [[DOTOFFLOAD_SIZES]], i32 0, i32 0
+// CHECK: [[TMP25:%.*]] = getelementptr inbounds nuw [[STRUCT___TGT_KERNEL_ARGUMENTS:%.*]], ptr [[KERNEL_ARGS:%.*]], i32 0, i32 0
+//
+//
+// CHECK-LABEL: define internal void @{{__omp_offloading_[0-9a-z]+_[0-9a-z]+}}__Z2f5v_l52(
+// CHECK-SAME: ptr noundef nonnull align 8 dereferenceable(8) [[PS:%.*]]) #[[ATTR1]] {
// CHECK: [[ENTRY:.*:]]
// CHECK: store ptr [[PS]], ptr [[PS_ADDR:%.*]], align 8
-// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8
-// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP0]], i32 0, i32 1
+// CHECK: [[TMP0:%.*]] = load ptr, ptr [[PS_ADDR]], align 8, !nonnull [[META13]], !align [[META14]]
+// CHECK: [[TMP1:%.*]] = load ptr, ptr [[TMP0]], align 8
+// CHECK: [[Y:%.*]] = getelementptr inbounds nuw [[STRUCT_S:%.*]], ptr [[TMP1]], i32 0, i32 1
// CHECK: store i32 9, ptr [[Y]], align 4
// CHECK: ret void
//
diff --git a/offload/test/mapping/map_ptr_and_star_global.c b/offload/test/mapping/map_ptr_and_star_global.c
index c3b0dd2f49e6b..255e2dee6512e 100644
--- a/offload/test/mapping/map_ptr_and_star_global.c
+++ b/offload/test/mapping/map_ptr_and_star_global.c
@@ -46,8 +46,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
x0_hostaddr == &p[0]);
- // EXPECTED: 111 1 1 0
- // CHECK: 111 0 1 0
+ // CHECK: 111 1 1 0
p++;
}
@@ -56,8 +55,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
x0_hostaddr == &p[-1]);
- // EXPECTED: 222 1 1 0
- // CHECK: {{[0-9]+}} 0 0 0
+ // CHECK: 222 1 1 0
p++;
}
@@ -66,8 +64,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-2],
x0_hostaddr == &p[-2]);
- // EXPECTED: 333 1 1 0
- // CHECK: 111 1 0 0
+ // CHECK: 333 1 1 0
}
// The following map(from:p) should not bring back p, because p is an
diff --git a/offload/test/mapping/map_ptr_and_star_local.c b/offload/test/mapping/map_ptr_and_star_local.c
index f0ca84d1cc4dd..0d2d689ec9912 100644
--- a/offload/test/mapping/map_ptr_and_star_local.c
+++ b/offload/test/mapping/map_ptr_and_star_local.c
@@ -47,7 +47,7 @@ void f1() {
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
x0_hostaddr == &p[0]);
// EXPECTED: 111 1 1 0
- // CHECK: 111 0 1 0
+ // CHECK: 111 1 0 1
p++;
}
@@ -57,7 +57,7 @@ void f1() {
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
x0_hostaddr == &p[-1]);
// EXPECTED: 222 1 1 0
- // CHECK: {{[0-9]+}} 0 0 0
+ // CHECK: 222 1 0 1
p++;
}
@@ -67,7 +67,7 @@ void f1() {
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-2],
x0_hostaddr == &p[-2]);
// EXPECTED: 333 1 1 0
- // CHECK: 111 1 0 0
+ // CHECK: 333 1 0 1
}
// The following map(from:p) should not bring back p, because p is an
@@ -75,7 +75,8 @@ void f1() {
// 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
+ // EXPECTED: 111 1
+ // CHECK: 333 0
#pragma omp target exit data map(delete : p[0 : 5], p)
}
diff --git a/offload/test/mapping/map_ptr_and_subscript_global.c b/offload/test/mapping/map_ptr_and_subscript_global.c
index 09b41d2b0f959..63486773a68ec 100644
--- a/offload/test/mapping/map_ptr_and_subscript_global.c
+++ b/offload/test/mapping/map_ptr_and_subscript_global.c
@@ -46,8 +46,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
x0_hostaddr == &p[0]);
- // EXPECTED: 111 1 1 0
- // CHECK: 111 1 1 1
+ // CHECK: 111 1 1 0
p++;
}
@@ -56,8 +55,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
x0_hostaddr == &p[-1]);
- // EXPECTED: 222 1 1 0
- // CHECK: 222 1 1 1
+ // CHECK: 222 1 1 0
p++;
}
@@ -66,8 +64,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-2],
x0_hostaddr == &p[-2]);
- // EXPECTED: 333 1 1 0
- // CHECK: 333 1 1 1
+ // CHECK: 333 1 1 0
}
// The following map(from:p) should not bring back p, because p is an
@@ -75,7 +72,7 @@ void f1() {
// location, &x[0], on host.
#pragma omp target exit data map(always, from : p)
printf("%d %d\n", p[0], p == &x[0]);
- // CHECK: 333 1
+ // CHECK: 111 1
#pragma omp target exit data map(delete : p[0 : 5], p)
}
diff --git a/offload/test/mapping/map_ptr_and_subscript_local.c b/offload/test/mapping/map_ptr_and_subscript_local.c
index fd874753c9fd2..59c05fa876d96 100644
--- a/offload/test/mapping/map_ptr_and_subscript_local.c
+++ b/offload/test/mapping/map_ptr_and_subscript_local.c
@@ -46,8 +46,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[0],
x0_hostaddr == &p[0]);
- // EXPECTED: 111 1 1 0
- // CHECK: 111 1 1 1
+ // CHECK: 111 1 1 0
p++;
}
@@ -56,8 +55,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-1],
x0_hostaddr == &p[-1]);
- // EXPECTED: 222 1 1 0
- // CHECK: 222 1 1 1
+ // CHECK: 222 1 1 0
p++;
}
@@ -66,8 +64,7 @@ void f1() {
{
printf("%d %d %d %d\n", p[0], p_mappedptr == &p, x0_mappedptr == &p[-2],
x0_hostaddr == &p[-2]);
- // EXPECTED: 333 1 1 0
- // CHECK: 333 1 1 1
+ // CHECK: 333 1 1 0
}
// The following map(from:p) should not bring back p, because p is an
@@ -75,7 +72,7 @@ void f1() {
// location, &x[0], on host.
#pragma omp target exit data map(always, from : p)
printf("%d %d\n", p[0], p == &x[0]);
- // CHECK: 333 1
+ // CHECK: 111 1
#pragma omp target exit data map(delete : p[0 : 5], p)
}
diff --git a/offload/test/mapping/map_structptr_and_member_global.c b/offload/test/mapping/map_structptr_and_member_global.c
index 10e72e070dbc5..f2fae005b79ab 100644
--- a/offload/test/mapping/map_structptr_and_member_global.c
+++ b/offload/test/mapping/map_structptr_and_member_global.c
@@ -52,7 +52,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
s0_hostaddr == &ps->x);
// EXPECTED: 111 1 1 0
- // CHECK: 111 0 1 0
+ // CHECK: 111 1 0 1
ps++;
}
@@ -62,7 +62,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
s0_mappedptr == &ps[-1].x, s0_hostaddr == &ps[-1].x);
// EXPECTED: 222 1 1 0
- // CHECK: 111 0 0 0
+ // CHECK: 222 1 0 1
ps++;
}
@@ -72,7 +72,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
s0_mappedptr == &ps[-2].x, s0_hostaddr == &ps[-2].x);
// EXPECTED: 333 1 1 0
- // CHECK: 111 1 0 0
+ // CHECK: 333 1 0 1
}
// The following map(from:ps) should not bring back ps, because ps is an
@@ -80,7 +80,8 @@ void f1() {
// location, &s[0], on host.
#pragma omp target exit data map(always, from : ps)
printf("%d %d\n", ps->x, ps == &s[0]);
- // CHECK: 111 1
+ // EXPECTED: 111 1
+ // CHECK: 333 0
#pragma omp target exit data map(delete : ps, s)
}
diff --git a/offload/test/mapping/map_structptr_and_member_local.c b/offload/test/mapping/map_structptr_and_member_local.c
index 9e59551ad3d6c..a9db3eefbc54f 100644
--- a/offload/test/mapping/map_structptr_and_member_local.c
+++ b/offload/test/mapping/map_structptr_and_member_local.c
@@ -51,7 +51,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps, s0_mappedptr == &ps->x,
s0_hostaddr == &ps->x);
// EXPECTED: 111 1 1 0
- // CHECK: 111 0 1 0
+ // CHECK: 111 1 0 1
ps++;
}
@@ -61,7 +61,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
s0_mappedptr == &ps[-1].x, s0_hostaddr == &ps[-1].x);
// EXPECTED: 222 1 1 0
- // CHECK: 111 0 0 0
+ // CHECK: 222 1 0 1
ps++;
}
@@ -71,7 +71,7 @@ void f1() {
printf("%d %d %d %d\n", ps->x, ps_mappedptr == &ps,
s0_mappedptr == &ps[-2].x, s0_hostaddr == &ps[-2].x);
// EXPECTED: 333 1 1 0
- // CHECK: 111 1 0 0
+ // CHECK: 333 1 0 1
}
// The following map(from:ps) should not bring back ps, because ps is an
@@ -79,7 +79,8 @@ void f1() {
// location, &s[0], on host.
#pragma omp target exit data map(always, from : ps)
printf("%d %d\n", ps->x, ps == &s[0]);
- // CHECK: 111 1
+ // EXPECTED: 111 1
+ // CHECK: 333 0
#pragma omp target exit data map(delete : ps, s)
}
More information about the llvm-commits
mailing list