[llvm] r353491 - lvm-dwarfdump: Stop counting out-of-line subprogram in the "inlined functions" statistic.
Caroline Tice via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 7 16:51:33 PST 2019
Author: ctice
Date: Thu Feb 7 16:51:33 2019
New Revision: 353491
URL: http://llvm.org/viewvc/llvm-project?rev=353491&view=rev
Log:
lvm-dwarfdump: Stop counting out-of-line subprogram in the "inlined functions" statistic.
DW_TAG_subprogram DIEs should not be counted in the inlined function statistic. This also addresses the source variables count, as that uses the inlined function count in its calculations.
Differential revision: https://reviews.llvm.org/D57849
Modified:
llvm/trunk/test/tools/llvm-dwarfdump/X86/statistics.ll
llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-multi-cu.ll
llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-single-cu.ll
llvm/trunk/tools/llvm-dwarfdump/Statistics.cpp
Modified: llvm/trunk/test/tools/llvm-dwarfdump/X86/statistics.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/statistics.ll?rev=353491&r1=353490&r2=353491&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/X86/statistics.ll (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/X86/statistics.ll Thu Feb 7 16:51:33 2019
@@ -1,6 +1,6 @@
; RUN: llc -O0 %s -o - -filetype=obj \
; RUN: | llvm-dwarfdump -statistics - | FileCheck %s
-; CHECK: "version":1
+; CHECK: "version":2
; int GlobalConst = 42;
; int Global;
Modified: llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-multi-cu.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-multi-cu.ll?rev=353491&r1=353490&r2=353491&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-multi-cu.ll (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-multi-cu.ll Thu Feb 7 16:51:33 2019
@@ -4,7 +4,7 @@
; Test that abstract origins in multiple CUs are uniqued.
; CHECK: "source functions":4,
-; CHECK-SAME: "inlined functions":5,
+; CHECK-SAME: "inlined functions":2,
; CHECK-SAME: "unique source variables":4
; CHECK-SAME: "source variables":6
; CHECK-SAME: "variables with location":6
Modified: llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-single-cu.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-single-cu.ll?rev=353491&r1=353490&r2=353491&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-single-cu.ll (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/X86/stats-inlining-single-cu.ll Thu Feb 7 16:51:33 2019
@@ -5,7 +5,7 @@
; The results for both tests should be identical.
; CHECK: "source functions":4,
-; CHECK-SAME: "inlined functions":5,
+; CHECK-SAME: "inlined functions":2,
; CHECK-SAME: "unique source variables":4
; CHECK-SAME: "source variables":6
; CHECK-SAME: "variables with location":6
Modified: llvm/trunk/tools/llvm-dwarfdump/Statistics.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/Statistics.cpp?rev=353491&r1=353490&r2=353491&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwarfdump/Statistics.cpp (original)
+++ llvm/trunk/tools/llvm-dwarfdump/Statistics.cpp Thu Feb 7 16:51:33 2019
@@ -23,6 +23,9 @@ struct PerFunctionStats {
StringSet<> VarsInFunction;
/// Compile units also cover a PC range, but have this flag set to false.
bool IsFunction = false;
+ /// Verify function definition has PC addresses (for detecting when
+ /// a function has been inlined everywhere).
+ bool HasPCAddresses = false;
};
/// Holds accumulated global statistics about DIEs.
@@ -136,8 +139,10 @@ static void collectStatsForDie(DWARFDie
GlobalStats.ScopeBytesFromFirstDefinition += BytesInScope;
assert(GlobalStats.ScopeBytesCovered <=
GlobalStats.ScopeBytesFromFirstDefinition);
- } else {
+ } else if (Die.getTag() == dwarf::DW_TAG_member) {
FnStats.ConstantMembers++;
+ } else {
+ FnStats.TotalVarWithLoc += (unsigned)HasLoc;
}
}
@@ -164,6 +169,19 @@ static void collectStatsRecursive(DWARFD
if (Die.find(dwarf::DW_AT_declaration))
return;
+ // PC Ranges.
+ auto RangesOrError = Die.getAddressRanges();
+ if (!RangesOrError) {
+ llvm::consumeError(RangesOrError.takeError());
+ return;
+ }
+
+ auto Ranges = RangesOrError.get();
+ uint64_t BytesInThisScope = 0;
+ for (auto Range : Ranges)
+ BytesInThisScope += Range.HighPC - Range.LowPC;
+ ScopeLowPC = getLowPC(Die);
+
// Count the function.
if (!IsBlock) {
StringRef Name = Die.getName(DINameKind::LinkageName);
@@ -175,23 +193,13 @@ static void collectStatsRecursive(DWARFD
return;
// We've seen an (inlined) instance of this function.
auto &FnStats = FnStatMap[Name];
- FnStats.NumFnInlined++;
+ if (IsInlinedFunction)
+ FnStats.NumFnInlined++;
FnStats.IsFunction = true;
+ if (BytesInThisScope && !IsInlinedFunction)
+ FnStats.HasPCAddresses = true;
}
- // PC Ranges.
- auto RangesOrError = Die.getAddressRanges();
- if (!RangesOrError) {
- llvm::consumeError(RangesOrError.takeError());
- return;
- }
-
- auto Ranges = RangesOrError.get();
- uint64_t BytesInThisScope = 0;
- for (auto Range : Ranges)
- BytesInThisScope += Range.HighPC - Range.LowPC;
- ScopeLowPC = getLowPC(Die);
-
if (BytesInThisScope) {
BytesInScope = BytesInThisScope;
if (IsFunction)
@@ -258,7 +266,7 @@ bool collectStatsForObjectFile(ObjectFil
/// The version number should be increased every time the algorithm is changed
/// (including bug fixes). New metrics may be added without increasing the
/// version.
- unsigned Version = 1;
+ unsigned Version = 2;
unsigned VarTotal = 0;
unsigned VarUnique = 0;
unsigned VarWithLoc = 0;
@@ -267,9 +275,12 @@ bool collectStatsForObjectFile(ObjectFil
for (auto &Entry : Statistics) {
PerFunctionStats &Stats = Entry.getValue();
unsigned TotalVars = Stats.VarsInFunction.size() * Stats.NumFnInlined;
+ // Count variables in concrete out-of-line functions and in global scope.
+ if (Stats.HasPCAddresses || !Stats.IsFunction)
+ TotalVars += Stats.VarsInFunction.size();
unsigned Constants = Stats.ConstantMembers;
VarWithLoc += Stats.TotalVarWithLoc + Constants;
- VarTotal += TotalVars + Constants;
+ VarTotal += TotalVars;
VarUnique += Stats.VarsInFunction.size();
LLVM_DEBUG(for (auto &V : Stats.VarsInFunction) llvm::dbgs()
<< Entry.getKey() << ": " << V.getKey() << "\n");
More information about the llvm-commits
mailing list