[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added a comment. In D69204#1747941 , @cchen wrote: > Alexey, thanks so much for your help, you really make me learn so much about > Clang and coding in general. Can you land this patch for me since I'm still > new to llvm/clang and haven't have t

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen added a comment. Alexey, thanks so much for your help, you really make me learn so much about Clang and coding in general. Can you land this patch for me since I'm still new to llvm/clang and haven't have the commit access. Thanks! Repository: rG LLVM Github Monorepo CHANGES SINCE LA

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev accepted this revision. ABataev added a comment. This revision is now accepted and ready to land. LG with a nit Comment at: clang/lib/Sema/SemaOpenMP.cpp:4459 } -if (!ImplicitMaps.empty()) { +unsigned ClauseKindCnt = -1; +for (ArrayRef ImplicitMap : Imp

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_codegen.cpp:1544-1545 + // CK26: [[ONE:%.+]] = load float, float* [[ZERO]] +#pragma omp target defaultmap(none:aggregate) map(A) + compute(A); +} Don't understand how does it test ma

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_codegen.cpp:1538-1546 +void declare_target_link(float A) +{ + // CK26: [[AADDR:%.+]] = alloca float* + // CK26: store float* [[A:%.+]], float** [[AADDR]] + // C

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_codegen.cpp:1538-1546 +void declare_target_link(float A) +{ + // CK26: [[AADDR:%.+]] = alloca float* + // CK26: store float* [[A:%.+]], float** [[AADDR]] + // CK26: [[ZERO:%.+]] = load float*, float

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added a comment. Tests for codegen of the declare target to|link vars with the new defaultmap clauses? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D69204/new/ https://reviews.llvm.org/D69204

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:2953-2954 +(!(isOpenMPTargetExecutionDirective(DKind) && Res && + (*Res == OMPDeclareTargetDeclAttr::MT_Link || +*Res == OMPDeclareTargetDeclAttr::MT_To { +

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked 2 inline comments as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:2953-2954 +(!(isOpenMPTargetExecutionDirective(DKind) && Res && + (*Res == OMPDeclareTargetDeclAttr::MT_Link || +*Res == OMPDec

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:2953-2954 +(!(isOpenMPTargetExecutionDirective(DKind) && Res && + (*Res == OMPDeclareTargetDeclAttr::MT_Link || +*Res == OMPDeclareTargetDeclAttr::MT_To { +

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2020-2034 if (!FirstClause) { Diag(Tok, diag::err_omp_more_one_clause) << getOpenMPDirectiveName(DKind) << getOpenMPClauseName(CKind) << 0; ErrorFound = true; } +Clau

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:49 + + #pragma omp target defaultmap(tofrom:scalar) defaultmap(to:scalar) // expected-error {{at most one defaultmap clause for each variable-category can appear on the directive}} + f

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:49 + + #pragma omp target defaultmap(tofrom:scalar) defaultmap(to:scalar) // expected-error {{at most one defaultmap clause for each variable-category can appear on the directive}} + f

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:49 + + #pragma omp target defaultmap(tofrom:scalar) defaultmap(to:scalar) // expected-error {{at most one defaultmap clause for each variable-catego

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:49 + + #pragma omp target defaultmap(tofrom:scalar) defaultmap(to:scalar) // expected-error {{at most one defaultmap clause for each variable-catego

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:49 + + #pragma omp target defaultmap(tofrom:scalar) defaultmap(to:scalar) // expected-error {{at most one defaultmap clause for each variable-category can appear on the directive}} + f

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added a comment. Also, one common comment. It would be good to reduce copy-paste in tests and just add some new lines of codes, not to repeat existing one. Comment at: clang/test/OpenMP/target_defaultmap_messages.cpp:1 -// RUN: %clang_cc1 -verify -fopenmp %s -Wuninitia

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:642 + } + bool mustBeFirstprivateBase(OpenMPDefaultmapClauseModifier M, + OpenMPDefaultmapClauseKind Kind) const { Static function Comment a

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2339-2345 +unsigned Modifier = getOpenMPSimpleClauseType( +Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok)); +// Set defaultmap modifier to unknown if it is either scalar, aggregate, or

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked 2 inline comments as done. cchen added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2339-2345 +unsigned Modifier = getOpenMPSimpleClauseType( +Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok)); +// Set defaultmap modifier to unknown

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2339-2345 +unsigned Modifier = getOpenMPSimpleClauseType( +Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok)); +// Set defaultmap modifier to unknown if it is either scalar, aggregate, or

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:16393-16416 +static DefaultMapImplicitBehavior +getImplicitBehaviorFromModifier(OpenMPDefaultmapClauseModifier M) { + switch (M) { + case OMPC_DEFAULTMAP_MODIFIER_alloc: +return DMIB_alloc; + case OMP

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:16393-16416 +static DefaultMapImplicitBehavior +getImplicitBehaviorFromModifier(OpenMPDefaultmapClauseModifier M) { + switch (M) { + case OMPC_DEFAULTMAP_MODIFIER_allo

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4476 } -if (!ImplicitMaps.empty()) { - CXXScopeSpec MapperIdScopeSpec; - DeclarationNameInfo MapperId; - if (OMPClause *Implicit = ActOnOpenMPMapClause( - llvm::None, llv

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4476 } -if (!ImplicitMaps.empty()) { - CXXScopeSpec MapperIdScopeSpec; - DeclarationNameInfo MapperId; - if (OMPClause *Implicit = ActOnOpenMPMap

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2343-2344 +// pointer +if (Arg.back() < OMPC_DEFAULTMAP_MODIFIER_unknown) + Arg.back() = OMPC_DEFAULTMAP_MODIFIER_unknown; KLoc.push_back(Tok.getLocation()); cchen wrote:

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2343-2344 +// pointer +if (Arg.back() < OMPC_DEFAULTMAP_MODIFIER_unknown) + Arg.back() = OMPC_DEFAULTMAP_MODIFIER_unknown; KLoc.push_back(Tok.getLoca

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Parse/ParseOpenMP.cpp:2343-2344 +// pointer +if (Arg.back() < OMPC_DEFAULTMAP_MODIFIER_unknown) + Arg.back() = OMPC_DEFAULTMAP_MODIFIER_unknown; KLoc.push_back(Tok.getLocation()); Is this poss

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4435-4437 +if (DMIB == DMIB_alloc) Kind = OMPC_MAP_alloc; +else if (DMIB == DMIB_to) Kind = OMPC_MAP_to; +else if (DMIB == DMIB_from) Kind = OMPC_MAP_from; cchen wrot

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4435-4437 +if (DMIB == DMIB_alloc) Kind = OMPC_MAP_alloc; +else if (DMIB == DMIB_to) Kind = OMPC_MAP_to; +else if (DMIB == DMIB_from) Kind = OMPC

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:16411-16420 +bool isDefaultmapModifier = (M == OMPC_DEFAULTMAP_MODIFIER_alloc) || +(M == OMPC_DEFAULTMAP_MODIFIER_to) || +(M == OMPC_DEFAUL

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:16411-16420 +bool isDefaultmapModifier = (M == OMPC_DEFAULTMAP_MODIFIER_alloc) || +(M == OMPC_DEFAULTMAP_MODIFIER_to) || +

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:620 + SourceLocation Loc) { +auto &DefaultmapInfo = getTopOfStack().DefaultmapMap[DMVC]; +DefaultmapInfo.ImplicitBehavior = DMIB; `auto` -> to real type ===

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4374 + case DMIB_unspecified: +return OMPC_MAP_tofrom; + } cchen wrote: > ABataev wrote: > > cchen wrote: > > > ABataev wrote: > > > > cchen wrote: > > > > > ABataev wrote: > > > > > >

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4374 + case DMIB_unspecified: +return OMPC_MAP_tofrom; + } ABataev wrote: > cchen wrote: > > ABataev wrote: > > > cchen wrote: > > > > ABataev wro

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4374 + case DMIB_unspecified: +return OMPC_MAP_tofrom; + } cchen wrote: > ABataev wrote: > > cchen wrote: > > > ABataev wrote: > > > > `OMPC_MAP_tofrom` must be returned only for `DMIB

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4374 + case DMIB_unspecified: +return OMPC_MAP_tofrom; + } ABataev wrote: > cchen wrote: > > ABataev wrote: > > > `OMPC_MAP_tofrom` must be return

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4374 + case DMIB_unspecified: +return OMPC_MAP_tofrom; + } cchen wrote: > ABataev wrote: > > `OMPC_MAP_tofrom` must be returned only for `DMIB_tofrom`, for others, it > > must be `llv

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked 2 inline comments as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:1967 (DSAStack->isForceCaptureByReferenceInTargetExecutable() && !Ty->isAnyPointerType()) || !Ty->isScalarType() || AB

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:1967 (DSAStack->isForceCaptureByReferenceInTargetExecutable() && !Ty->isAnyPointerType()) || !Ty->isScalarType() || ABataev wrote: > Seems to me, you're mis

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/CodeGen/CGOpenMPRuntime.cpp:7246-7248 +// Set implicit behavior except for "default" for defaultmap +if ((Bits & OMP_MAP_IMPLICIT) && +(ImplicitBehavior != OMPC_DEFAULTMAP_MODIFIER_default)) { c

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked 2 inline comments as done. cchen added inline comments. Comment at: clang/lib/CodeGen/CGOpenMPRuntime.cpp:7246-7248 +// Set implicit behavior except for "default" for defaultmap +if ((Bits & OMP_MAP_IMPLICIT) && +(ImplicitBehavior != OMPC_DEFAULTMAP_M

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added a comment. Some comments marked as ]Вщту] are not done actually, check them, please. Comment at: clang/lib/CodeGen/CGOpenMPRuntime.cpp:7246-7248 +// Set implicit behavior except for "default" for defaultmap +if ((Bits & OMP_MAP_IMPLICIT) && +(Impli

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/CodeGen/CGOpenMPRuntime.cpp:7368-7370 + bool IsImplicit, OpenMPDefaultmapClauseModifier ImplicitBehavior = + OMPC_DEFAULTMAP_MODIFIER_default, + OpenMPDefaultmapClauseKin

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/include/clang/Basic/OpenMPKinds.def:426-436 +OPENMP_DEFAULTMAP_KIND(aggregate) +OPENMP_DEFAULTMAP_KIND(pointer) // Modifiers for 'defaultmap' clause. +OPENMP_DEFAULTMAP_MODIFIER(alloc) +OPENMP_DEFAULTMAP_MODIFIER(to) +OPENMP_DEF

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/include/clang/Basic/OpenMPKinds.def:426-436 +OPENMP_DEFAULTMAP_KIND(aggregate) +OPENMP_DEFAULTMAP_KIND(pointer) // Modifiers for 'defaultmap' clause. +OPENMP_DEFAULTMAP_MODIFIER(alloc) +OPEN

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/include/clang/Basic/OpenMPKinds.def:426-436 +OPENMP_DEFAULTMAP_KIND(aggregate) +OPENMP_DEFAULTMAP_KIND(pointer) // Modifiers for 'defaultmap' clause. +OPENMP_DEFAULTMAP_MODIFIER(alloc) +OPENMP_DEFAULTMAP_MODIFIER(to) +OPENMP_DEF

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked 12 inline comments as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:1978 + DSAStack->getDefaultDMIBAtLevel(Level, OMPC_DEFAULTMAP_scalar) == + DMIB_firstprivate) || DSAStack->hasExplicitDSA( --

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added a comment. Some of the previous comments are not fixed. Comment at: clang/include/clang/Basic/DiagnosticSemaKinds.td:9100 +def note_omp_defaultmap_attr_none : Note< + "explicit data sharing attribute, data mapping attribute, or is_devise_ptr clause requested her

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:1969-1972 + (DSAStack->getDefaultDMIBAtLevel(Level, OMPC_DEFAULTMAP_scalar) == + DMIB_alloc || + DSAStack->getDefaultDMIBAtLevel(Level, OMPC

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/TreeTransform.h:1987-2001 + /// Build a new OpenMP 'defaultmap' clause. + /// + /// By default, performs semantic analysis to build the new OpenMP clause. + /// Subclasses may override this routine to provide different

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/TreeTransform.h:1987-2001 + /// Build a new OpenMP 'defaultmap' clause. + /// + /// By default, performs semantic analysis to build the new OpenMP clause. + /// Subclasses may over

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:137-140 + SourceLocation Loc) { + ImplicitBehavior = IB; + VariableCategory = VC; + SLoc = Loc; Use member initializers in constructors. Comment

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4463-4890 + if (AStmt && !CurContext->isDependentContext()) { assert(isa(AStmt) && "Captured statement expected"); // Check default data sharing attributes for referenced variables. DSAAt

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen marked an inline comment as done. cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4463-4890 + if (AStmt && !CurContext->isDependentContext()) { assert(isa(AStmt) && "Captured statement expected"); // Check default data sharing attribute

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

cchen added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:4463-4890 + if (AStmt && !CurContext->isDependentContext()) { assert(isa(AStmt) && "Captured statement expected"); // Check default data sharing attributes for referenced variables. DSAAttr

[PATCH] D69204: [OpenMP 5.0] - Extend defaultmap

ABataev added inline comments. Comment at: clang/lib/Sema/SemaOpenMP.cpp:52-74 enum DefaultMapAttributes { - DMA_unspecified, /// Default mapping is not specified. - DMA_tofrom_scalar, /// Default mapping is 'tofrom:scalar'. + DMA_unspecified, /// Default mappin