InstrProf: Fix display of large numbers in llvm-cov

llvm-cov was truncating numbers that were larger than a particular
fixed width, which is as confusing as it is useless. Instead, we use
engineering notation with SI prefix for magnitude.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237307 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner
2015-05-13 22:41:48 +00:00
parent 33bf03ed89
commit 98f0f26fdf
5 changed files with 62 additions and 58 deletions

View File

@@ -1,8 +1,8 @@
main
0x000000000028434d
5
1
161
0
100
1
16100
161
0

View File

@@ -1,8 +1,8 @@
main
0x000000000028434d
5
1
1111000
0
100
1
111100000
1111000
0

View File

@@ -1,30 +1,30 @@
// Basic handling of line counts.
// RUN: llvm-profdata merge %S/Inputs/lineExecutionCounts.proftext -o %t.profdata
// before any coverage // WHOLE-FILE: | [[@LINE]]|// before
// FILTER-NOT: | [[@LINE-1]]|// before
int main() { // CHECK: 1| [[@LINE]]|int main(
int x = 0; // CHECK: 1| [[@LINE]]| int x
// CHECK: 1| [[@LINE]]|
if (x) { // CHECK: 0| [[@LINE]]| if (x)
x = 0; // CHECK: 0| [[@LINE]]| x = 0
} else { // CHECK: 1| [[@LINE]]| } else
x = 1; // CHECK: 1| [[@LINE]]| x = 1
} // CHECK: 1| [[@LINE]]| }
// CHECK: 1| [[@LINE]]|
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: 1| [[@LINE]]| x =
x = x > 10 ? // CHECK: 1| [[@LINE]]| x =
x - 1: // CHECK: 0| [[@LINE]]| x
x + 1; // CHECK: 1| [[@LINE]]| x
// CHECK: 1| [[@LINE]]|
return 0; // CHECK: 1| [[@LINE]]| return
} // CHECK: 1| [[@LINE]]|}
// after coverage // WHOLE-FILE: | [[@LINE]]|// after
// FILTER-NOT: | [[@LINE-1]]|// after
// before any coverage // WHOLE-FILE: | [[@LINE]]|// before
// FILTER-NOT: | [[@LINE-1]]|// before
int main() { // CHECK: 161| [[@LINE]]|int main(
int x = 0; // CHECK: 161| [[@LINE]]| int x
// CHECK: 161| [[@LINE]]|
if (x) { // CHECK: 0| [[@LINE]]| if (x)
x = 0; // CHECK: 0| [[@LINE]]| x = 0
} else { // CHECK: 161| [[@LINE]]| } else
x = 1; // CHECK: 161| [[@LINE]]| x = 1
} // CHECK: 161| [[@LINE]]| }
// CHECK: 161| [[@LINE]]|
for (int i = 0; i < 100; ++i) { // CHECK: 16.2k| [[@LINE]]| for (
x = 1; // CHECK: 16.1k| [[@LINE]]| x = 1
} // CHECK: 16.1k| [[@LINE]]| }
// CHECK: 161| [[@LINE]]|
x = x < 10 ? x + 1 : x - 1; // CHECK: 161| [[@LINE]]| x =
x = x > 10 ? // CHECK: 161| [[@LINE]]| x =
x - 1: // CHECK: 0| [[@LINE]]| x
x + 1; // CHECK: 161| [[@LINE]]| x
// CHECK: 161| [[@LINE]]|
return 0; // CHECK: 161| [[@LINE]]| return
} // CHECK: 161| [[@LINE]]|}
// after coverage // WHOLE-FILE: | [[@LINE]]|// after
// FILTER-NOT: | [[@LINE-1]]|// after
// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefix=CHECK -check-prefix=WHOLE-FILE %s
// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence -name=main %s | FileCheck -check-prefix=CHECK -check-prefix=FILTER %s

View File

@@ -1,23 +1,23 @@
// RUN: llvm-profdata merge %S/Inputs/regionMarkers.proftext -o %t.profdata
int main() { // CHECK: Marker at [[@LINE]]:12 = 1
int main() { // CHECK: Marker at [[@LINE]]:12 = 1.11M
int x = 0;
if (x) { // CHECK: Marker at [[@LINE]]:10 = 0
x = 0;
} else { // CHECK: Marker at [[@LINE]]:10 = 1
} else { // CHECK: Marker at [[@LINE]]:10 = 1.11M
x = 1;
}
// CHECK: Marker at [[@LINE+2]]:19 = 101
// CHECK: Marker at [[@LINE+1]]:28 = 100
for (int i = 0; i < 100; ++i) { // CHECK: Marker at [[@LINE]]:33 = 100
// CHECK: Marker at [[@LINE+2]]:19 = 112M
// CHECK: Marker at [[@LINE+1]]:28 = 111M
for (int i = 0; i < 100; ++i) { // CHECK: Marker at [[@LINE]]:33 = 111M
x = 1;
}
// CHECK: Marker at [[@LINE+1]]:16 = 1
// CHECK: Marker at [[@LINE+1]]:16 = 1.11M
x = x < 10 ? x + 1 : x - 1; // CHECK: Marker at [[@LINE]]:24 = 0
x = x > 10 ?
x - 1: // CHECK: Marker at [[@LINE]]:9 = 0
x + 1; // CHECK: Marker at [[@LINE]]:9 = 1
x + 1; // CHECK: Marker at [[@LINE]]:9 = 1.11M
return 0;
}