RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-04 18:38:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make new PM honor -fdebug-info-for-profiling

Browse Source 
Summary: The new PM needs to invoke add-discriminator pass when building with -fdebug-info-for-profiling.

Reviewers: chandlerc, davidxl

Reviewed By: chandlerc

Subscribers: sanjoy, llvm-commits

Differential Revision: https://reviews.llvm.org/D35744

llvm-svn: 309121
This commit is contained in:
Dehao Chen 2017-07-26 15:01:20 +00:00
parent a5ba4551fd
commit c91f04adba
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Passes/PassBuilder.h
View File

@ -30,13 +30,16 @@ class TargetMachine;
/// A struct capturing PGO tunables.
struct PGOOptions {
PGOOptions(std::string ProfileGenFile = "", std::string ProfileUseFile = "",
std::string SampleProfileFile = "", bool RunProfileGen = false)
std::string SampleProfileFile = "", bool RunProfileGen = false,
bool SamplePGOSupport = false)
: ProfileGenFile(ProfileGenFile), ProfileUseFile(ProfileUseFile),
SampleProfileFile(SampleProfileFile), RunProfileGen(RunProfileGen) {}
SampleProfileFile(SampleProfileFile), RunProfileGen(RunProfileGen),
SamplePGOSupport(SamplePGOSupport || !SampleProfileFile.empty()) {}
std::string ProfileGenFile;
std::string ProfileUseFile;
std::string SampleProfileFile;
bool RunProfileGen;
bool SamplePGOSupport;
};
/// \brief This class provides access to building LLVM's passes.

2
lib/Passes/PassBuilder.cpp
View File

@ -535,6 +535,8 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
// Create an early function pass manager to cleanup the output of the
// frontend.
FunctionPassManager EarlyFPM(DebugLogging);
if (PGOOpt && PGOOpt->SamplePGOSupport)
EarlyFPM.addPass(AddDiscriminatorsPass());
EarlyFPM.addPass(SimplifyCFGPass());
EarlyFPM.addPass(SROA());
EarlyFPM.addPass(EarlyCSEPass());

3
test/Other/new-pm-pgo.ll
View File

@ -2,10 +2,13 @@
; RUN: llvm-profdata merge %S/Inputs/new-pm-pgo.proftext -o %t.profdata
; RUN: opt -debug-pass-manager -passes='default<O2>' -pgo-kind=new-pm-pgo-instr-use-pipeline -profile-file='%t.profdata' %s 2>&1 |FileCheck %s --check-prefixes=USE
; RUN: opt -debug-pass-manager -passes='default<O2>' -pgo-kind=new-pm-pgo-sample-use-pipeline -profile-file='%S/Inputs/new-pm-pgo.prof' %s 2>&1 |FileCheck %s --check-prefixes=SAMPLE_USE
; RUN: opt -debug-pass-manager -passes='default<O2>' -new-pm-debug-info-for-profiling %s 2>&1 |FileCheck %s --check-prefixes=SAMPLE_GEN
;
; GEN: Running pass: PGOInstrumentationGen
; USE: Running pass: PGOInstrumentationUse
; SAMPLE_USE: Running pass: AddDiscriminators
; SAMPLE_USE: Running pass: SampleProfileLoaderPass
; SAMPLE_GEN: Running pass: AddDiscriminators
define void @foo() {
ret void

8
tools/opt/NewPMDriver.cpp
View File

@ -94,6 +94,9 @@ static cl::opt<PGOKind> PGOKindFlag(
"Use sampled profile to guide PGO.")));
static cl::opt<std::string> ProfileFile(
"profile-file", cl::desc("Path to the profile."), cl::Hidden);
static cl::opt<bool> DebugInfoForProfiling(
"new-pm-debug-info-for-profiling", cl::init(false), cl::Hidden,
cl::desc("Emit special debug info to enable PGO profile generation."));
/// @}}
template <typename PassManagerT>
@ -179,7 +182,10 @@ bool llvm::runPassPipeline(StringRef Arg0, Module &M, TargetMachine *TM,
P = PGOOptions("", "", ProfileFile, false);
break;
case NoPGO:
P = None;
if (DebugInfoForProfiling)
P = PGOOptions("", "", "", false, true);
else
P = None;
}
PassBuilder PB(TM, P);
registerEPCallbacks(PB, VerifyEachPass, DebugPM);