Index: include/llvm/Analysis/CallGraphSCCPass.h =================================================================== --- include/llvm/Analysis/CallGraphSCCPass.h +++ include/llvm/Analysis/CallGraphSCCPass.h @@ -77,6 +77,7 @@ /// always explicitly call the implementation here. void getAnalysisUsage(AnalysisUsage &Info) const override; + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when optimization bisect is over the limit. Index: include/llvm/Analysis/LoopPass.h =================================================================== --- include/llvm/Analysis/LoopPass.h +++ include/llvm/Analysis/LoopPass.h @@ -86,6 +86,7 @@ /// associated analysis values can be deleted. virtual void deleteAnalysisLoop(Loop *L) {} + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when Attribute::OptimizeNone is set or when Index: include/llvm/Analysis/RegionPass.h =================================================================== --- include/llvm/Analysis/RegionPass.h +++ include/llvm/Analysis/RegionPass.h @@ -78,6 +78,7 @@ } //@} + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when optimization bisect is over the limit. Index: include/llvm/IR/OptBisect.h =================================================================== --- include/llvm/IR/OptBisect.h +++ include/llvm/IR/OptBisect.h @@ -19,12 +19,6 @@ namespace llvm { class Pass; -class Module; -class Function; -class BasicBlock; -class Region; -class Loop; -class CallGraphSCC; /// Extensions to this class implement mechanisms to disable passes and /// individual optimizations at compile time. @@ -32,12 +26,7 @@ public: virtual ~OptPassGate() = default; - virtual bool shouldRunPass(const Pass *P, const Module &U) { return true; } - virtual bool shouldRunPass(const Pass *P, const Function &U) {return true; } - virtual bool shouldRunPass(const Pass *P, const BasicBlock &U) { return true; } - virtual bool shouldRunPass(const Pass *P, const Region &U) { return true; } - virtual bool shouldRunPass(const Pass *P, const Loop &U) { return true; } - virtual bool shouldRunPass(const Pass *P, const CallGraphSCC &U) { return true; } + virtual bool shouldRunPass(const Pass *P, const void *U) { return true; } }; /// This class implements a mechanism to disable passes and individual @@ -69,12 +58,7 @@ /// Most passes should not call these routines directly. Instead, they are /// called through helper routines provided by the pass base classes. For /// instance, function passes should call FunctionPass::skipFunction(). - bool shouldRunPass(const Pass *P, const Module &U) override; - bool shouldRunPass(const Pass *P, const Function &U) override; - bool shouldRunPass(const Pass *P, const BasicBlock &U) override; - bool shouldRunPass(const Pass *P, const Region &U) override; - bool shouldRunPass(const Pass *P, const Loop &U) override; - bool shouldRunPass(const Pass *P, const CallGraphSCC &U) override; + bool shouldRunPass(const Pass *P, const void *U) override; private: bool checkPass(const StringRef PassName, const StringRef TargetDesc); Index: include/llvm/Pass.h =================================================================== --- include/llvm/Pass.h +++ include/llvm/Pass.h @@ -95,6 +95,14 @@ /// Registration templates, but can be overloaded directly. virtual StringRef getPassName() const; + /// getDescription - Return a string containing the information about units + /// the pass acts upon. Using a void pointer allows calls from IR to + /// get information about Analysis passes. Each pass type only acts upon + /// one type of unit, so the pointer type is not ambiguous. + virtual std::string getDescription(const void *Unit) const { + llvm_unreachable("Not Implemented"); + } + /// getPassID - Return the PassID number that corresponds to this pass. AnalysisID getPassID() const { return PassID; @@ -241,6 +249,7 @@ /// Return what kind of Pass Manager can manage this pass. PassManagerType getPotentialPassManagerType() const override; + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when optimization bisect is over the limit. @@ -298,6 +307,7 @@ /// Return what kind of Pass Manager can manage this pass. PassManagerType getPotentialPassManagerType() const override; + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when Attribute::OptimizeNone is set or when @@ -343,6 +353,7 @@ /// Return what kind of Pass Manager can manage this pass. PassManagerType getPotentialPassManagerType() const override; + virtual std::string getDescription(const void *Unit) const override; protected: /// Optional passes call this function to check whether the pass should be /// skipped. This is the case when Attribute::OptimizeNone is set or when Index: lib/Analysis/CallGraphSCCPass.cpp =================================================================== --- lib/Analysis/CallGraphSCCPass.cpp +++ lib/Analysis/CallGraphSCCPass.cpp @@ -608,6 +608,25 @@ AU.addPreserved(); } +std::string CallGraphSCCPass::getDescription(const void *Unit) const { + const CallGraphSCC *SCC = static_cast(Unit); + std::string Desc = "SCC ("; + bool First = true; + for (CallGraphNode *CGN : *SCC) { + if (First) + First = false; + else + Desc += ", "; + Function *F = CGN->getFunction(); + if (F) + Desc += F->getName(); + else + Desc += "<>"; + } + Desc += ")"; + return Desc; +} + //===----------------------------------------------------------------------===// // PrintCallGraphPass Implementation //===----------------------------------------------------------------------===// @@ -685,7 +704,7 @@ return !SCC.getCallGraph().getModule() .getContext() .getOptPassGate() - .shouldRunPass(this, SCC); + .shouldRunPass(this, &SCC); } char DummyCGSCCPass::ID = 0; Index: lib/Analysis/LoopPass.cpp =================================================================== --- lib/Analysis/LoopPass.cpp +++ lib/Analysis/LoopPass.cpp @@ -389,7 +389,7 @@ return false; // Check the opt bisect limit. LLVMContext &Context = F->getContext(); - if (!Context.getOptPassGate().shouldRunPass(this, *L)) + if (!Context.getOptPassGate().shouldRunPass(this, L)) return true; // Check for the OptimizeNone attribute. if (F->hasFnAttribute(Attribute::OptimizeNone)) { @@ -402,6 +402,10 @@ return false; } +std::string LoopPass::getDescription(const void *Unit) const { + return "loop"; +} + char LCSSAVerificationPass::ID = 0; INITIALIZE_PASS(LCSSAVerificationPass, "lcssa-verification", "LCSSA Verifier", false, false) Index: lib/Analysis/RegionPass.cpp =================================================================== --- lib/Analysis/RegionPass.cpp +++ lib/Analysis/RegionPass.cpp @@ -280,7 +280,7 @@ bool RegionPass::skipRegion(Region &R) const { Function &F = *R.getEntry()->getParent(); - if (!F.getContext().getOptPassGate().shouldRunPass(this, R)) + if (!F.getContext().getOptPassGate().shouldRunPass(this, &R)) return true; if (F.hasFnAttribute(Attribute::OptimizeNone)) { @@ -292,3 +292,7 @@ } return false; } + +std::string RegionPass::getDescription(const void *Unit) const { + return "region"; +} Index: lib/IR/OptBisect.cpp =================================================================== --- lib/IR/OptBisect.cpp +++ lib/IR/OptBisect.cpp @@ -14,13 +14,6 @@ #include "llvm/IR/OptBisect.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Analysis/CallGraph.h" -#include "llvm/Analysis/CallGraphSCCPass.h" -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/Analysis/RegionInfo.h" -#include "llvm/IR/BasicBlock.h" -#include "llvm/IR/Function.h" -#include "llvm/IR/Module.h" #include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" @@ -46,73 +39,8 @@ << "(" << PassNum << ") " << Name << " on " << TargetDesc << "\n"; } -static std::string getDescription(const Module &M) { - return "module (" + M.getName().str() + ")"; -} - -static std::string getDescription(const Function &F) { - return "function (" + F.getName().str() + ")"; -} - -static std::string getDescription(const BasicBlock &BB) { - return "basic block (" + BB.getName().str() + ") in function (" + - BB.getParent()->getName().str() + ")"; -} - -static std::string getDescription(const Loop &L) { - // FIXME: Move into LoopInfo so we can get a better description - // (and avoid a circular dependency between IR and Analysis). - return "loop"; -} - -static std::string getDescription(const Region &R) { - // FIXME: Move into RegionInfo so we can get a better description - // (and avoid a circular dependency between IR and Analysis). - return "region"; -} - -static std::string getDescription(const CallGraphSCC &SCC) { - // FIXME: Move into CallGraphSCCPass to avoid circular dependency between - // IR and Analysis. - std::string Desc = "SCC ("; - bool First = true; - for (CallGraphNode *CGN : SCC) { - if (First) - First = false; - else - Desc += ", "; - Function *F = CGN->getFunction(); - if (F) - Desc += F->getName(); - else - Desc += "<>"; - } - Desc += ")"; - return Desc; -} - -bool OptBisect::shouldRunPass(const Pass *P, const Module &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); -} - -bool OptBisect::shouldRunPass(const Pass *P, const Function &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); -} - -bool OptBisect::shouldRunPass(const Pass *P, const BasicBlock &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); -} - -bool OptBisect::shouldRunPass(const Pass *P, const Region &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); -} - -bool OptBisect::shouldRunPass(const Pass *P, const Loop &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); -} - -bool OptBisect::shouldRunPass(const Pass *P, const CallGraphSCC &U) { - return !BisectEnabled || checkPass(P->getPassName(), getDescription(U)); +bool OptBisect::shouldRunPass(const Pass *P, const void *U) { + return !BisectEnabled || checkPass(P->getPassName(), P->getDescription(U)); } bool OptBisect::checkPass(const StringRef PassName, Index: lib/IR/Pass.cpp =================================================================== --- lib/IR/Pass.cpp +++ lib/IR/Pass.cpp @@ -56,7 +56,12 @@ } bool ModulePass::skipModule(Module &M) const { - return !M.getContext().getOptPassGate().shouldRunPass(this, M); + return !M.getContext().getOptPassGate().shouldRunPass(this, &M); +} + +std::string ModulePass::getDescription(const void *Unit) const { + const Module *M = static_cast(Unit); + return "module (" + M->getName().str() + ")"; } bool Pass::mustPreserveAnalysisID(char &AID) const { @@ -155,7 +160,7 @@ } bool FunctionPass::skipFunction(const Function &F) const { - if (!F.getContext().getOptPassGate().shouldRunPass(this, F)) + if (!F.getContext().getOptPassGate().shouldRunPass(this, &F)) return true; if (F.hasFnAttribute(Attribute::OptimizeNone)) { @@ -166,6 +171,10 @@ return false; } +std::string FunctionPass::getDescription(const void *Unit) const { + const Function *F = static_cast(Unit); + return "function (" + F->getName().str() + ")"; +} //===----------------------------------------------------------------------===// // BasicBlockPass Implementation // @@ -189,7 +198,7 @@ const Function *F = BB.getParent(); if (!F) return false; - if (!F->getContext().getOptPassGate().shouldRunPass(this, BB)) + if (!F->getContext().getOptPassGate().shouldRunPass(this, &BB)) return true; if (F->hasFnAttribute(Attribute::OptimizeNone)) { // Report this only once per function. @@ -220,6 +229,12 @@ return PI->createPass(); } +std::string BasicBlockPass::getDescription(const void *Unit) const { + const BasicBlock *BB = static_cast(Unit); + return "basic block (" + BB->getName().str() + ") in function (" + + BB->getParent()->getName().str() + ")"; +} + //===----------------------------------------------------------------------===// // Analysis Group Implementation Code //===----------------------------------------------------------------------===// Index: unittests/IR/LegacyPassManagerTest.cpp =================================================================== --- unittests/IR/LegacyPassManagerTest.cpp +++ unittests/IR/LegacyPassManagerTest.cpp @@ -400,7 +400,11 @@ struct CustomOptPassGate : public OptPassGate { bool Skip; CustomOptPassGate(bool Skip) : Skip(Skip) { } - bool shouldRunPass(const Pass *P, const Module &U) { return !Skip; } + bool shouldRunPass(const Pass *P, const void *U) { + if (P->getPassKind() == PT_Module) + return !Skip; + return OptPassGate::shouldRunPass(P, U); + } }; // Optional module pass.