[PATCH] D24410: 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:15:04 PDT 2016
danielcdh updated this revision to Diff 71840.
danielcdh added a comment.
format
https://reviews.llvm.org/D24410
Files:
include/llvm/ProfileData/SampleProf.h
lib/Transforms/IPO/SampleProfile.cpp
test/Transforms/SampleProfile/Inputs/inline-coverage.prof
Index: test/Transforms/SampleProfile/Inputs/inline-coverage.prof
===================================================================
--- test/Transforms/SampleProfile/Inputs/inline-coverage.prof
+++ test/Transforms/SampleProfile/Inputs/inline-coverage.prof
@@ -4,4 +4,4 @@
4: 0
0: 0
3: _Z3fool:172746
- 1: 31878
+ 1: 31878 rand:31878
Index: lib/Transforms/IPO/SampleProfile.cpp
===================================================================
--- lib/Transforms/IPO/SampleProfile.cpp
+++ lib/Transforms/IPO/SampleProfile.cpp
@@ -480,7 +480,9 @@
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 @@
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();
Index: include/llvm/ProfileData/SampleProf.h
===================================================================
--- include/llvm/ProfileData/SampleProf.h
+++ include/llvm/ProfileData/SampleProf.h
@@ -222,6 +222,21 @@
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];
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24410.71840.patch
Type: text/x-patch
Size: 2700 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160919/2a024a47/attachment.bin>
More information about the llvm-commits
mailing list