Index: include/clang/Basic/Attr.td =================================================================== --- include/clang/Basic/Attr.td (revision 208791) +++ include/clang/Basic/Attr.td (working copy) @@ -1750,3 +1750,65 @@ def Unaligned : IgnoredAttr { let Spellings = [Keyword<"__unaligned">]; } + +def LoopHint : Attr { + // LoopHint Vectorize: + // enable - use vector instructions. + // disable - do not use vector instructions. + // positive value - use vector instructions of the specified width. + + // LoopHint Interleave: + // enable - interleave multiple loop iterations. + // disable - do not interleave multiple loop interactions. + // positive value - interleave the specified number of loop interations. + + // FIXME: Add Pragma spelling to tablegen and + // use it here. + let Spellings = [Keyword<"loop">]; + + // State of the loop optimization specified by the spelling. + let Args = [EnumArgument<"Option", "OptionType", + ["vectorize", "interleave"], + ["Vectorize", "Interleave"]>, + EnumArgument<"Kind", "KindType", + ["disable", "enable", "value"], + ["Disable", "Enable", "Value"]>, + DefaultIntArgument<"Value", 1>]; + + let AdditionalMembers = [{ + // Returns true if Kinds can co-exist a statement. Enable and Value are + // compatible. Disable is only compatible with itself. + static bool isCompatible(int Kind1, int Kind2) { + return (Kind1 == Disable) == (Kind2 == Disable); + } + + static StringRef getOptionName(int Option) { + switch (Option) { + case Vectorize: return "vectorize"; + case Interleave: return "interleave"; + } + llvm_unreachable("Unhandled LoopHint option."); + } + + static StringRef getKindName(int Kind) { + switch (Kind) { + case Disable: return "disable"; + case Enable: return "enable"; + case Value: return "value"; + } + llvm_unreachable("Unhandled LoopHint kind."); + } + + // FIXME: Modify pretty printer to print this pragma + void print(raw_ostream &OS, const PrintingPolicy &Policy) const { + OS << getOptionName(option) << "("; + if (getKind() == Value) + OS << value; + else + OS << getKindName(kind); + OS << ")\n"; + } + }]; + + let Documentation = [Undocumented]; +} Index: include/clang/Basic/DiagnosticParseKinds.td =================================================================== --- include/clang/Basic/DiagnosticParseKinds.td (revision 208791) +++ include/clang/Basic/DiagnosticParseKinds.td (working copy) @@ -884,6 +884,14 @@ "unexpected OpenMP clause '%0' in directive '#pragma omp %1'">; def err_omp_more_one_clause : Error< "directive '#pragma omp %0' cannot contain more than one '%1' clause">; + +// Pragma loop support. +def err_pragma_loop_invalid_option : Error< + "%select{invalid|missing}0 option%select{ '%1'|}0 in directive " + "'#pragma loop'; expected either vectorize or interleave">; +def err_pragma_loop_invalid_type : Error< + "invalid value '%0' in directive '#pragma loop %1'; expected either " + "'enable', 'disable', or a positive integer">; } // end of Parse Issue category. let CategoryName = "Modules Issue" in { Index: include/clang/Basic/DiagnosticSemaKinds.td =================================================================== --- include/clang/Basic/DiagnosticSemaKinds.td (revision 208791) +++ include/clang/Basic/DiagnosticSemaKinds.td (working copy) @@ -537,6 +537,13 @@ "#pragma visibility pop with no matching #pragma visibility push">; def note_surrounding_namespace_starts_here : Note< "surrounding namespace with visibility attribute starts here">; +def err_pragma_loop_invalid_value : Error< + "expected a positive integer in directive '#pragma loop %0'">; +def err_pragma_loop_incompatible : Error< + "'%0' and '%1' directive option types are incompatible in '#pragma loop %2'">; +def err_pragma_loop_precedes_nonloop : Error< + "expected a for, while, or do-while loop to follow the '#pragma loop' " + "directive">; /// Objective-C parser diagnostics def err_duplicate_class_def : Error< Index: include/clang/Basic/TokenKinds.def =================================================================== --- include/clang/Basic/TokenKinds.def (revision 208791) +++ include/clang/Basic/TokenKinds.def (working copy) @@ -701,6 +701,11 @@ ANNOTATION(pragma_openmp) ANNOTATION(pragma_openmp_end) +// Annotations for loop pragma directives #pragma loop ... +// The lexer produces these so that they only take effect when the parser +// handles #pragma loop ... directives. +ANNOTATION(pragma_loop_hint) + // Annotations for module import translated from #include etc. ANNOTATION(module_include) ANNOTATION(module_begin) Index: include/clang/Parse/Parser.h =================================================================== --- include/clang/Parse/Parser.h (revision 208791) +++ include/clang/Parse/Parser.h (working copy) @@ -20,6 +20,7 @@ #include "clang/Lex/CodeCompletionHandler.h" #include "clang/Lex/Preprocessor.h" #include "clang/Sema/DeclSpec.h" +#include "clang/Sema/LoopHint.h" #include "clang/Sema/Sema.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Compiler.h" @@ -160,6 +161,7 @@ std::unique_ptr MSConstSeg; std::unique_ptr MSCodeSeg; std::unique_ptr MSSection; + std::unique_ptr LoopHintHandler; std::unique_ptr CommentSemaHandler; @@ -518,6 +520,10 @@ /// #pragma clang __debug captured StmtResult HandlePragmaCaptured(); + /// \brief Handle the annotation token produced for + /// #pragma vectorize... + LoopHint HandlePragmaLoopHint(); + /// GetLookAheadToken - This peeks ahead N tokens and returns that token /// without consuming any tokens. LookAhead(0) returns 'Tok', LookAhead(1) /// returns the token after Tok, etc. @@ -1600,6 +1606,9 @@ StmtResult ParseReturnStatement(); StmtResult ParseAsmStatement(bool &msAsm); StmtResult ParseMicrosoftAsmStatement(SourceLocation AsmLoc); + StmtResult ParsePragmaLoopHint(StmtVector &Stmts, bool OnlyStatement, + SourceLocation *TrailingElseLoc, + ParsedAttributesWithRange &Attrs); /// \brief Describes the behavior that should be taken for an __if_exists /// block. Index: include/clang/Sema/LoopHint.h =================================================================== --- include/clang/Sema/LoopHint.h (revision 0) +++ include/clang/Sema/LoopHint.h (working copy) @@ -0,0 +1,31 @@ +//===--- LoopHint.h - Types for LoopHint ------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_SEMA_LOOPHINT_H +#define LLVM_CLANG_SEMA_LOOPHINT_H + +#include "clang/Basic/IdentifierTable.h" +#include "clang/Basic/SourceLocation.h" +#include "clang/Sema/AttributeList.h" +#include "clang/Sema/Ownership.h" + +namespace clang { + +/// \brief Loop hint specified by a pragma loop directive. +struct LoopHint { + SourceRange Range; + Expr *ValueExpr; + IdentifierLoc *LoopLoc; + IdentifierLoc *ValueLoc; + IdentifierLoc *OptionLoc; +}; + +} // end namespace clang + +#endif // LLVM_CLANG_SEMA_LOOPHINT_H Index: lib/AST/StmtPrinter.cpp =================================================================== --- lib/AST/StmtPrinter.cpp (revision 208791) +++ lib/AST/StmtPrinter.cpp (working copy) @@ -168,8 +168,23 @@ } void StmtPrinter::VisitAttributedStmt(AttributedStmt *Node) { - for (const auto *Attr : Node->getAttrs()) - Attr->printPretty(OS, Policy); + std::string raw_attr_os; + llvm::raw_string_ostream AttrOS(raw_attr_os); + for (const auto *Attr : Node->getAttrs()) { + // FIXME: This hack will be removed when printPretty + // has been modified to print pretty pragmas + if (const LoopHintAttr *LHA = dyn_cast(Attr)) { + OS << "#pragma loop "; + LHA->print(OS, Policy); + } else + Attr->printPretty(AttrOS, Policy); + } + + // Print attributes after pragmas. + StringRef AttrStr = AttrOS.str(); + if (!AttrStr.empty()) + OS << AttrStr; + PrintStmt(Node->getSubStmt(), 0); } Index: lib/CodeGen/CGStmt.cpp =================================================================== --- lib/CodeGen/CGStmt.cpp (revision 208791) +++ lib/CodeGen/CGStmt.cpp (working copy) @@ -18,6 +18,7 @@ #include "clang/AST/StmtVisitor.h" #include "clang/Basic/PrettyStackTrace.h" #include "clang/Basic/TargetInfo.h" +#include "clang/Sema/LoopHint.h" #include "clang/Sema/SemaDiagnostic.h" #include "llvm/ADT/StringExtras.h" #include "llvm/IR/CallSite.h" @@ -396,7 +397,23 @@ } void CodeGenFunction::EmitAttributedStmt(const AttributedStmt &S) { - EmitStmt(S.getSubStmt()); + const Stmt *SubStmt = S.getSubStmt(); + switch (SubStmt->getStmtClass()) { + case Stmt::DoStmtClass: + EmitDoStmt(cast(*SubStmt), S.getAttrs()); + break; + case Stmt::ForStmtClass: + EmitForStmt(cast(*SubStmt), S.getAttrs()); + break; + case Stmt::WhileStmtClass: + EmitWhileStmt(cast(*SubStmt), S.getAttrs()); + break; + case Stmt::CXXForRangeStmtClass: + EmitCXXForRangeStmt(cast(*SubStmt), S.getAttrs()); + break; + default: + EmitStmt(SubStmt); + } } void CodeGenFunction::EmitGotoStmt(const GotoStmt &S) { @@ -502,7 +519,57 @@ EmitBlock(ContBlock, true); } -void CodeGenFunction::EmitWhileStmt(const WhileStmt &S) { +void CodeGenFunction::EmitCondBrHints(llvm::LLVMContext &Context, + llvm::BranchInst *CondBr, + ArrayRef &Attrs) { + // Do not continue if there are not hints. + if (Attrs.empty()) + return; + + // Add vectorize hints to the metadata on the conditional branch. + // Iterate in reverse so hints are put in the same order they appear. + SmallVector Metadata(1); + for (auto Attr : Attrs) { + const LoopHintAttr *LH = dyn_cast(Attr); + + // Skip non loop hint attributes + if (!LH) + continue; + + LoopHintAttr::OptionType Option = LH->getOption(); + int ValueInt = LH->getValue(); + int Kind = LH->getKind(); + + llvm::Value *Value; + llvm::MDString *Name; + const char *MetadataNames[] = {"llvm.vectorizer.width", + "llvm.vectorizer.unroll"}; + if (Kind == LoopHintAttr::Enable) { + Name = llvm::MDString::get(Context, "llvm.vectorizer.enable"); + Value = Builder.getTrue(); + } else { + // No need for the disable case because ValueInt is 1 if Kind is disable. + Name = llvm::MDString::get(Context, MetadataNames[Option]); + Value = llvm::ConstantInt::get(Int32Ty, ValueInt); + } + + SmallVector OpValues; + OpValues.push_back(Name); + OpValues.push_back(Value); + + // Set or overwrite metadata indicated by Name. + Metadata.push_back(llvm::MDNode::get(Context, OpValues)); + } + + // Add llvm.loop MDNode to CondBr. + llvm::MDNode *LoopID = llvm::MDNode::get(Context, Metadata); + LoopID->replaceOperandWith(0, LoopID); // First op points to itself. + + CondBr->setMetadata("llvm.loop", LoopID); +} + +void CodeGenFunction::EmitWhileStmt(const WhileStmt &S, + ArrayRef WhileAttrs) { RegionCounter Cnt = getPGORegionCounter(&S); // Emit the header for the loop, which will also become @@ -547,13 +614,17 @@ llvm::BasicBlock *ExitBlock = LoopExit.getBlock(); if (ConditionScope.requiresCleanups()) ExitBlock = createBasicBlock("while.exit"); - Builder.CreateCondBr(BoolCondVal, LoopBody, ExitBlock, - PGO.createLoopWeights(S.getCond(), Cnt)); + llvm::BranchInst *CondBr = + Builder.CreateCondBr(BoolCondVal, LoopBody, ExitBlock, + PGO.createLoopWeights(S.getCond(), Cnt)); if (ExitBlock != LoopExit.getBlock()) { EmitBlock(ExitBlock); EmitBranchThroughCleanup(LoopExit); } + + // Attach metadata to loop body conditional branch. + EmitCondBrHints(LoopBody->getContext(), CondBr, WhileAttrs); } // Emit the loop body. We have to emit this in a cleanup scope @@ -582,7 +653,8 @@ SimplifyForwardingBlocks(LoopHeader.getBlock()); } -void CodeGenFunction::EmitDoStmt(const DoStmt &S) { +void CodeGenFunction::EmitDoStmt(const DoStmt &S, + ArrayRef DoAttrs) { JumpDest LoopExit = getJumpDestInCurrentScope("do.end"); JumpDest LoopCond = getJumpDestInCurrentScope("do.cond"); @@ -619,10 +691,15 @@ EmitBoolCondBranch = false; // As long as the condition is true, iterate the loop. - if (EmitBoolCondBranch) - Builder.CreateCondBr(BoolCondVal, LoopBody, LoopExit.getBlock(), - PGO.createLoopWeights(S.getCond(), Cnt)); + if (EmitBoolCondBranch) { + llvm::BranchInst *CondBr = + Builder.CreateCondBr(BoolCondVal, LoopBody, LoopExit.getBlock(), + PGO.createLoopWeights(S.getCond(), Cnt)); + // Attach metadata to loop body conditional branch. + EmitCondBrHints(LoopBody->getContext(), CondBr, DoAttrs); + } + // Emit the exit block. EmitBlock(LoopExit.getBlock()); @@ -632,7 +709,8 @@ SimplifyForwardingBlocks(LoopCond.getBlock()); } -void CodeGenFunction::EmitForStmt(const ForStmt &S) { +void CodeGenFunction::EmitForStmt(const ForStmt &S, + ArrayRef ForAttrs) { JumpDest LoopExit = getJumpDestInCurrentScope("for.end"); RunCleanupsScope ForScope(*this); @@ -686,9 +764,13 @@ // C99 6.8.5p2/p4: The first substatement is executed if the expression // compares unequal to 0. The condition must be a scalar type. llvm::Value *BoolCondVal = EvaluateExprAsBool(S.getCond()); - Builder.CreateCondBr(BoolCondVal, ForBody, ExitBlock, - PGO.createLoopWeights(S.getCond(), Cnt)); + llvm::BranchInst *CondBr = + Builder.CreateCondBr(BoolCondVal, ForBody, ExitBlock, + PGO.createLoopWeights(S.getCond(), Cnt)); + // Attach metadata to loop body conditional branch. + EmitCondBrHints(ForBody->getContext(), CondBr, ForAttrs); + if (ExitBlock != LoopExit.getBlock()) { EmitBlock(ExitBlock); EmitBranchThroughCleanup(LoopExit); @@ -728,7 +810,8 @@ EmitBlock(LoopExit.getBlock(), true); } -void CodeGenFunction::EmitCXXForRangeStmt(const CXXForRangeStmt &S) { +void CodeGenFunction::EmitCXXForRangeStmt(const CXXForRangeStmt &S, + ArrayRef ForAttrs) { JumpDest LoopExit = getJumpDestInCurrentScope("for.end"); RunCleanupsScope ForScope(*this); @@ -761,9 +844,12 @@ // The body is executed if the expression, contextually converted // to bool, is true. llvm::Value *BoolCondVal = EvaluateExprAsBool(S.getCond()); - Builder.CreateCondBr(BoolCondVal, ForBody, ExitBlock, - PGO.createLoopWeights(S.getCond(), Cnt)); + llvm::BranchInst *CondBr = Builder.CreateCondBr( + BoolCondVal, ForBody, ExitBlock, PGO.createLoopWeights(S.getCond(), Cnt)); + // Attach metadata to loop body conditional branch + EmitCondBrHints(ForBody->getContext(), CondBr, ForAttrs); + if (ExitBlock != LoopExit.getBlock()) { EmitBlock(ExitBlock); EmitBranchThroughCleanup(LoopExit); Index: lib/CodeGen/CodeGenFunction.h =================================================================== --- lib/CodeGen/CodeGenFunction.h (revision 208791) +++ lib/CodeGen/CodeGenFunction.h (working copy) @@ -1846,9 +1846,15 @@ void EmitGotoStmt(const GotoStmt &S); void EmitIndirectGotoStmt(const IndirectGotoStmt &S); void EmitIfStmt(const IfStmt &S); - void EmitWhileStmt(const WhileStmt &S); - void EmitDoStmt(const DoStmt &S); - void EmitForStmt(const ForStmt &S); + + void EmitCondBrHints(llvm::LLVMContext &Context, llvm::BranchInst *CondBr, + ArrayRef &Attrs); + void EmitWhileStmt(const WhileStmt &S, + ArrayRef Attrs = ArrayRef()); + void EmitDoStmt(const DoStmt &S, + ArrayRef Attrs = ArrayRef()); + void EmitForStmt(const ForStmt &S, + ArrayRef Attrs = ArrayRef()); void EmitReturnStmt(const ReturnStmt &S); void EmitDeclStmt(const DeclStmt &S); void EmitBreakStmt(const BreakStmt &S); @@ -1872,7 +1878,9 @@ void EmitCXXTryStmt(const CXXTryStmt &S); void EmitSEHTryStmt(const SEHTryStmt &S); - void EmitCXXForRangeStmt(const CXXForRangeStmt &S); + void + EmitCXXForRangeStmt(const CXXForRangeStmt &S, + ArrayRef Attrs = ArrayRef()); llvm::Function *EmitCapturedStmt(const CapturedStmt &S, CapturedRegionKind K); llvm::Function *GenerateCapturedStmtFunction(const CapturedDecl *CD, Index: lib/Parse/ParsePragma.cpp =================================================================== --- lib/Parse/ParsePragma.cpp (revision 208791) +++ lib/Parse/ParsePragma.cpp (working copy) @@ -15,6 +15,7 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/Parser.h" +#include "clang/Sema/LoopHint.h" #include "clang/Sema/Scope.h" #include "llvm/ADT/StringSwitch.h" using namespace clang; @@ -131,6 +132,12 @@ Token &FirstToken) override; }; +struct PragmaLoopHintHandler : public PragmaHandler { + PragmaLoopHintHandler() : PragmaHandler("loop") {} + void HandlePragma(Preprocessor &PP, PragmaIntroducerKind Introducer, + Token &FirstToken) override; +}; + } // end namespace void Parser::initializePragmaHandlers() { @@ -195,6 +202,9 @@ MSSection.reset(new PragmaMSPragma("section")); PP.AddPragmaHandler(MSSection.get()); } + + LoopHintHandler.reset(new PragmaLoopHintHandler()); + PP.AddPragmaHandler(LoopHintHandler.get()); } void Parser::resetPragmaHandlers() { @@ -249,6 +259,9 @@ PP.RemovePragmaHandler("STDC", FPContractHandler.get()); FPContractHandler.reset(); + + PP.RemovePragmaHandler(LoopHintHandler.get()); + LoopHintHandler.reset(); } /// \brief Handle the annotation token produced for #pragma unused(...) @@ -570,6 +583,40 @@ DiagnosticsEngine::Error, "'#pragma %0' not implemented."); } +struct PragmaLoopHintInfo { + Token Loop; + Token Value; + Token Option; +}; + +LoopHint Parser::HandlePragmaLoopHint() { + assert(Tok.is(tok::annot_pragma_loop_hint)); + PragmaLoopHintInfo *Info = + static_cast(Tok.getAnnotationValue()); + + LoopHint Hint; + Hint.LoopLoc = + IdentifierLoc::create(Actions.Context, Info->Loop.getLocation(), + Info->Loop.getIdentifierInfo()); + Hint.OptionLoc = + IdentifierLoc::create(Actions.Context, Info->Option.getLocation(), + Info->Option.getIdentifierInfo()); + Hint.ValueLoc = + IdentifierLoc::create(Actions.Context, Info->Value.getLocation(), + Info->Value.getIdentifierInfo()); + Hint.Range = + SourceRange(Info->Option.getLocation(), Info->Value.getLocation()); + + // FIXME: We should support template parameters for the loop hint value. + // See bug report #19610 + if (Info->Value.is(tok::numeric_constant)) + Hint.ValueExpr = Actions.ActOnNumericConstant(Info->Value).get(); + else + Hint.ValueExpr = nullptr; + + return Hint; +} + // #pragma GCC visibility comes in two variants: // 'push' '(' [visibility] ')' // 'pop' @@ -1531,3 +1578,107 @@ Actions.ActOnPragmaMSComment(Kind, ArgumentString); } + +/// \brief Handle the \#pragma vectorize hint. +/// #pragma 'loop' loop-hints +/// +/// loop-hints: +/// loop-hint loop-hints[opt] +/// +/// loop-hint: +/// 'vectorize' '(' loop-hint-value ')' +/// 'interleave' '(' loop-hint-value ')' +/// +/// loop-hint-value: +/// 'enable' +/// 'disable' +/// constant-expression +/// +/// Specifying vectorize(enable) or vectorize(_value_) instructs llvm to +/// try vectorizing the instructions of the loop it precedes. Specifying +/// interleave(enable) or interleave(_value_) instructs llvm to try interleaving +/// multiple iterations of the loop it precedes. The _value_ indicates the +/// width of the vector instructions or the number of iterations of the loop +/// that should be interleaved. Consequently, a value of 1 or disable prevents +/// the optimization, even if it is possible and profitable, and 0 is invalid. +/// The loop vectorizer currently only works on inner loops. +/// +void PragmaLoopHintHandler::HandlePragma(Preprocessor &PP, + PragmaIntroducerKind Introducer, + Token &Tok) { + Token Loop = Tok; + SmallVector TokenList; + + // Lex the optimization option and verify it is an identifier. + PP.Lex(Tok); + if (Tok.isNot(tok::identifier)) { + PP.Diag(Tok.getLocation(), diag::err_pragma_loop_invalid_option) + << /*InvalidOption*/ true << ""; + return; + } + + while (Tok.is(tok::identifier)) { + Token Option = Tok; + StringRef OptionName = Tok.getIdentifierInfo()->getName(); + + if (OptionName != "vectorize" && OptionName != "interleave") { + PP.Diag(Tok.getLocation(), diag::err_pragma_loop_invalid_option) + << /*InvalidOption*/ false << OptionName; + return; + } + + // Read '(' + PP.Lex(Tok); + if (Tok.isNot(tok::l_paren)) { + PP.Diag(Tok.getLocation(), diag::err_expected) << tok::l_paren; + return; + } + + PP.Lex(Tok); + if (Tok.isNot(tok::identifier) && Tok.isNot(tok::numeric_constant)) { + PP.Diag(Tok.getLocation(), diag::err_pragma_loop_invalid_type) + << Tok.getName(); + return; + } + + Token Value = Tok; + + // Read ')' + PP.Lex(Tok); + if (Tok.isNot(tok::r_paren)) { + PP.Diag(Tok.getLocation(), diag::err_expected) << tok::r_paren; + return; + } + + // Get next optimization option. + PP.Lex(Tok); + + PragmaLoopHintInfo *Info = + (PragmaLoopHintInfo *)PP.getPreprocessorAllocator().Allocate( + sizeof(PragmaLoopHintInfo), llvm::alignOf()); + + Info->Loop = Loop; + Info->Option = Option; + Info->Value = Value; + + // Generate the vectorization hint token. + Token LoopHintTok; + LoopHintTok.startToken(); + LoopHintTok.setKind(tok::annot_pragma_loop_hint); + LoopHintTok.setLocation(Loop.getLocation()); + LoopHintTok.setAnnotationValue(static_cast(Info)); + TokenList.push_back(LoopHintTok); + } + + if (Tok.isNot(tok::eod)) { + PP.Diag(Tok.getLocation(), diag::warn_pragma_extra_tokens_at_eol) << "loop"; + return; + } + + Token *TokenArray = new Token[TokenList.size()]; + std::copy(TokenList.begin(), TokenList.end(), TokenArray); + + PP.EnterTokenStream(TokenArray, TokenList.size(), + /*DisableMacroExpansion=*/false, + /*OwnsTokens=*/true); +} Index: lib/Parse/ParseStmt.cpp =================================================================== --- lib/Parse/ParseStmt.cpp (revision 208791) +++ lib/Parse/ParseStmt.cpp (working copy) @@ -15,11 +15,13 @@ #include "clang/Parse/Parser.h" #include "RAIIObjectsForParser.h" #include "clang/AST/ASTContext.h" +#include "clang/Basic/Attributes.h" #include "clang/Basic/Diagnostic.h" #include "clang/Basic/PrettyStackTrace.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "clang/Sema/DeclSpec.h" +#include "clang/Sema/LoopHint.h" #include "clang/Sema/PrettyDeclStackTrace.h" #include "clang/Sema/Scope.h" #include "clang/Sema/TypoCorrection.h" @@ -357,6 +359,10 @@ ProhibitAttributes(Attrs); HandlePragmaMSPragma(); return StmtEmpty(); + + case tok::annot_pragma_loop_hint: + ProhibitAttributes(Attrs); + return ParsePragmaLoopHint(Stmts, OnlyStatement, TrailingElseLoc, Attrs); } // If we reached this code, the statement must end in a semicolon. @@ -1751,6 +1757,37 @@ return Actions.ActOnReturnStmt(ReturnLoc, R.take(), getCurScope()); } +StmtResult Parser::ParsePragmaLoopHint(StmtVector &Stmts, bool OnlyStatement, + SourceLocation *TrailingElseLoc, + ParsedAttributesWithRange &Attrs) { + // Create temporary attribute list. + ParsedAttributesWithRange TempAttrs(AttrFactory); + + // Get vectorize hints and consume annotated token. + while (Tok.is(tok::annot_pragma_loop_hint)) { + LoopHint Hint = HandlePragmaLoopHint(); + ConsumeToken(); + + if (!Hint.LoopLoc || !Hint.OptionLoc || !Hint.ValueLoc) + continue; + + ArgsUnion ArgHints[] = {Hint.OptionLoc, Hint.ValueLoc, + ArgsUnion(Hint.ValueExpr)}; + // FIXME: Replace AS_Keyword with Pragma spelling AS_Pragma. + TempAttrs.addNew(Hint.LoopLoc->Ident, Hint.Range, 0, Hint.LoopLoc->Loc, + ArgHints, 3, AttributeList::AS_Keyword); + } + + // Get the next statement. + MaybeParseCXX11Attributes(Attrs); + + StmtResult S = ParseStatementOrDeclarationAfterAttributes( + Stmts, OnlyStatement, TrailingElseLoc, Attrs); + + Attrs.takeAllFrom(TempAttrs); + return S; +} + namespace { class ClangAsmParserCallback : public llvm::MCAsmParserSemaCallback { Parser &TheParser; Index: lib/Sema/SemaStmtAttr.cpp =================================================================== --- lib/Sema/SemaStmtAttr.cpp (revision 208791) +++ lib/Sema/SemaStmtAttr.cpp (working copy) @@ -16,6 +16,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Sema/DelayedDiagnostic.h" #include "clang/Sema/Lookup.h" +#include "clang/Sema/LoopHint.h" #include "clang/Sema/ScopeInfo.h" #include "llvm/ADT/StringExtras.h" @@ -42,7 +43,81 @@ A.getAttributeSpellingListIndex()); } +static Attr *handleLoopHintAttr(Sema &S, Stmt *St, const AttributeList &A, + SourceRange) { + if (St->getStmtClass() != Stmt::DoStmtClass && + St->getStmtClass() != Stmt::ForStmtClass && + St->getStmtClass() != Stmt::CXXForRangeStmtClass && + St->getStmtClass() != Stmt::WhileStmtClass) { + S.Diag(St->getLocStart(), diag::err_pragma_loop_precedes_nonloop); + return nullptr; + } + IdentifierLoc *OptionLoc = A.getArgAsIdent(0); + IdentifierInfo *OptionInfo = OptionLoc->Ident; + IdentifierLoc *ValueLoc = A.getArgAsIdent(1); + IdentifierInfo *ValueInfo = ValueLoc->Ident; + Expr *ValueExpr = A.getArgAsExpr(2); + + assert(OptionInfo && "Attribute must have valid option info."); + + LoopHintAttr::OptionType Option = LoopHintAttr::Vectorize; + if (OptionInfo->getName() == "vectorize") + Option = LoopHintAttr::Vectorize; + else if (OptionInfo->getName() == "interleave") + Option = LoopHintAttr::Interleave; + + LoopHintAttr::KindType Kind = LoopHintAttr::Value; + if (ValueInfo && ValueInfo->getName() == "enable") + Kind = LoopHintAttr::Enable; + else if (ValueInfo && ValueInfo->getName() == "disable") + Kind = LoopHintAttr::Disable; + + // FIXME: We should support template parameters for the loop hint value. + // See bug report #19610 + int ValueInt = 1; // No vectorization/interleaving when kind set to disable. + if (Kind == LoopHintAttr::Value) { + llvm::APSInt ValueAPS; + if (!ValueExpr || !ValueExpr->isIntegerConstantExpr(ValueAPS, S.Context) || + (ValueInt = ValueAPS.getSExtValue()) < 1) { + S.Diag(ValueLoc->Loc, diag::err_pragma_loop_invalid_value) + << LoopHintAttr::getOptionName(Option); + return nullptr; + } + } + + return LoopHintAttr::CreateImplicit(S.Context, Option, Kind, ValueInt, + A.getRange()); +} + +static void +CheckForIncompatibleAttributes(Sema &S, SmallVectorImpl &Attrs) { + int PrevKind[2] = {-1, -1}; + + for (auto I = Attrs.begin(), E = Attrs.end(); I != E; ++I) { + const LoopHintAttr *LH = dyn_cast(*I); + + // Skip non loop hint attributes + if (!LH) + continue; + + int Option = LH->getOption(); + int Kind = LH->getKind(); + SourceLocation ValueLoc = LH->getRange().getEnd(); + + // We only need to check that a loop hint is compatible with the + // previous loop hint to ensure that all hints are compatible. + if (PrevKind[Option] != -1 && + !LoopHintAttr::isCompatible(PrevKind[Option], Kind)) { + S.Diag(ValueLoc, diag::err_pragma_loop_incompatible) + << LoopHintAttr::getKindName(PrevKind[Option]) + << LoopHintAttr::getKindName(Kind) + << LoopHintAttr::getOptionName(Option); + } + PrevKind[Option] = Kind; + } +} + static Attr *ProcessStmtAttribute(Sema &S, Stmt *St, const AttributeList &A, SourceRange Range) { switch (A.getKind()) { @@ -53,6 +128,8 @@ return 0; case AttributeList::AT_FallThrough: return handleFallThroughAttr(S, St, A, Range); + case AttributeList::AT_LoopHint: + return handleLoopHintAttr(S, St, A, Range); default: // if we're here, then we parsed a known attribute, but didn't recognize // it as a statement attribute => it is declaration attribute @@ -70,6 +147,8 @@ Attrs.push_back(a); } + CheckForIncompatibleAttributes(*this, Attrs); + if (Attrs.empty()) return S; Index: test/CodeGen/pragma-loop.cpp =================================================================== --- test/CodeGen/pragma-loop.cpp (revision 0) +++ test/CodeGen/pragma-loop.cpp (working copy) @@ -0,0 +1,120 @@ +// RUN: %clang_cc1 -std=c++11 -emit-llvm -o - %s | FileCheck %s + +// CHECK: br i1 %cmp, label %while.body, label %while.end, !llvm.loop !1 +// CHECK: br i1 %cmp, label %do.body, label %do.end, !llvm.loop !5 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !7 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !8 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !11 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !13 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !14 +// CHECK: br i1 %cmp, label %for.body, label %for.end, !llvm.loop !16 + +// CHECK: !1 = metadata !{metadata !1, metadata !2, metadata !3, metadata !4} +// CHECK: !2 = metadata !{metadata !"llvm.vectorizer.width", i32 4} +// CHECK: !3 = metadata !{metadata !"llvm.vectorizer.unroll", i32 4} +// CHECK: !4 = metadata !{metadata !"llvm.vectorizer.enable", i1 true} +// CHECK: !5 = metadata !{metadata !5, metadata !3, metadata !6} +// CHECK: !6 = metadata !{metadata !"llvm.vectorizer.width", i32 8} +// CHECK: !7 = metadata !{metadata !7, metadata !3, metadata !4} +// CHECK: !8 = metadata !{metadata !8, metadata !9, metadata !10} +// CHECK: !9 = metadata !{metadata !"llvm.vectorizer.unroll", i32 2} +// CHECK: !10 = metadata !{metadata !"llvm.vectorizer.width", i32 2} +// CHECK: !11 = metadata !{metadata !11, metadata !12} +// CHECK: !12 = metadata !{metadata !"llvm.vectorizer.width", i32 1} +// CHECK: !13 = metadata !{metadata !13, metadata !9, metadata !10} +// CHECK: !14 = metadata !{metadata !14, metadata !15, metadata !6} +// CHECK: !15 = metadata !{metadata !"llvm.vectorizer.unroll", i32 8} +// CHECK: !16 = metadata !{metadata !16, metadata !9, metadata !10} + +// Verify while loop is recognized after sequence of pragma loop directives. +void while_test(int *List, int Length) { + int i = 0; + +#pragma loop vectorize(enable) +#pragma loop interleave(4) +#pragma loop vectorize(4) + while (i < Length) { + List[i] = i * 2; + i++; + } +} + +// Verify do loop is recognized after multi-option pragma loop directive. +void do_test(int *List, int Length) { + int i = 0; + +#pragma loop vectorize(8) interleave(4) + do { + List[i] = i * 2; + i++; + } while (i < Length); +} + +// Verify for loop is recognized after sequence of pragma loop directives. +void for_test(int *List, int Length) { +#pragma loop interleave(enable) +#pragma loop interleave(4) + for (int i = 0; i < Length; i++) { + List[i] = i * 2; + } +} + +// Verify c++11 for range loop is recognized after +// sequence of pragma loop directives. +void for_range_test() { + double List[100]; + +#pragma loop vectorize(2) interleave(2) + for (int i : List) { + List[i] = i; + } +} + +// Verify disable pragma loop directive generates correct metadata +void disable_test(int *List, int Length) { +#pragma loop vectorize(disable) + for (int i = 0; i < Length; i++) { + List[i] = i * 2; + } +} + +#define VECWIDTH 2 +#define INTERLEAVE 2 + +// Verify defines are correctly resolved in pragma loop directive +void for_define_test(int *List, int Length, int Value) { +#pragma loop vectorize(VECWIDTH) interleave(INTERLEAVE) + for (int i = 0; i < Length; i++) { + List[i] = i * Value; + } +} + +// Verify metadata is generated when template is used. +template +void for_template_test(A *List, int Length, A Value) { + +#pragma loop vectorize(8) interleave(8) + for (int i = 0; i < Length; i++) { + List[i] = i * Value; + } +} + +// Verify define is resolved correctly when template is used. +template +void for_template_define_test(A *List, int Length, A Value) { +#pragma loop vectorize(VECWIDTH) interleave(INTERLEAVE) + for (int i = 0; i < Length; i++) { + List[i] = i * Value; + } +} + +#undef VECWIDTH +#undef INTERLEAVE + +// Use templates defined above. Test verifies metadata is generated correctly. +void template_test(double *List, int Length) { + double Value = 10; + + for_template_test(List, Length, Value); + for_template_define_test(List, Length, Value); +} Index: test/PCH/pragma-loop.cpp =================================================================== --- test/PCH/pragma-loop.cpp (revision 0) +++ test/PCH/pragma-loop.cpp (working copy) @@ -0,0 +1,62 @@ +// RUN: %clang_cc1 -emit-pch -o %t.a %s +// RUN: %clang_cc1 -include-pch %t.a %s -ast-print -o - | FileCheck %s + +// FIXME: A bug in ParsedAttributes causes the order of the attributes to be +// reversed. The checks are consequently in the reverse order below. + +// CHECK: #pragma loop interleave(8) +// CHECK: #pragma loop vectorize(4) +// CHECK: #pragma loop interleave(disable) +// CHECK: #pragma loop vectorize(enable) +// CHECK: #pragma loop interleave(enable) +// CHECK: #pragma loop vectorize(disable) + +#ifndef HEADER +#define HEADER + +class pragma_test { +public: + inline void run1(int *List, int Length) { + int i = 0; +#pragma loop vectorize(4) +#pragma loop interleave(8) + while (i < Length) { + List[i] = i; + i++; + } + } + + inline void run2(int *List, int Length) { + int i = 0; +#pragma loop vectorize(enable) +#pragma loop interleave(disable) + while (i - 1 < Length) { + List[i] = i; + i++; + } + } + + inline void run3(int *List, int Length) { + int i = 0; +#pragma loop vectorize(disable) +#pragma loop interleave(enable) + while (i - 3 < Length) { + List[i] = i; + i++; + } + } +}; + +#else + +void test() { + int List[100]; + + pragma_test pt; + + pt.run1(List, 100); + pt.run2(List, 100); + pt.run3(List, 100); +} + +#endif Index: test/Parser/pragma-loop-ast.cpp =================================================================== --- test/Parser/pragma-loop-ast.cpp (revision 0) +++ test/Parser/pragma-loop-ast.cpp (working copy) @@ -0,0 +1,35 @@ +// RUN: %clang_cc1 -ast-print %s | FileCheck %s + +// FIXME: A bug in ParsedAttributes causes the order of the attributes to be +// reversed. The checks are consequently in the reverse order below. + +// CHECK: #pragma loop interleave(8) +// CHECK: #pragma loop vectorize(4) +// CHECK: #pragma loop interleave(disable) +// CHECK: #pragma loop vectorize(enable) +// CHECK: #pragma loop interleave(enable) +// CHECK: #pragma loop vectorize(disable) + +void test(int *List, int Length) { + int i = 0; +#pragma loop vectorize(4) +#pragma loop interleave(8) + while (i < Length) { + List[i] = i * 2; + i++; + } + +#pragma loop vectorize(enable) +#pragma loop interleave(disable) + while (i - 1 < Length) { + List[i] = i * 2; + i++; + } + +#pragma loop vectorize(disable) +#pragma loop interleave(enable) + while (i - 2 < Length) { + List[i] = i * 2; + i++; + } +} Index: test/Parser/pragma-loop.cpp =================================================================== --- test/Parser/pragma-loop.cpp (revision 0) +++ test/Parser/pragma-loop.cpp (working copy) @@ -0,0 +1,109 @@ +// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s + +// Note that this puts the expected lines before the directives to work around +// limitations in the -verify mode. + +void test(int *List, int Length) { + int i = 0; + +#pragma loop vectorize(4) +#pragma loop interleave(8) + while (i + 1 < Length) { + List[i] = i; + } + +#pragma loop vectorize(enable) +#pragma loop interleave(enable) + while (i < Length) { + List[i] = i; + } + +#pragma loop vectorize(disable) +#pragma loop interleave(disable) + while (i - 1 < Length) { + List[i] = i; + } + +#pragma loop vectorize(4) interleave(8) + while (i - 2 < Length) { + List[i] = i; + } + +#pragma loop interleave(16) + while (i - 3 < Length) { + List[i] = i; + } + + int VList[Length]; +#pragma loop vectorize(disable) interleave(disable) + for (int j : VList) { + VList[j] = List[j]; + } + +/* expected-error {{expected '('}} */ #pragma loop vectorize +/* expected-error {{expected '('}} */ #pragma loop interleave + +/* expected-error {{expected ')'}} */ #pragma loop vectorize(4 +/* expected-error {{expected ')'}} */ #pragma loop interleave(4 + +/* expected-error {{missing option in directive '#pragma loop'}} */ #pragma loop +/* expected-error {{invalid option 'badkeyword' in directive '#pragma loop'}} */ #pragma loop badkeyword +/* expected-error {{invalid option 'badkeyword' in directive '#pragma loop'}} */ #pragma loop badkeyword(2) +/* expected-error {{invalid option 'badkeyword' in directive '#pragma loop'}} */ #pragma loop vectorize(4) badkeyword(4) +/* expected-warning {{extra tokens at end of '#pragma loop'}} */ #pragma loop vectorize(4) , + + while (i-4 < Length) { + List[i] = i; + } + +/* expected-error {{expected a positive integer in directive '#pragma loop vectorize'}} */ #pragma loop vectorize(0) +/* expected-error {{expected a positive integer in directive '#pragma loop interleave'}} */ #pragma loop interleave(0) + while (i-5 < Length) { + List[i] = i; + } + +/* expected-error {{expected a positive integer in directive '#pragma loop vectorize'}} */ #pragma loop vectorize(3000000000) +/* expected-error {{expected a positive integer in directive '#pragma loop interleave'}} */ #pragma loop interleave(3000000000) + while (i-6 < Length) { + List[i] = i; + } + +/* expected-error {{expected a positive integer in directive '#pragma loop vectorize'}} */ #pragma loop vectorize(badvalue) +/* expected-error {{expected a positive integer in directive '#pragma loop interleave'}} */ #pragma loop interleave(badvalue) + while (i-7 < Length) { + List[i] = i; + } + +#pragma loop vectorize(enable) +/* expected-error {{expected a for, while, or do-while loop to follow the '#pragma loop' directive}} */ int j = Length; + List[0] = List[1]; + + while (j-1 < Length) { + List[j] = j; + } + +// FIXME: A bug in ParsedAttributes causes the order of the attributes to be +// processed in reverse. Consequently, the errors occur on the first of pragma +// of the next three tests rather than the last, and the order of the kinds +// is also reversed. + +/* expected-error {{'disable' and 'value' directive option types are incompatible in '#pragma loop vectorize'}} */ #pragma loop vectorize(4) +#pragma loop vectorize(disable) + while (i-8 < Length) { + List[i] = i; + } + +/* expected-error {{'disable' and 'enable' directive option types are incompatible in '#pragma loop interleave'}} */ #pragma loop interleave(enable) +#pragma loop interleave(disable) + while (i-9 < Length) { + List[i] = i; + } + +/* expected-error {{'value' and 'disable' directive option types are incompatible in '#pragma loop vectorize'}} */ #pragma loop vectorize(disable) +#pragma loop vectorize(4) + while (i-10 < Length) { + List[i] = i; + } + +#pragma loop interleave(enable) +/* expected-error {{expected statement}} */ }