[llvm] r281911 - Use call target count to derive the call instruction weight
Dehao Chen via llvm-commits
llvm-commits at lists.llvm.org
Mon Sep 19 09:06:37 PDT 2016
Author: dehao
Date: Mon Sep 19 11:06:37 2016
New Revision: 281911
URL: http://llvm.org/viewvc/llvm-project?rev=281911&view=rev
Log:
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
Modified:
llvm/trunk/include/llvm/ProfileData/SampleProf.h
llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp
llvm/trunk/test/Transforms/SampleProfile/Inputs/inline-coverage.prof
Modified: llvm/trunk/include/llvm/ProfileData/SampleProf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/SampleProf.h?rev=281911&r1=281910&r2=281911&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/SampleProf.h (original)
+++ llvm/trunk/include/llvm/ProfileData/SampleProf.h Mon Sep 19 11:06:37 2016
@@ -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];
Modified: llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp?rev=281911&r1=281910&r2=281911&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp Mon Sep 19 11:06:37 2016
@@ -480,7 +480,9 @@ SampleProfileLoader::getInstWeight(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::emitAnnotation
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();
Modified: llvm/trunk/test/Transforms/SampleProfile/Inputs/inline-coverage.prof
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SampleProfile/Inputs/inline-coverage.prof?rev=281911&r1=281910&r2=281911&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SampleProfile/Inputs/inline-coverage.prof (original)
+++ llvm/trunk/test/Transforms/SampleProfile/Inputs/inline-coverage.prof Mon Sep 19 11:06:37 2016
@@ -4,4 +4,4 @@ main:501438:0
4: 0
0: 0
3: _Z3fool:172746
- 1: 31878
+ 1: 31878 rand:31878
More information about the llvm-commits
mailing list