From 90c4e8b70ceb3b6089d78554ba01d7df16743c26 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Mon, 23 Feb 2015 21:21:34 +0000 Subject: [PATCH] InstrProf: Teach llvm-cov to show the max count instead of the last When multiple regions start on the same line, llvm-cov was just showing the count of the last one as the line count. This can be confusing and misleading for things like one-liner loops, where the count at the end isn't very interesting, or even "if" statements with an opening brace at the end of the line. Instead, use the maximum of all of the region start counts. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230263 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-cov/showLineExecutionCounts.cpp | 4 ++-- tools/llvm-cov/SourceCoverageView.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/tools/llvm-cov/showLineExecutionCounts.cpp b/test/tools/llvm-cov/showLineExecutionCounts.cpp index 34baa574dab..625c3f2732d 100644 --- a/test/tools/llvm-cov/showLineExecutionCounts.cpp +++ b/test/tools/llvm-cov/showLineExecutionCounts.cpp @@ -12,11 +12,11 @@ int main() { // CHECK: 1| [[@LINE]]|int main( x = 1; // CHECK: 1| [[@LINE]]| x = 1 } // CHECK: 1| [[@LINE]]| } // CHECK: 1| [[@LINE]]| - for (int i = 0; i < 100; ++i) { // CHECK: 100| [[@LINE]]| for ( + for (int i = 0; i < 100; ++i) { // CHECK: 101| [[@LINE]]| for ( x = 1; // CHECK: 100| [[@LINE]]| x = 1 } // CHECK: 100| [[@LINE]]| } // CHECK: 1| [[@LINE]]| - x = x < 10 ? x + 1 : x - 1; // CHECK: 0| [[@LINE]]| x = + x = x < 10 ? x + 1 : x - 1; // CHECK: 1| [[@LINE]]| x = x = x > 10 ? // CHECK: 1| [[@LINE]]| x = x - 1: // CHECK: 0| [[@LINE]]| x x + 1; // CHECK: 1| [[@LINE]]| x diff --git a/tools/llvm-cov/SourceCoverageView.h b/tools/llvm-cov/SourceCoverageView.h index d92a7486d9d..9e6fe5f3500 100644 --- a/tools/llvm-cov/SourceCoverageView.h +++ b/tools/llvm-cov/SourceCoverageView.h @@ -90,15 +90,14 @@ private: bool hasMultipleRegions() const { return RegionCount > 1; } void addRegionStartCount(uint64_t Count) { - Mapped = true; - ExecutionCount = Count; + // The max of all region starts is the most interesting value. + addRegionCount(RegionCount ? std::max(ExecutionCount, Count) : Count); ++RegionCount; } void addRegionCount(uint64_t Count) { Mapped = true; - if (!RegionCount) - ExecutionCount = Count; + ExecutionCount = Count; } }; -- 2.34.1