[llvm] r195192 - [PM] Make the function pass manager more regular.
Chandler Carruth
chandlerc at gmail.com
Tue Nov 19 20:39:16 PST 2013
Author: chandlerc
Date: Tue Nov 19 22:39:16 2013
New Revision: 195192
URL: http://llvm.org/viewvc/llvm-project?rev=195192&view=rev
Log:
[PM] Make the function pass manager more regular.
The FunctionPassManager is now itself a function pass. When run over
a function, it runs all N of its passes over that function. This is the
1:N mapping in the pass dimension only. This allows it to be used in
either a ModulePassManager or potentially some other manager that
works on IR units which are supersets of Functions.
This commit also adds the obvious adaptor to map from a module pass to
a function pass, running the function pass across every function in the
module.
The test has been updated to use this new pattern.
Modified:
llvm/trunk/include/llvm/IR/PassManager.h
llvm/trunk/lib/IR/PassManager.cpp
llvm/trunk/unittests/IR/PassManagerTest.cpp
Modified: llvm/trunk/include/llvm/IR/PassManager.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/PassManager.h?rev=195192&r1=195191&r2=195192&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/PassManager.h (original)
+++ llvm/trunk/include/llvm/IR/PassManager.h Tue Nov 19 22:39:16 2013
@@ -189,7 +189,7 @@ public:
Passes.push_back(new FunctionPassModel<FunctionPassT>(llvm_move(Pass)));
}
- bool run(Module *M);
+ bool run(Function *F);
private:
// Pull in the concept type and model template specialized for functions.
@@ -204,6 +204,36 @@ private:
std::vector<polymorphic_ptr<FunctionPassConcept> > Passes;
};
+/// \brief Trivial adaptor that maps from a module to its functions.
+///
+/// Designed to allow composition of a FunctionPass(Manager) and a
+/// ModulePassManager.
+template <typename FunctionPassT>
+class ModuleToFunctionPassAdaptor {
+public:
+ explicit ModuleToFunctionPassAdaptor(FunctionPassT Pass)
+ : Pass(llvm_move(Pass)) {}
+
+ /// \brief Runs the function pass across every function in the module.
+ bool run(Module *M) {
+ bool Changed = false;
+ for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
+ Changed |= Pass.run(I);
+ return Changed;
+ }
+
+private:
+ FunctionPassT Pass;
+};
+
+/// \brief A function to deduce a function pass type and wrap it in the
+/// templated adaptor.
+template <typename FunctionPassT>
+ModuleToFunctionPassAdaptor<FunctionPassT>
+createModuleToFunctionPassAdaptor(FunctionPassT Pass) {
+ return ModuleToFunctionPassAdaptor<FunctionPassT>(llvm_move(Pass));
+}
+
/// \brief A module analysis pass manager with lazy running and caching of
/// results.
class ModuleAnalysisManager {
Modified: llvm/trunk/lib/IR/PassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/PassManager.cpp?rev=195192&r1=195191&r2=195192&view=diff
==============================================================================
--- llvm/trunk/lib/IR/PassManager.cpp (original)
+++ llvm/trunk/lib/IR/PassManager.cpp Tue Nov 19 22:39:16 2013
@@ -53,15 +53,14 @@ void ModuleAnalysisManager::invalidateIm
ModuleAnalysisResults.erase(PassID);
}
-bool FunctionPassManager::run(Module *M) {
+bool FunctionPassManager::run(Function *F) {
bool Changed = false;
- for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
- for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
- if (Passes[Idx]->run(I)) {
- Changed = true;
- if (AM)
- AM->invalidateAll(I);
- }
+ for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
+ if (Passes[Idx]->run(F)) {
+ Changed = true;
+ if (AM)
+ AM->invalidateAll(F);
+ }
return Changed;
}
Modified: llvm/trunk/unittests/IR/PassManagerTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/PassManagerTest.cpp?rev=195192&r1=195191&r2=195192&view=diff
==============================================================================
--- llvm/trunk/unittests/IR/PassManagerTest.cpp (original)
+++ llvm/trunk/unittests/IR/PassManagerTest.cpp Tue Nov 19 22:39:16 2013
@@ -120,7 +120,7 @@ TEST_F(PassManagerTest, Basic) {
int FunctionPassRunCount = 0;
int AnalyzedInstrCount = 0;
FPM.addPass(TestFunctionPass(AM, FunctionPassRunCount, AnalyzedInstrCount));
- MPM.addPass(FPM);
+ MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
MPM.run(M.get());
EXPECT_EQ(1, ModulePassRunCount);
More information about the llvm-commits
mailing list