Pol Marcet =?utf-8?q?Sardà ?= <polmarcetsa...@gmail.com>, Pol Marcet =?utf-8?q?Sardà ?= <polmarcetsa...@gmail.com>,Pol M <polmarcetsa...@gmail.com> Message-ID: In-Reply-To: <llvm.org/llvm/llvm-project/pull/76...@github.com>
https://github.com/Destroyerrrocket updated https://github.com/llvm/llvm-project/pull/76825 >From 1ab4538e194f9a77c500e4a93b1875eb7e76dcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pol=20Marcet=20Sard=C3=A0?= <polmarcetsa...@gmail.com> Date: Wed, 3 Jan 2024 16:00:42 +0100 Subject: [PATCH 1/4] [clang] Optimize castToDeclContext for 2% improvement in build times --- clang/include/clang/AST/DeclCXX.h | 8 ++ clang/lib/AST/DeclBase.cpp | 50 +++----- clang/utils/TableGen/ClangASTNodesEmitter.cpp | 107 +++++++++++------- clang/utils/TableGen/TableGen.cpp | 3 +- clang/utils/TableGen/TableGenBackends.h | 3 +- 5 files changed, 97 insertions(+), 74 deletions(-) diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h index 432293583576b5..984a4d8bab5e77 100644 --- a/clang/include/clang/AST/DeclCXX.h +++ b/clang/include/clang/AST/DeclCXX.h @@ -2044,6 +2044,14 @@ class RequiresExprBodyDecl : public Decl, public DeclContext { // Implement isa/cast/dyncast/etc. static bool classof(const Decl *D) { return classofKind(D->getKind()); } static bool classofKind(Kind K) { return K == RequiresExprBody; } + + static DeclContext *castToDeclContext(const RequiresExprBodyDecl *D) { + return static_cast<DeclContext *>(const_cast<RequiresExprBodyDecl *>(D)); + } + + static RequiresExprBodyDecl *castFromDeclContext(const DeclContext *DC) { + return static_cast<RequiresExprBodyDecl *>(const_cast<DeclContext *>(DC)); + } }; /// Represents a static or instance method of a struct/union/class. diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp index 5e03f0223d311c..b1733c2d052a65 100644 --- a/clang/lib/AST/DeclBase.cpp +++ b/clang/lib/AST/DeclBase.cpp @@ -930,20 +930,14 @@ const AttrVec &Decl::getAttrs() const { Decl *Decl::castFromDeclContext (const DeclContext *D) { Decl::Kind DK = D->getDeclKind(); - switch(DK) { -#define DECL(NAME, BASE) -#define DECL_CONTEXT(NAME) \ - case Decl::NAME: \ - return static_cast<NAME##Decl *>(const_cast<DeclContext *>(D)); -#define DECL_CONTEXT_BASE(NAME) -#include "clang/AST/DeclNodes.inc" - default: + switch (DK) { #define DECL(NAME, BASE) -#define DECL_CONTEXT_BASE(NAME) \ - if (DK >= first##NAME && DK <= last##NAME) \ - return static_cast<NAME##Decl *>(const_cast<DeclContext *>(D)); +#define DECL_CONTEXT(NAME) \ + case Decl::NAME: \ + return static_cast<NAME##Decl *>(const_cast<DeclContext *>(D)); #include "clang/AST/DeclNodes.inc" - llvm_unreachable("a decl that inherits DeclContext isn't handled"); + default: + llvm_unreachable("a decl that inherits DeclContext isn't handled"); } } @@ -951,18 +945,12 @@ DeclContext *Decl::castToDeclContext(const Decl *D) { Decl::Kind DK = D->getKind(); switch(DK) { #define DECL(NAME, BASE) -#define DECL_CONTEXT(NAME) \ - case Decl::NAME: \ - return static_cast<NAME##Decl *>(const_cast<Decl *>(D)); -#define DECL_CONTEXT_BASE(NAME) +#define DECL_CONTEXT(NAME) \ + case Decl::NAME: \ + return static_cast<NAME##Decl *>(const_cast<Decl *>(D)); #include "clang/AST/DeclNodes.inc" - default: -#define DECL(NAME, BASE) -#define DECL_CONTEXT_BASE(NAME) \ - if (DK >= first##NAME && DK <= last##NAME) \ - return static_cast<NAME##Decl *>(const_cast<Decl *>(D)); -#include "clang/AST/DeclNodes.inc" - llvm_unreachable("a decl that inherits DeclContext isn't handled"); + default: + llvm_unreachable("a decl that inherits DeclContext isn't handled"); } } @@ -1129,20 +1117,14 @@ DeclContext::DeclContext(Decl::Kind K) { } bool DeclContext::classof(const Decl *D) { - switch (D->getKind()) { + Decl::Kind DK = D->getKind(); + switch (DK) { #define DECL(NAME, BASE) #define DECL_CONTEXT(NAME) case Decl::NAME: -#define DECL_CONTEXT_BASE(NAME) #include "clang/AST/DeclNodes.inc" - return true; - default: -#define DECL(NAME, BASE) -#define DECL_CONTEXT_BASE(NAME) \ - if (D->getKind() >= Decl::first##NAME && \ - D->getKind() <= Decl::last##NAME) \ - return true; -#include "clang/AST/DeclNodes.inc" - return false; + return true; + default: + return false; } } diff --git a/clang/utils/TableGen/ClangASTNodesEmitter.cpp b/clang/utils/TableGen/ClangASTNodesEmitter.cpp index 16a1c74b9d91ad..63220aad50aecd 100644 --- a/clang/utils/TableGen/ClangASTNodesEmitter.cpp +++ b/clang/utils/TableGen/ClangASTNodesEmitter.cpp @@ -33,6 +33,7 @@ class ClangASTNodesEmitter { typedef std::multimap<ASTNode, ASTNode> ChildMap; typedef ChildMap::const_iterator ChildIterator; + std::set<ASTNode> PrioritizedClasses; RecordKeeper &Records; ASTNode Root; const std::string &NodeClassName; @@ -70,8 +71,15 @@ class ClangASTNodesEmitter { std::pair<ASTNode, ASTNode> EmitNode(raw_ostream& OS, ASTNode Base); public: explicit ClangASTNodesEmitter(RecordKeeper &R, const std::string &N, - const std::string &S) - : Records(R), NodeClassName(N), BaseSuffix(S) {} + const std::string &S, + const std::string &PriorizeIfSubclassOf) + : Records(R), NodeClassName(N), BaseSuffix(S) { + auto vecPriorized = PriorizeIfSubclassOf.empty() + ? std::vector<Record *>{} + : R.getAllDerivedDefinitions(PriorizeIfSubclassOf); + PrioritizedClasses = + std::set<ASTNode>(vecPriorized.begin(), vecPriorized.end()); + } // run - Output the .inc file contents void run(raw_ostream &OS); @@ -95,8 +103,31 @@ std::pair<ASTNode, ASTNode> ClangASTNodesEmitter::EmitNode(raw_ostream &OS, if (!Base.isAbstract()) First = Last = Base; + class Comp { + std::set<ASTNode> &PrioritizedClasses; + + public: + Comp(std::set<ASTNode> &PrioritizedClasses) + : PrioritizedClasses(PrioritizedClasses) {} + bool operator()(ASTNode LHS, ASTNode RHS) const { + auto LHSPriorized = PrioritizedClasses.count(LHS) > 0; + auto RHSPriorized = PrioritizedClasses.count(RHS) > 0; + if (LHSPriorized && !RHSPriorized) + return true; + if (!LHSPriorized && RHSPriorized) + return false; + + return LHS.getName() > RHS.getName(); + } + }; + + auto SortedChildren = std::set<ASTNode, Comp>(Comp(PrioritizedClasses)); + for (; i != e; ++i) { - ASTNode Child = i->second; + SortedChildren.insert(i->second); + } + + for (const auto &Child : SortedChildren) { bool Abstract = Child.isAbstract(); std::string NodeName = macroName(std::string(Child.getName())); @@ -182,9 +213,9 @@ void ClangASTNodesEmitter::run(raw_ostream &OS) { OS << "#endif\n\n"; OS << "#ifndef LAST_" << macroHierarchyName() << "_RANGE\n"; - OS << "# define LAST_" - << macroHierarchyName() << "_RANGE(Base, First, Last) " - << macroHierarchyName() << "_RANGE(Base, First, Last)\n"; + OS << "# define LAST_" << macroHierarchyName() + << "_RANGE(Base, First, Last) " << macroHierarchyName() + << "_RANGE(Base, First, Last)\n"; OS << "#endif\n\n"; EmitNode(OS, Root); @@ -196,8 +227,20 @@ void ClangASTNodesEmitter::run(raw_ostream &OS) { } void clang::EmitClangASTNodes(RecordKeeper &RK, raw_ostream &OS, - const std::string &N, const std::string &S) { - ClangASTNodesEmitter(RK, N, S).run(OS); + const std::string &N, const std::string &S, + const std::string &PriorizeIfSubclassOf) { + ClangASTNodesEmitter(RK, N, S, PriorizeIfSubclassOf).run(OS); +} + +void printDeclContext(std::multimap<Record *, Record *> &Tree, + Record *DeclContext, raw_ostream &OS) { + if (!DeclContext->getValueAsBit(AbstractFieldName)) + OS << "DECL_CONTEXT(" << DeclContext->getName() << ")\n"; + auto i = Tree.lower_bound(DeclContext); + auto end = Tree.upper_bound(DeclContext); + for (; i != end; ++i) { + printDeclContext(Tree, i->second, OS); + } } // Emits and addendum to a .inc file to enumerate the clang declaration @@ -210,38 +253,26 @@ void clang::EmitClangDeclContext(RecordKeeper &Records, raw_ostream &OS) { OS << "#ifndef DECL_CONTEXT\n"; OS << "# define DECL_CONTEXT(DECL)\n"; OS << "#endif\n"; - - OS << "#ifndef DECL_CONTEXT_BASE\n"; - OS << "# define DECL_CONTEXT_BASE(DECL) DECL_CONTEXT(DECL)\n"; - OS << "#endif\n"; - - typedef std::set<Record*> RecordSet; - typedef std::vector<Record*> RecordVector; - - RecordVector DeclContextsVector - = Records.getAllDerivedDefinitions(DeclContextNodeClassName); - RecordVector Decls = Records.getAllDerivedDefinitions(DeclNodeClassName); - RecordSet DeclContexts (DeclContextsVector.begin(), DeclContextsVector.end()); - - for (RecordVector::iterator i = Decls.begin(), e = Decls.end(); i != e; ++i) { - Record *R = *i; - - if (Record *B = R->getValueAsOptionalDef(BaseFieldName)) { - if (DeclContexts.find(B) != DeclContexts.end()) { - OS << "DECL_CONTEXT_BASE(" << B->getName() << ")\n"; - DeclContexts.erase(B); - } - } + + std::vector<Record *> DeclContextsVector = + Records.getAllDerivedDefinitions(DeclContextNodeClassName); + std::vector<Record *> Decls = + Records.getAllDerivedDefinitions(DeclNodeClassName); + + std::multimap<Record *, Record *> Tree; + + const std::vector<Record *> Stmts = + Records.getAllDerivedDefinitions(DeclNodeClassName); + + for (unsigned i = 0, e = Stmts.size(); i != e; ++i) { + Record *R = Stmts[i]; + if (auto *B = R->getValueAsOptionalDef(BaseFieldName)) + Tree.insert(std::make_pair(B, R)); } - // To keep identical order, RecordVector may be used - // instead of RecordSet. - for (RecordVector::iterator - i = DeclContextsVector.begin(), e = DeclContextsVector.end(); - i != e; ++i) - if (DeclContexts.find(*i) != DeclContexts.end()) - OS << "DECL_CONTEXT(" << (*i)->getName() << ")\n"; + for (auto *DeclContext : DeclContextsVector) { + printDeclContext(Tree, DeclContext, OS); + } OS << "#undef DECL_CONTEXT\n"; - OS << "#undef DECL_CONTEXT_BASE\n"; } diff --git a/clang/utils/TableGen/TableGen.cpp b/clang/utils/TableGen/TableGen.cpp index c1f2ca15b595c0..3859555d647fd1 100644 --- a/clang/utils/TableGen/TableGen.cpp +++ b/clang/utils/TableGen/TableGen.cpp @@ -398,7 +398,8 @@ bool ClangTableGenMain(raw_ostream &OS, RecordKeeper &Records) { EmitClangASTNodes(Records, OS, CommentNodeClassName, ""); break; case GenClangDeclNodes: - EmitClangASTNodes(Records, OS, DeclNodeClassName, "Decl"); + EmitClangASTNodes(Records, OS, DeclNodeClassName, "Decl", + DeclContextNodeClassName); EmitClangDeclContext(Records, OS); break; case GenClangStmtNodes: diff --git a/clang/utils/TableGen/TableGenBackends.h b/clang/utils/TableGen/TableGenBackends.h index 35f2f04c1e818d..ae895698ce5468 100644 --- a/clang/utils/TableGen/TableGenBackends.h +++ b/clang/utils/TableGen/TableGenBackends.h @@ -26,7 +26,8 @@ namespace clang { void EmitClangDeclContext(llvm::RecordKeeper &RK, llvm::raw_ostream &OS); void EmitClangASTNodes(llvm::RecordKeeper &RK, llvm::raw_ostream &OS, - const std::string &N, const std::string &S); + const std::string &N, const std::string &S, + const std::string &PriorizeIfSubclassOf = ""); void EmitClangBasicReader(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitClangBasicWriter(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitClangTypeNodes(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); >From ba241b87663a800b49ddd29373e7065aa1d10ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pol=20Marcet=20Sard=C3=A0?= <polmarcetsa...@gmail.com> Date: Thu, 4 Jan 2024 10:21:44 +0100 Subject: [PATCH 2/4] Address Cor3ntin & Endilll comments --- clang/utils/TableGen/ClangASTNodesEmitter.cpp | 39 +++++++------------ clang/utils/TableGen/TableGenBackends.h | 9 ++++- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/clang/utils/TableGen/ClangASTNodesEmitter.cpp b/clang/utils/TableGen/ClangASTNodesEmitter.cpp index 63220aad50aecd..513878775bef88 100644 --- a/clang/utils/TableGen/ClangASTNodesEmitter.cpp +++ b/clang/utils/TableGen/ClangASTNodesEmitter.cpp @@ -72,7 +72,7 @@ class ClangASTNodesEmitter { public: explicit ClangASTNodesEmitter(RecordKeeper &R, const std::string &N, const std::string &S, - const std::string &PriorizeIfSubclassOf) + std::string_view PriorizeIfSubclassOf) : Records(R), NodeClassName(N), BaseSuffix(S) { auto vecPriorized = PriorizeIfSubclassOf.empty() ? std::vector<Record *>{} @@ -103,25 +103,17 @@ std::pair<ASTNode, ASTNode> ClangASTNodesEmitter::EmitNode(raw_ostream &OS, if (!Base.isAbstract()) First = Last = Base; - class Comp { - std::set<ASTNode> &PrioritizedClasses; - - public: - Comp(std::set<ASTNode> &PrioritizedClasses) - : PrioritizedClasses(PrioritizedClasses) {} - bool operator()(ASTNode LHS, ASTNode RHS) const { - auto LHSPriorized = PrioritizedClasses.count(LHS) > 0; - auto RHSPriorized = PrioritizedClasses.count(RHS) > 0; - if (LHSPriorized && !RHSPriorized) - return true; - if (!LHSPriorized && RHSPriorized) - return false; - - return LHS.getName() > RHS.getName(); - } - }; + auto comp = [this](ASTNode LHS, ASTNode RHS) { + auto LHSPriorized = PrioritizedClasses.count(LHS) > 0; + auto RHSPriorized = PrioritizedClasses.count(RHS) > 0; + if (LHSPriorized && !RHSPriorized) + return true; + if (!LHSPriorized && RHSPriorized) + return false; - auto SortedChildren = std::set<ASTNode, Comp>(Comp(PrioritizedClasses)); + return LHS.getName() > RHS.getName(); + }; + auto SortedChildren = std::set<ASTNode, decltype(comp)>(comp); for (; i != e; ++i) { SortedChildren.insert(i->second); @@ -179,9 +171,7 @@ void ClangASTNodesEmitter::deriveChildTree() { const std::vector<Record*> Stmts = Records.getAllDerivedDefinitions(NodeClassName); - for (unsigned i = 0, e = Stmts.size(); i != e; ++i) { - Record *R = Stmts[i]; - + for (auto *R : Stmts) { if (auto B = R->getValueAsOptionalDef(BaseFieldName)) Tree.insert(std::make_pair(B, R)); else if (Root) @@ -228,7 +218,7 @@ void ClangASTNodesEmitter::run(raw_ostream &OS) { void clang::EmitClangASTNodes(RecordKeeper &RK, raw_ostream &OS, const std::string &N, const std::string &S, - const std::string &PriorizeIfSubclassOf) { + std::string_view PriorizeIfSubclassOf) { ClangASTNodesEmitter(RK, N, S, PriorizeIfSubclassOf).run(OS); } @@ -264,8 +254,7 @@ void clang::EmitClangDeclContext(RecordKeeper &Records, raw_ostream &OS) { const std::vector<Record *> Stmts = Records.getAllDerivedDefinitions(DeclNodeClassName); - for (unsigned i = 0, e = Stmts.size(); i != e; ++i) { - Record *R = Stmts[i]; + for (auto *R : Stmts) { if (auto *B = R->getValueAsOptionalDef(BaseFieldName)) Tree.insert(std::make_pair(B, R)); } diff --git a/clang/utils/TableGen/TableGenBackends.h b/clang/utils/TableGen/TableGenBackends.h index ae895698ce5468..faa0c5d2cff9e3 100644 --- a/clang/utils/TableGen/TableGenBackends.h +++ b/clang/utils/TableGen/TableGenBackends.h @@ -25,9 +25,16 @@ class RecordKeeper; namespace clang { void EmitClangDeclContext(llvm::RecordKeeper &RK, llvm::raw_ostream &OS); +/** + @param PriorizeIfSubclassOf These classes should be prioritized in the output. + This is useful to force enum generation/jump tables/lookup tables to be more + compact in both size and surrounding code in hot functions. An example use is + in Decl for classes that inherit from DeclContext, for functions like + castFromDeclContext. + */ void EmitClangASTNodes(llvm::RecordKeeper &RK, llvm::raw_ostream &OS, const std::string &N, const std::string &S, - const std::string &PriorizeIfSubclassOf = ""); + std::string_view PriorizeIfSubclassOf = ""); void EmitClangBasicReader(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitClangBasicWriter(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitClangTypeNodes(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); >From 92161ab5c62a2e8580cc603e3acd2d9635ea60ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pol=20Marcet=20Sard=C3=A0?= <polmarcetsa...@gmail.com> Date: Thu, 4 Jan 2024 12:49:13 +0100 Subject: [PATCH 3/4] Priorized->Prioritized --- clang/utils/TableGen/ClangASTNodesEmitter.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/clang/utils/TableGen/ClangASTNodesEmitter.cpp b/clang/utils/TableGen/ClangASTNodesEmitter.cpp index 513878775bef88..b3d4cba5479b3b 100644 --- a/clang/utils/TableGen/ClangASTNodesEmitter.cpp +++ b/clang/utils/TableGen/ClangASTNodesEmitter.cpp @@ -74,11 +74,12 @@ class ClangASTNodesEmitter { const std::string &S, std::string_view PriorizeIfSubclassOf) : Records(R), NodeClassName(N), BaseSuffix(S) { - auto vecPriorized = PriorizeIfSubclassOf.empty() - ? std::vector<Record *>{} - : R.getAllDerivedDefinitions(PriorizeIfSubclassOf); + auto vecPrioritized = + PriorizeIfSubclassOf.empty() + ? std::vector<Record *>{} + : R.getAllDerivedDefinitions(PriorizeIfSubclassOf); PrioritizedClasses = - std::set<ASTNode>(vecPriorized.begin(), vecPriorized.end()); + std::set<ASTNode>(vecPrioritized.begin(), vecPrioritized.end()); } // run - Output the .inc file contents @@ -104,11 +105,11 @@ std::pair<ASTNode, ASTNode> ClangASTNodesEmitter::EmitNode(raw_ostream &OS, First = Last = Base; auto comp = [this](ASTNode LHS, ASTNode RHS) { - auto LHSPriorized = PrioritizedClasses.count(LHS) > 0; - auto RHSPriorized = PrioritizedClasses.count(RHS) > 0; - if (LHSPriorized && !RHSPriorized) + auto LHSPrioritized = PrioritizedClasses.count(LHS) > 0; + auto RHSPrioritized = PrioritizedClasses.count(RHS) > 0; + if (LHSPrioritized && !RHSPrioritized) return true; - if (!LHSPriorized && RHSPriorized) + if (!LHSPrioritized && RHSPrioritized) return false; return LHS.getName() > RHS.getName(); >From 5cade3df9b11f0b2849e02a034aaf17bfff8af87 Mon Sep 17 00:00:00 2001 From: Pol M <polmarcetsa...@gmail.com> Date: Thu, 4 Jan 2024 14:19:05 +0100 Subject: [PATCH 4/4] add const to function Co-authored-by: cor3ntin <corentinja...@gmail.com> --- clang/utils/TableGen/ClangASTNodesEmitter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/utils/TableGen/ClangASTNodesEmitter.cpp b/clang/utils/TableGen/ClangASTNodesEmitter.cpp index b3d4cba5479b3b..07ddafce329163 100644 --- a/clang/utils/TableGen/ClangASTNodesEmitter.cpp +++ b/clang/utils/TableGen/ClangASTNodesEmitter.cpp @@ -223,7 +223,7 @@ void clang::EmitClangASTNodes(RecordKeeper &RK, raw_ostream &OS, ClangASTNodesEmitter(RK, N, S, PriorizeIfSubclassOf).run(OS); } -void printDeclContext(std::multimap<Record *, Record *> &Tree, +void printDeclContext(const std::multimap<Record *, Record *> &Tree, Record *DeclContext, raw_ostream &OS) { if (!DeclContext->getValueAsBit(AbstractFieldName)) OS << "DECL_CONTEXT(" << DeclContext->getName() << ")\n"; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
