From: Alexey Bataev Date: Tue, 8 Oct 2019 19:44:16 +0000 (+0000) Subject: [OPENMP50]Multiple vendors in vendor context must be treated as logical X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d45d5ea2ab93d16f72d3f68c4092e31a1796f75;p=clang [OPENMP50]Multiple vendors in vendor context must be treated as logical and of vendors, not or. If several vendors are provided in the same vendor context trait, the context shall match only if all vendors are matching, not one of them. This is per OpenMP 5.0, 2.3.3 Matching and Scoring Context Selectors, all selectors in the construct, device, and implementation sets of the context selector appear in the corresponding trait set of the OpenMP context. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@374107 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td index 283d0f3200..279a43236a 100644 --- a/include/clang/Basic/Attr.td +++ b/include/clang/Basic/Attr.td @@ -3309,7 +3309,7 @@ def OMPDeclareVariant : InheritableAttr { [ "CtxUnknown", "CtxVendor" ]>, - StringArgument<"ImplVendor", 1> + VariadicStringArgument<"ImplVendors"> ]; let AdditionalMembers = [{ void printScore(raw_ostream & OS, const PrintingPolicy &Policy) const { @@ -3337,7 +3337,11 @@ def OMPDeclareVariant : InheritableAttr { case CtxVendor: OS << "vendor("; printScore(OS, Policy); - OS << getImplVendor(); + if (implVendors_size() > 0) { + OS << *implVendors(). begin(); + for (StringRef VendorName : llvm::drop_begin(implVendors(), 1)) + OS << ", " << VendorName; + } OS << ")"; break; case CtxUnknown: diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index bb05a08e54..d5d91e31f5 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -9110,15 +9110,15 @@ public: OMPDeclareVariantAttr::CtxSetUnknown; OMPDeclareVariantAttr::CtxSelectorType Ctx = OMPDeclareVariantAttr::CtxUnknown; - StringRef ImplVendor; + MutableArrayRef ImplVendors; ExprResult CtxScore; explicit OpenMPDeclareVariantCtsSelectorData() = default; explicit OpenMPDeclareVariantCtsSelectorData( OMPDeclareVariantAttr::CtxSelectorSetType CtxSet, - OMPDeclareVariantAttr::CtxSelectorType Ctx, StringRef ImplVendor, - ExprResult CtxScore) - : CtxSet(CtxSet), Ctx(Ctx), ImplVendor(ImplVendor), CtxScore(CtxScore) { - } + OMPDeclareVariantAttr::CtxSelectorType Ctx, + MutableArrayRef ImplVendors, ExprResult CtxScore) + : CtxSet(CtxSet), Ctx(Ctx), ImplVendors(ImplVendors), + CtxScore(CtxScore) {} }; /// Checks if the variant/multiversion functions are compatible. diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp index e9cf692888..d2f18a5767 100644 --- a/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/lib/CodeGen/CGOpenMPRuntime.cpp @@ -11172,7 +11172,8 @@ template <> bool checkContext( const OMPDeclareVariantAttr *A) { - return !A->getImplVendor().compare("llvm"); + return llvm::all_of(A->implVendors(), + [](StringRef S) { return !S.compare_lower("llvm"); }); } static bool greaterCtxScore(ASTContext &Ctx, const Expr *LHS, const Expr *RHS) { diff --git a/lib/Parse/ParseOpenMP.cpp b/lib/Parse/ParseOpenMP.cpp index f667b83b58..82a4e70055 100644 --- a/lib/Parse/ParseOpenMP.cpp +++ b/lib/Parse/ParseOpenMP.cpp @@ -853,6 +853,7 @@ static void parseImplementationSelector( (void)T.expectAndConsume(diag::err_expected_lparen_after, CtxSelectorName.data()); const ExprResult Score = parseContextScore(P); + SmallVector, 4> Vendors; do { // Parse . StringRef VendorName; @@ -860,18 +861,14 @@ static void parseImplementationSelector( Buffer.clear(); VendorName = P.getPreprocessor().getSpelling(P.getCurToken(), Buffer); (void)P.ConsumeToken(); + if (!VendorName.empty()) + Vendors.push_back(VendorName); } else { P.Diag(Tok.getLocation(), diag::err_omp_declare_variant_item_expected) << "vendor identifier" << "vendor" << "implementation"; } - if (!VendorName.empty()) { - Sema::OpenMPDeclareVariantCtsSelectorData Data( - OMPDeclareVariantAttr::CtxSetImplementation, CSKind, VendorName, - Score); - Callback(SourceRange(Loc, Tok.getLocation()), Data); - } if (!P.TryConsumeToken(tok::comma) && Tok.isNot(tok::r_paren)) { P.Diag(Tok, diag::err_expected_punc) << (VendorName.empty() ? "vendor name" : VendorName); @@ -879,6 +876,15 @@ static void parseImplementationSelector( } while (Tok.is(tok::identifier)); // Parse ')'. (void)T.consumeClose(); + if (!Vendors.empty()) { + SmallVector ImplVendors(Vendors.size()); + for (int I = 0, E = Vendors.size(); I < E; ++I) + ImplVendors[I] = Vendors[I]; + Sema::OpenMPDeclareVariantCtsSelectorData Data( + OMPDeclareVariantAttr::CtxSetImplementation, CSKind, ImplVendors, + Score); + Callback(SourceRange(Loc, Tok.getLocation()), Data); + } break; } case OMPDeclareVariantAttr::CtxUnknown: diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp index ff7e1c004c..5ceee810c6 100644 --- a/lib/Sema/SemaOpenMP.cpp +++ b/lib/Sema/SemaOpenMP.cpp @@ -5136,8 +5136,8 @@ void Sema::ActOnOpenMPDeclareVariantDirective( } } auto *NewAttr = OMPDeclareVariantAttr::CreateImplicit( - Context, VariantRef, Score, Data.CtxSet, ST, Data.Ctx, Data.ImplVendor, - SR); + Context, VariantRef, Score, Data.CtxSet, ST, Data.Ctx, + Data.ImplVendors.begin(), Data.ImplVendors.size(), SR); FD->addAttr(NewAttr); } diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 881b4fd992..818548cb62 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -399,9 +399,11 @@ static void instantiateOMPDeclareVariantAttr( if (!DeclVarData) return; // Instantiate the attribute. - Sema::OpenMPDeclareVariantCtsSelectorData Data(Attr.getCtxSelectorSet(), - Attr.getCtxSelector(), - Attr.getImplVendor(), Score); + Sema::OpenMPDeclareVariantCtsSelectorData Data( + Attr.getCtxSelectorSet(), Attr.getCtxSelector(), + llvm::makeMutableArrayRef(Attr.implVendors_begin(), + Attr.implVendors_size()), + Score); S.ActOnOpenMPDeclareVariantDirective(DeclVarData.getValue().first, DeclVarData.getValue().second, Attr.getRange(), Data); diff --git a/test/OpenMP/declare_variant_ast_print.c b/test/OpenMP/declare_variant_ast_print.c index 7f359e07b7..a8a11bc53d 100644 --- a/test/OpenMP/declare_variant_ast_print.c +++ b/test/OpenMP/declare_variant_ast_print.c @@ -15,8 +15,7 @@ int foo(void); int bar(void); // CHECK: int foo(); -// CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(score(5):ibm)}) -// CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(score(5):xxx)}) +// CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(score(5):ibm, xxx)}) // CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(unknown)}) // CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(llvm)}) // CHECK-NEXT: #pragma omp declare variant(foo) match(implementation={vendor(llvm)}) diff --git a/test/OpenMP/declare_variant_ast_print.cpp b/test/OpenMP/declare_variant_ast_print.cpp index 7b3b9ccd7b..ce67b818f3 100644 --- a/test/OpenMP/declare_variant_ast_print.cpp +++ b/test/OpenMP/declare_variant_ast_print.cpp @@ -28,8 +28,7 @@ T foofoo() { return T(); } #pragma omp declare variant(foofoo ) match(implementation={vendor(score(5): ibm)}) int bar(); -// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(C + 5):ibm)}) -// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(C + 5):xxx)}) +// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(C + 5):ibm, xxx)}) // CHECK-NEXT: #pragma omp declare variant(foofoo) match(implementation={vendor(unknown)}) // CHECK-NEXT: #pragma omp declare variant(foofoo) match(implementation={vendor(llvm)}) // CHECK-NEXT: template T barbar(); @@ -45,8 +44,7 @@ int bar(); template T barbar(); -// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(3 + 5):ibm)}) -// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(3 + 5):xxx)}) +// CHECK: #pragma omp declare variant(foofoo) match(implementation={vendor(score(3 + 5):ibm, xxx)}) // CHECK-NEXT: #pragma omp declare variant(foofoo) match(implementation={vendor(unknown)}) // CHECK-NEXT: #pragma omp declare variant(foofoo) match(implementation={vendor(llvm)}) // CHECK-NEXT: template<> int barbar(); diff --git a/test/OpenMP/declare_variant_implementation_vendor_codegen.cpp b/test/OpenMP/declare_variant_implementation_vendor_codegen.cpp index 1c200cca90..cf72e4c68b 100644 --- a/test/OpenMP/declare_variant_implementation_vendor_codegen.cpp +++ b/test/OpenMP/declare_variant_implementation_vendor_codegen.cpp @@ -13,6 +13,8 @@ // CHECK-DAG: @_Z4callv = {{.*}}alias i32 (), i32 ()* @_Z4testv // CHECK-DAG: @_ZL9stat_usedv = internal alias i32 (), i32 ()* @_ZL10stat_used_v // CHECK-DAG: @_ZN12SpecialFuncs6MethodEv = {{.*}}alias i32 (%struct.SpecialFuncs*), i32 (%struct.SpecialFuncs*)* @_ZN12SpecialFuncs7method_Ev +// CHECK-DAG: @fn_linkage = {{.*}}alias i32 (), i32 ()* @_Z18fn_linkage_variantv +// CHECK-DAG: @_Z11fn_linkage1v = {{.*}}alias i32 (), i32 ()* @fn_linkage_variant1 // CHECK-DAG: declare {{.*}}i32 @_Z5bazzzv() // CHECK-DAG: declare {{.*}}i32 @_Z3bazv() // CHECK-DAG: ret i32 2 @@ -24,6 +26,7 @@ // CHECK-DAG: ret i32 83 // CHECK-DAG: ret i32 85 // CHECK-DAG: ret i32 86 +// CHECK-DAG: ret i32 87 // CHECK-NOT: ret i32 {{1|4|81|84}} #ifndef HEADER @@ -122,4 +125,8 @@ extern "C" int fn_linkage_variant1() { return 86; } #pragma omp declare variant(fn_linkage_variant1) match(implementation = {vendor(llvm)}) int fn_linkage1() { return 1; } +int fn_variant2() { return 1; } +#pragma omp declare variant(fn_variant2) match(implementation = {vendor(llvm, ibm)}) +int fn2() { return 87; } + #endif // HEADER