Skip to content

[llvm-cov] Improve line count for wrapped segments #143910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[llvm-cov] Improve line count for wrapped segments #143910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions compiler-rt/test/profile/Linux/coverage-exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static
int test_no_exception() { // CHECK: [[@LINE]]| 1|int test_no_exception()
try { // CHECK: [[@LINE]]| 1| try {
do_throw(false); // CHECK: [[@LINE]]| 1| do_throw(
} catch (...) { // CHECK: [[@LINE]]| 1| } catch (
} catch (...) { // CHECK: [[@LINE]]| 0| } catch (
abort(); // CHECK: [[@LINE]]| 0| abort(
} // CHECK: [[@LINE]]| 0| }
printf("%s\n", __func__); // CHECK: [[@LINE]]| 1| printf(
Expand Down Expand Up @@ -78,7 +78,7 @@ static
int test_exception_macro_nested() { // CHECK: [[@LINE]]| 1|int test_exception_macro_nested()
try { // CHECK: [[@LINE]]| 1| try {
TRY_AND_CATCH_ALL(do_throw(true)); // CHECK: [[@LINE]]| 1| TRY_AND_CATCH_ALL(
} catch (...) { // CHECK: [[@LINE]]| 1| } catch (
} catch (...) { // CHECK: [[@LINE]]| 0| } catch (
abort(); // CHECK: [[@LINE]]| 0| abort(
} // CHECK: [[@LINE]]| 0| }
printf("%s\n", __func__); // CHECK: [[@LINE]]| 1| printf(
Expand All @@ -104,10 +104,10 @@ int test_conditional(int i) { // CHECK: [[@LINE]]| 1|int test_conditi
try { // CHECK: [[@LINE]]| 1| try {
if (i % 2 == 0) { // CHECK: [[@LINE]]| 1| if (
printf("%s\n", __func__); // CHECK: [[@LINE]]| 1| printf(
} else { // CHECK: [[@LINE]]| 1| } else {
} else { // CHECK: [[@LINE]]| 0| } else {
do_throw(true); // CHECK: [[@LINE]]| 0| do_throw(
} // CHECK: [[@LINE]]| 0| }
} catch (...) { // CHECK: [[@LINE]]| 1| } catch (
} catch (...) { // CHECK: [[@LINE]]| 0| } catch (
abort(); // CHECK: [[@LINE]]| 0| abort(
} // CHECK: [[@LINE]]| 0| }
return 0; // CHECK: [[@LINE]]| 1| return
Expand All @@ -117,11 +117,11 @@ static
int test_multiple_catch() { // CHECK: [[@LINE]]| 1|int test_multiple_catch()
try { // CHECK: [[@LINE]]| 1| try {
do_throw(true); // CHECK: [[@LINE]]| 1| do_throw(
} catch (double) { // CHECK: [[@LINE]]| 1| } catch (double)
} catch (double) { // CHECK: [[@LINE]]| 0| } catch (double)
abort(); // CHECK: [[@LINE]]| 0| abort(
} catch (bool) { // CHECK: [[@LINE]]| 1| } catch (bool)
printf("bool\n"); // CHECK: [[@LINE]]| 1| printf(
} catch (float) { // CHECK: [[@LINE]]| 1| } catch (float)
} catch (float) { // CHECK: [[@LINE]]| 0| } catch (float)
abort(); // CHECK: [[@LINE]]| 0| abort(
} catch (...) { // CHECK: [[@LINE]]| 0| } catch (
abort(); // CHECK: [[@LINE]]| 0| abort(
Expand Down
49 changes: 49 additions & 0 deletions compiler-rt/test/profile/Linux/coverage-nested-macro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// REQUIRES: lld-available
// XFAIL: powerpc64-target-arch

// RUN: %clang_profgen -fuse-ld=lld -fcoverage-mapping -o %t %s
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-profdata merge -o %t.profdata %t.profraw
// RUN: llvm-cov show %t -instr-profile=%t.profdata 2>&1 | FileCheck %s --match-full-lines

// CHECK: 32| 0|#define MY_ID(x) ((x) ? 1 : 2)
// CHECK: 33| |
// CHECK: 34| |#define MY_LOG(fmt, ...) \
// CHECK: 35| 1| { \
// CHECK: 36| 1| if (enabled) { \
// CHECK: 37| 0| printf(fmt, ## __VA_ARGS__); \
// CHECK: 38| 0| } \
// CHECK: 39| 1| }
// CHECK: 40| |
// CHECK: 41| 1|int main(int argc, char *argv[]) {
// CHECK: 42| 1| enabled = argc > 2;
// CHECK: 43| 1| MY_LOG("%d, %s, %d\n",
// CHECK: 44| 0| MY_ID(argc > 3),
// CHECK: 45| 0| "a",
// CHECK: 46| 0| 1);
// CHECK: 47| 1| return 0;
// CHECK: 48| 1|}

#include <stdio.h>

static int enabled = 0;

// clang-format off
#define MY_ID(x) ((x) ? 1 : 2)

#define MY_LOG(fmt, ...) \
{ \
if (enabled) { \
printf(fmt, ## __VA_ARGS__); \
} \
}

int main(int argc, char *argv[]) {
enabled = argc > 2;
MY_LOG("%d, %s, %d\n",
MY_ID(argc > 3),
"a",
1);
return 0;
}
// clang-format on
10 changes: 6 additions & 4 deletions llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1567,11 +1567,13 @@ LineCoverageStats::LineCoverageStats(
}

// Pick the max count from the non-gap, region entry segments and the
// wrapped count.
if (WrappedSegment)
ExecutionCount = WrappedSegment->Count;
if (!MinRegionCount)
// wrapped count. But, only consider the wrapped count if no regions start
// on this line.
if (!MinRegionCount) {
if (WrappedSegment)
ExecutionCount = WrappedSegment->Count;
return;
}
for (const auto *LS : LineSegments)
if (isStartOfRegion(LS))
ExecutionCount = std::max(ExecutionCount, LS->Count);
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-cov/Inputs/instrprof-comdat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ template <class T> T FOO<T>::DoIt(T ti) { // HEADER: [[@LINE]]| 2|template
for (T I = 0; I < ti; I++) { // HEADER: [[@LINE]]| 22| for (T
t += I; // HEADER: [[@LINE]]| 20| t += I;
if (I > ti / 2) // HEADER: [[@LINE]]| 20| if (I > ti
t -= 1; // HEADER: [[@LINE]]| 20| t -= 1;
t -= 1; // HEADER: [[@LINE]]| 8| t -= 1;
} // HEADER: [[@LINE]]| 20| }
// HEADER: [[@LINE]]| 2|
return t; // HEADER: [[@LINE]]| 2| return t;
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/tools/llvm-cov/branch-c-general.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@
// REPORT-NEXT: ---
// REPORT-NEXT: simple_loops 8 0 100.00% 9 0 100.00% 6 0 100.00%
// REPORT-NEXT: conditionals 24 0 100.00% 15 0 100.00% 16 2 87.50%
// REPORT-NEXT: early_exits 20 4 80.00% 25 2 92.00% 16 6 62.50%
// REPORT-NEXT: jumps 39 12 69.23% 48 2 95.83% 26 9 65.38%
// REPORT-NEXT: switches 28 5 82.14% 38 4 89.47% 28 7 75.00%
// REPORT-NEXT: early_exits 20 4 80.00% 25 3 88.00% 16 6 62.50%
// REPORT-NEXT: jumps 39 12 69.23% 48 4 91.67% 26 9 65.38%
// REPORT-NEXT: switches 28 5 82.14% 38 5 86.84% 28 7 75.00%
// REPORT-NEXT: big_switch 25 1 96.00% 32 0 100.00% 30 6 80.00%
// REPORT-NEXT: boolean_operators 16 0 100.00% 13 0 100.00% 22 2 90.91%
// REPORT-NEXT: boolop_loops 19 0 100.00% 14 0 100.00% 16 2 87.50%
// REPORT-NEXT: conditional_operator 4 2 50.00% 8 0 100.00% 4 2 50.00%
// REPORT-NEXT: conditional_operator 4 2 50.00% 8 1 87.50% 4 2 50.00%
// REPORT-NEXT: do_fallthrough 9 0 100.00% 12 0 100.00% 6 0 100.00%
// REPORT-NEXT: main 1 0 100.00% 16 0 100.00% 0 0 0.00%
// REPORT-NEXT: c-general.c:static_func 4 0 100.00% 4 0 100.00% 2 0 100.00%
// REPORT-NEXT: ---
// REPORT-NEXT: TOTAL 197 24 87.82% 234 8 96.58% 172 36 79.07%
// REPORT-NEXT: TOTAL 197 24 87.82% 234 13 94.44% 172 36 79.07%

// Test file-level report.
// RUN: llvm-profdata merge %S/Inputs/branch-c-general.proftext -o %t.profdata
Expand Down Expand Up @@ -157,7 +157,7 @@
// HTML-INDEX: <td class='column-entry-green'>
// HTML-INDEX: 100.00% (12/12)
// HTML-INDEX: <td class='column-entry-yellow'>
// HTML-INDEX: 96.58% (226/234)
// HTML-INDEX: 94.44% (221/234)
// HTML-INDEX: <td class='column-entry-yellow'>
// HTML-INDEX: 87.82% (173/197)
// HTML-INDEX: <td class='column-entry-red'>
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-cov/branch-noShowBranch.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
// REPORT-NOT: do_fallthrough 9 0 100.00% 12 0 100.00% 6 0 100.00%
// REPORT-NOT: main 1 0 100.00% 16 0 100.00% 0 0 0.00%
// REPORT-NOT: c-general.c:static_func 4 0 100.00% 4 0 100.00% 2 0 100.00%
// REPORT: TOTAL 197 24 87.82% 234 8 96.58%
// REPORT: TOTAL 197 24 87.82% 234 13 94.44%
// REPORT-NOT: TOTAL 197 24 87.82% 234 8 96.58% 172 36 79.07%
4 changes: 2 additions & 2 deletions llvm/test/tools/llvm-cov/ignore-filename-regex.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ REPORT_IGNORE_DIR-NOT: {{.*}}extra{{[/\\]}}dec.h{{.*}}
REPORT_IGNORE_DIR-NOT: {{.*}}extra{{[/\\]}}inc.h{{.*}}
REPORT_IGNORE_DIR: {{.*}}abs.h{{.*}}
REPORT_IGNORE_DIR: {{.*}}main.cc{{.*}}
REPORT_IGNORE_DIR: {{^}}TOTAL 5{{.*}}100.00%{{$}}
REPORT_IGNORE_DIR: {{^}}TOTAL 5{{.*}}90.00%{{$}}

# Ignore all files from "extra" directory even when SOURCES specified.
RUN: llvm-cov report -instr-profile %S/Inputs/sources_specified/main.profdata \
Expand All @@ -35,7 +35,7 @@ REPORT_IGNORE_DIR_WITH_SOURCES-NOT: {{.*}}extra{{[/\\]}}dec.h{{.*}}
REPORT_IGNORE_DIR_WITH_SOURCES-NOT: {{.*}}extra{{[/\\]}}inc.h{{.*}}
REPORT_IGNORE_DIR_WITH_SOURCES-NOT: {{.*}}main.cc{{.*}}
REPORT_IGNORE_DIR_WITH_SOURCES: {{.*}}abs.h{{.*}}
REPORT_IGNORE_DIR_WITH_SOURCES: {{^}}TOTAL 4{{.*}}100.00%{{$}}
REPORT_IGNORE_DIR_WITH_SOURCES: {{^}}TOTAL 4{{.*}}80.00%{{$}}

########################
# Test "show" command.
Expand Down
2 changes: 1 addition & 1 deletion llvm/unittests/ProfileData/CoverageMappingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ TEST_P(CoverageMappingTest, test_line_coverage_iterator) {
CoverageData Data = LoadedCoverage->getCoverageForFile("file1");

unsigned Line = 0;
const unsigned LineCounts[] = {20, 20, 20, 0, 30, 10, 10, 10, 10, 0, 0, 0, 0};
const unsigned LineCounts[] = {20, 20, 20, 0, 10, 10, 10, 10, 10, 0, 0, 0, 0};
const bool MappedLines[] = {1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0};
ASSERT_EQ(std::size(LineCounts), std::size(MappedLines));

Expand Down
Loading