public FunctionPass {
public:
- static const int ID;
+ static char ID;
BBPassManager(int Depth)
: PMDataManager(Depth), FunctionPass((intptr_t)&ID) {}
}
};
-const int BBPassManager::ID = 0;
+char BBPassManager::ID = 0;
}
namespace llvm {
public PMDataManager,
public PMTopLevelManager {
public:
- static const int ID;
+ static char ID;
FunctionPassManagerImpl(int Depth) :
Pass((intptr_t)&ID), PMDataManager(Depth),
PMTopLevelManager(TLM_Function) { }
///
bool doInitialization(Module &M);
- /// doFinalization - Run all of the initializers for the function passes.
+ /// doFinalization - Run all of the finalizers for the function passes.
///
bool doFinalization(Module &M);
}
};
-const int FunctionPassManagerImpl::ID = 0;
+char FunctionPassManagerImpl::ID = 0;
//===----------------------------------------------------------------------===//
// MPPassManager
//
class MPPassManager : public Pass, public PMDataManager {
public:
- static const int ID;
+ static char ID;
MPPassManager(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth) { }
// Delete on the fly managers.
std::map<Pass *, FunctionPassManagerImpl *> OnTheFlyManagers;
};
-const int MPPassManager::ID = 0;
+char MPPassManager::ID = 0;
//===----------------------------------------------------------------------===//
// PassManagerImpl
//
public PMTopLevelManager {
public:
- static const int ID;
+ static char ID;
PassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth),
PMTopLevelManager(TLM_Pass) { }
};
-const int PassManagerImpl::ID = 0;
+char PassManagerImpl::ID = 0;
} // End of llvm namespace
namespace {
}
/// Set pass P as the last user of the given analysis passes.
-void PMTopLevelManager::setLastUser(std::vector<Pass *> &AnalysisPasses,
+void PMTopLevelManager::setLastUser(SmallVector<Pass *, 12> &AnalysisPasses,
Pass *P) {
- for (std::vector<Pass *>::iterator I = AnalysisPasses.begin(),
+ for (SmallVector<Pass *, 12>::iterator I = AnalysisPasses.begin(),
E = AnalysisPasses.end(); I != E; ++I) {
Pass *AP = *I;
LastUser[AP] = P;
}
/// Collect passes whose last user is P
-void PMTopLevelManager::collectLastUses(std::vector<Pass *> &LastUses,
+void PMTopLevelManager::collectLastUses(SmallVector<Pass *, 12> &LastUses,
Pass *P) {
for (std::map<Pass *, Pass *>::iterator LUI = LastUser.begin(),
LUE = LastUser.end(); LUI != LUE; ++LUI)
// TODO : Allocate function manager for this pass, other wise required set
// may be inserted into previous function manager
- // If this Analysis is already requested by one of the previous pass
- // and it is still available then do not insert new pass in the queue again.
- if (findAnalysisPass(P->getPassInfo()))
- return;
-
// Give pass a chance to prepare the stage.
P->preparePassManager(activeStack);
return true;
}
+/// verifyPreservedAnalysis -- Verify analysis presreved by pass P.
+void PMDataManager::verifyPreservedAnalysis(Pass *P) {
+ AnalysisUsage AnUsage;
+ P->getAnalysisUsage(AnUsage);
+ const std::vector<AnalysisID> &PreservedSet = AnUsage.getPreservedSet();
+
+ // Verify preserved analysis
+ for (std::vector<AnalysisID>::const_iterator I = PreservedSet.begin(),
+ E = PreservedSet.end(); I != E; ++I) {
+ AnalysisID AID = *I;
+ Pass *AP = findAnalysisPass(AID, true);
+ if (AP)
+ AP->verifyAnalysis();
+ }
+}
+
/// Remove Analyss not preserved by Pass P
void PMDataManager::removeNotPreservedAnalysis(Pass *P) {
AnalysisUsage AnUsage;
P->getAnalysisUsage(AnUsage);
-
if (AnUsage.getPreservesAll())
return;
void PMDataManager::removeDeadPasses(Pass *P, std::string Msg,
enum PassDebuggingString DBG_STR) {
- std::vector<Pass *> DeadPasses;
+ SmallVector<Pass *, 12> DeadPasses;
// If this is a on the fly manager then it does not have TPM.
if (!TPM)
TPM->collectLastUses(DeadPasses, P);
- for (std::vector<Pass *>::iterator I = DeadPasses.begin(),
+ for (SmallVector<Pass *, 12>::iterator I = DeadPasses.begin(),
E = DeadPasses.end(); I != E; ++I) {
dumpPassInfo(*I, FREEING_MSG, DBG_STR, Msg);
// If a FunctionPass F is the last user of ModulePass info M
// then the F's manager, not F, records itself as a last user of M.
- std::vector<Pass *> TransferLastUses;
+ SmallVector<Pass *, 12> TransferLastUses;
if (ProcessAnalysis) {
// At the moment, this pass is the last user of all required passes.
- std::vector<Pass *> LastUses;
+ SmallVector<Pass *, 12> LastUses;
SmallVector<Pass *, 8> RequiredPasses;
SmallVector<AnalysisID, 8> ReqAnalysisNotAvailable;
// Print list of passes that are last used by P.
void PMDataManager::dumpLastUses(Pass *P, unsigned Offset) const{
- std::vector<Pass *> LUses;
+ SmallVector<Pass *, 12> LUses;
// If this is a on the fly manager then it does not have TPM.
if (!TPM)
TPM->collectLastUses(LUses, P);
- for (std::vector<Pass *>::iterator I = LUses.begin(),
+ for (SmallVector<Pass *, 12>::iterator I = LUses.begin(),
E = LUses.end(); I != E; ++I) {
llvm::cerr << "--" << std::string(Offset*2, ' ');
(*I)->dumpPassStructure(0);
cerr << "Executing Pass '" << P->getPassName();
break;
case MODIFICATION_MSG:
- cerr << "' Made Modification '" << P->getPassName();
+ cerr << "Made Modification '" << P->getPassName();
break;
case FREEING_MSG:
cerr << " Freeing Pass '" << P->getPassName();
}
switch (S2) {
case ON_BASICBLOCK_MSG:
- cerr << "' on BasicBlock '" << Msg << "...\n";
+ cerr << "' on BasicBlock '" << Msg << "'...\n";
break;
case ON_FUNCTION_MSG:
- cerr << "' on Function '" << Msg << "...\n";
+ cerr << "' on Function '" << Msg << "'...\n";
break;
case ON_MODULE_MSG:
- cerr << "' on Module '" << Msg << "...\n";
+ cerr << "' on Module '" << Msg << "'...\n";
break;
case ON_LOOP_MSG:
- cerr << "' on Loop " << Msg << "...\n";
+ cerr << "' on Loop " << Msg << "'...\n";
break;
case ON_CG_MSG:
- cerr << "' on Call Graph " << Msg << "...\n";
+ cerr << "' on Call Graph " << Msg << "'...\n";
break;
default:
break;
}
}
+/// Add RequiredPass into list of lower level passes required by pass P.
+/// RequiredPass is run on the fly by Pass Manager when P requests it
+/// through getAnalysis interface.
+/// This should be handled by specific pass manager.
+void PMDataManager::addLowerLevelRequiredPass(Pass *P, Pass *RequiredPass) {
+ if (TPM) {
+ TPM->dumpArguments();
+ TPM->dumpPasses();
+ }
+ assert (0 && "Unable to handle Pass that requires lower level Analysis pass");
+}
+
// Destructor
PMDataManager::~PMDataManager() {
dumpPassInfo(BP, MODIFICATION_MSG, ON_BASICBLOCK_MSG, (*I).getName());
dumpAnalysisSetInfo("Preserved", BP, AnUsage.getPreservedSet());
+ verifyPreservedAnalysis(BP);
removeNotPreservedAnalysis(BP);
recordAvailableAnalysis(BP);
removeDeadPasses(BP, (*I).getName(), ON_BASICBLOCK_MSG);
bool FunctionPassManager::run(Function &F) {
std::string errstr;
if (MP->materializeFunction(&F, &errstr)) {
- cerr << "Error reading bytecode file: " << errstr << "\n";
+ cerr << "Error reading bitcode file: " << errstr << "\n";
abort();
}
return FPM->run(F);
return FPM->doInitialization(*MP->getModule());
}
-/// doFinalization - Run all of the initializers for the function passes.
+/// doFinalization - Run all of the finalizers for the function passes.
///
bool FunctionPassManager::doFinalization() {
return FPM->doFinalization(*MP->getModule());
//===----------------------------------------------------------------------===//
// FPPassManager implementation
-const int FPPassManager::ID = 0;
+char FPPassManager::ID = 0;
/// Print passes managed by this manager
void FPPassManager::dumpPassStructure(unsigned Offset) {
llvm::cerr << std::string(Offset*2, ' ') << "FunctionPass Manager\n";
dumpPassInfo(FP, MODIFICATION_MSG, ON_FUNCTION_MSG, F.getName());
dumpAnalysisSetInfo("Preserved", FP, AnUsage.getPreservedSet());
+ verifyPreservedAnalysis(FP);
removeNotPreservedAnalysis(FP);
recordAvailableAnalysis(FP);
removeDeadPasses(FP, F.getName(), ON_FUNCTION_MSG);
M.getModuleIdentifier());
dumpAnalysisSetInfo("Preserved", MP, AnUsage.getPreservedSet());
+ verifyPreservedAnalysis(MP);
removeNotPreservedAnalysis(MP);
recordAvailableAnalysis(MP);
removeDeadPasses(MP, M.getModuleIdentifier(), ON_MODULE_MSG);
FPP->add(RequiredPass);
// Register P as the last user of RequiredPass.
- std::vector<Pass *> LU;
+ SmallVector<Pass *, 12> LU;
LU.push_back(RequiredPass);
FPP->setLastUser(LU, P);
}
PM->setTopLevelManager(TPM);
}
- AnalysisResolver *AR = new AnalysisResolver(*Top);
- P->setResolver(AR);
-
S.push_back(PM);
}