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

Use call target count to derive the call instruction weight 

Summary: The call target count profile is directly derived from LBR branch->target data. This is more reliable than instruction frequency profiles that could be moved across basic block boundaries. This patches uses call target count profile to annotate call instructions.

Reviewers: davidxl, dnovillo

Subscribers: llvm-commits

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

llvm-svn: 281911
This commit is contained in:
Dehao Chen 2016-09-19 16:06:37 +00:00
parent dd6f8cab08
commit 38e3731c47
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
llvm/include/llvm/ProfileData/SampleProf.h
View File

@ -222,6 +222,21 @@ public:
return ret->second.getSamples();
}
/// Return the total number of call target samples collected at a given
/// location. Each location is specified by \p LineOffset and
/// \p Discriminator. If the location is not found in profile, return error.
ErrorOr<uint64_t> findCallSamplesAt(uint32_t LineOffset,
uint32_t Discriminator) const {
const auto &ret = BodySamples.find(LineLocation(LineOffset, Discriminator));
if (ret == BodySamples.end())
return std::error_code();
uint64_t T = 0;
for (const auto &t_c : ret->second.getCallTargets()) {
T += t_c.second;
}
return T;
}
/// Return the function samples at the given callsite location.
FunctionSamples &functionSamplesAt(const LineLocation &Loc) {
return CallsiteSamples[Loc];

8
llvm/lib/Transforms/IPO/SampleProfile.cpp
View File

@ -480,7 +480,9 @@ SampleProfileLoader::getInstWeight(const Instruction &Inst) const {
uint32_t LineOffset = getOffset(Lineno, HeaderLineno);
uint32_t Discriminator = DIL->getDiscriminator();
ErrorOr<uint64_t> R = FS->findSamplesAt(LineOffset, Discriminator);
ErrorOr<uint64_t> R = IsCall
? FS->findCallSamplesAt(LineOffset, Discriminator)
: FS->findSamplesAt(LineOffset, Discriminator);
if (R) {
bool FirstMark =
CoverageTracker.markSamplesUsed(FS, LineOffset, Discriminator, R.get());
@ -1272,10 +1274,10 @@ bool SampleProfileLoader::emitAnnotations(Function &F) {
char SampleProfileLoaderLegacyPass::ID = 0;
INITIALIZE_PASS_BEGIN(SampleProfileLoaderLegacyPass, "sample-profile",
"Sample Profile loader", false, false)
"Sample Profile loader", false, false)
INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker)
INITIALIZE_PASS_END(SampleProfileLoaderLegacyPass, "sample-profile",
"Sample Profile loader", false, false)
"Sample Profile loader", false, false)
bool SampleProfileLoader::doInitialization(Module &M) {
auto &Ctx = M.getContext();

2
llvm/test/Transforms/SampleProfile/Inputs/inline-coverage.prof
View File

@ -4,4 +4,4 @@ main:501438:0
4: 0
0: 0
3: _Z3fool:172746
1: 31878
1: 31878 rand:31878