maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PM] code refactoring -- preparation for new PM porting /NFC 

llvm-svn: 268851
This commit is contained in:
Xinliang David Li 2016-05-07 05:39:12 +00:00
parent 2266a8d473
commit d55827f7b2
6 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/InitializePasses.h
View File

@ -124,7 +124,7 @@ void initializeExpandPostRAPass(PassRegistry&);
void initializeAAResultsWrapperPassPass(PassRegistry &);
void initializeGCOVProfilerPass(PassRegistry&);
void initializePGOInstrumentationGenLegacyPassPass(PassRegistry&);
void initializePGOInstrumentationUsePass(PassRegistry&);
void initializePGOInstrumentationUseLegacyPassPass(PassRegistry&);
void initializePGOIndirectCallPromotionPass(PassRegistry&);
void initializeInstrProfilingLegacyPassPass(PassRegistry &);
void initializeAddressSanitizerPass(PassRegistry&);

2
llvm/include/llvm/LinkAllPasses.h
View File

@ -90,7 +90,7 @@ namespace {
(void) llvm::createDomViewerPass();
(void) llvm::createGCOVProfilerPass();
(void) llvm::createPGOInstrumentationGenLegacyPass();
(void) llvm::createPGOInstrumentationUsePass();
(void) llvm::createPGOInstrumentationUseLegacyPass();
(void) llvm::createPGOIndirectCallPromotionPass();
(void) llvm::createInstrProfilingLegacyPass();
(void) llvm::createFunctionImportPass();

2
llvm/include/llvm/Transforms/Instrumentation.h
View File

@ -82,7 +82,7 @@ ModulePass *createGCOVProfilerPass(const GCOVOptions &Options =
// PGO Instrumention
ModulePass *createPGOInstrumentationGenLegacyPass();
ModulePass *
createPGOInstrumentationUsePass(StringRef Filename = StringRef(""));
createPGOInstrumentationUseLegacyPass(StringRef Filename = StringRef(""));
ModulePass *createPGOIndirectCallPromotionPass(bool InLTO = false);
/// Options for the frontend instrumentation based profiling pass.

2
llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
View File

@ -219,7 +219,7 @@ void PassManagerBuilder::addPGOInstrPasses(legacy::PassManagerBase &MPM) {
MPM.add(createInstrProfilingLegacyPass(Options));
}
if (!PGOInstrUse.empty())
MPM.add(createPGOInstrumentationUsePass(PGOInstrUse));
MPM.add(createPGOInstrumentationUseLegacyPass(PGOInstrUse));
}
void PassManagerBuilder::addFunctionSimplificationPasses(
legacy::PassManagerBase &MPM) {

2
llvm/lib/Transforms/Instrumentation/Instrumentation.cpp
View File

@ -61,7 +61,7 @@ void llvm::initializeInstrumentation(PassRegistry &Registry) {
initializeBoundsCheckingPass(Registry);
initializeGCOVProfilerPass(Registry);
initializePGOInstrumentationGenLegacyPassPass(Registry);
initializePGOInstrumentationUsePass(Registry);
initializePGOInstrumentationUseLegacyPassPass(Registry);
initializePGOIndirectCallPromotionPass(Registry);
initializeInstrProfilingLegacyPassPass(Registry);
initializeMemorySanitizerPass(Registry);

49
llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
View File

@ -134,16 +134,17 @@ private:
}
};
class PGOInstrumentationUse : public ModulePass {
class PGOInstrumentationUseLegacyPass : public ModulePass {
public:
static char ID;
// Provide the profile filename as the parameter.
PGOInstrumentationUse(std::string Filename = "")
PGOInstrumentationUseLegacyPass(std::string Filename = "")
: ModulePass(ID), ProfileFileName(Filename) {
if (!PGOTestProfileFile.empty())
ProfileFileName = PGOTestProfileFile;
initializePGOInstrumentationUsePass(*PassRegistry::getPassRegistry());
initializePGOInstrumentationUseLegacyPassPass(
*PassRegistry::getPassRegistry());
}
const char *getPassName() const override {
@ -151,6 +152,9 @@ public:
}
private:
bool annotateAllFunctions(
Module &M, function_ref<BranchProbabilityInfo &(Function &)> LookupBPI,
function_ref<BlockFrequencyInfo &(Function &)> LookupBFI);
std::string ProfileFileName;
std::unique_ptr<IndexedInstrProfReader> PGOReader;
bool runOnModule(Module &M) override;
@ -173,16 +177,16 @@ ModulePass *llvm::createPGOInstrumentationGenLegacyPass() {
return new PGOInstrumentationGenLegacyPass();
}
char PGOInstrumentationUse::ID = 0;
INITIALIZE_PASS_BEGIN(PGOInstrumentationUse, "pgo-instr-use",
char PGOInstrumentationUseLegacyPass::ID = 0;
INITIALIZE_PASS_BEGIN(PGOInstrumentationUseLegacyPass, "pgo-instr-use",
"Read PGO instrumentation profile.", false, false)
INITIALIZE_PASS_DEPENDENCY(BlockFrequencyInfoWrapperPass)
INITIALIZE_PASS_DEPENDENCY(BranchProbabilityInfoWrapperPass)
INITIALIZE_PASS_END(PGOInstrumentationUse, "pgo-instr-use",
INITIALIZE_PASS_END(PGOInstrumentationUseLegacyPass, "pgo-instr-use",
"Read PGO instrumentation profile.", false, false)
ModulePass *llvm::createPGOInstrumentationUsePass(StringRef Filename) {
return new PGOInstrumentationUse(Filename.str());
ModulePass *llvm::createPGOInstrumentationUseLegacyPass(StringRef Filename) {
return new PGOInstrumentationUseLegacyPass(Filename.str());
}
namespace {
@ -832,10 +836,9 @@ static void setPGOCountOnFunc(PGOUseFunc &Func,
}
}
bool PGOInstrumentationUse::runOnModule(Module &M) {
if (skipModule(M))
return false;
bool PGOInstrumentationUseLegacyPass::annotateAllFunctions(
Module &M, function_ref<BranchProbabilityInfo &(Function &)> LookupBPI,
function_ref<BlockFrequencyInfo &(Function &)> LookupBFI) {
DEBUG(dbgs() << "Read in profile counters: ");
auto &Ctx = M.getContext();
// Read the counter array from file.
@ -864,11 +867,9 @@ bool PGOInstrumentationUse::runOnModule(Module &M) {
for (auto &F : M) {
if (F.isDeclaration())
continue;
BranchProbabilityInfo *BPI =
&(getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI());
BlockFrequencyInfo *BFI =
&(getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI());
PGOUseFunc Func(F, &M, BPI, BFI);
auto &BPI = LookupBPI(F);
auto &BFI = LookupBFI(F);
PGOUseFunc Func(F, &M, &BPI, &BFI);
setPGOCountOnFunc(Func, PGOReader.get());
PGOUseFunc::FuncFreqAttr FreqAttr = Func.getFuncFreqAttr();
if (FreqAttr == PGOUseFunc::FFA_Cold)
@ -890,3 +891,17 @@ bool PGOInstrumentationUse::runOnModule(Module &M) {
return true;
}
bool PGOInstrumentationUseLegacyPass::runOnModule(Module &M) {
if (skipModule(M))
return false;
auto LookupBPI = [this](Function &F) -> BranchProbabilityInfo & {
return this->getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI();
};
auto LookupBFI = [this](Function &F) -> BlockFrequencyInfo & {
return this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
};
return annotateAllFunctions(M, LookupBPI, LookupBFI);
}