[llvm] r203704 - llvm-profdata: Use the Profile library, implement show and generate
Justin Bogner
mail at justinbogner.com
Wed Mar 12 13:14:17 PDT 2014
Author: bogner
Date: Wed Mar 12 15:14:17 2014
New Revision: 203704
URL: http://llvm.org/viewvc/llvm-project?rev=203704&view=rev
Log:
llvm-profdata: Use the Profile library, implement show and generate
This replaces the llvm-profdata tool with a version that uses the
recently introduced Profile library. The new tool has the ability to
generate and summarize profdata files as well as merging them.
Added:
llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input
llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input
- copied, changed from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input
llvm/trunk/test/tools/llvm-profdata/generate.test
llvm/trunk/test/tools/llvm-profdata/merge-errors.test
llvm/trunk/test/tools/llvm-profdata/simple-merges.test
Removed:
llvm/trunk/test/tools/llvm-profdata/Inputs/bad-function-count.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata
llvm/trunk/test/tools/llvm-profdata/errors.test
llvm/trunk/test/tools/llvm-profdata/simple.test
Modified:
llvm/trunk/include/llvm/Support/LineIterator.h
llvm/trunk/tools/llvm-profdata/CMakeLists.txt
llvm/trunk/tools/llvm-profdata/LLVMBuild.txt
llvm/trunk/tools/llvm-profdata/Makefile
llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
Modified: llvm/trunk/include/llvm/Support/LineIterator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/LineIterator.h?rev=203704&r1=203703&r2=203704&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/LineIterator.h (original)
+++ llvm/trunk/include/llvm/Support/LineIterator.h Wed Mar 12 15:14:17 2014
@@ -56,6 +56,7 @@ public:
/// \brief Get the current line as a \c StringRef.
StringRef operator*() const { return CurrentLine; }
+ const StringRef *operator->() const { return &CurrentLine; }
friend bool operator==(const line_iterator &LHS, const line_iterator &RHS) {
return LHS.Buffer == RHS.Buffer &&
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/bad-function-count.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bad-function-count.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/bad-function-count.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/bad-function-count.profdata (removed)
@@ -1,2 +0,0 @@
-function_count_not 1count
-1
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,4 @@
+function_count_not
+badhash
+1
+1
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata (removed)
@@ -1,4 +0,0 @@
-bar 3
-1
-2
-3
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,6 @@
+bar
+3
+3
+1
+2
+3
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata?rev=203703&view=auto
==============================================================================
(empty)
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
(empty)
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata (removed)
@@ -1,2 +0,0 @@
-extra 1 word
-1
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
(empty)
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata (removed)
@@ -1,4 +0,0 @@
-foo 3
-1
-2
-3
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,6 @@
+foo
+3
+3
+1
+2
+3
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata (removed)
@@ -1,4 +0,0 @@
-foo 3
-7
-5
-3
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,6 @@
+foo
+3
+3
+7
+5
+3
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata (removed)
@@ -1,9 +0,0 @@
-foo 3
-2
-3
-5
-
-bar 3
-7
-11
-13
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,13 @@
+foo
+3
+3
+2
+3
+5
+
+bar
+3
+3
+7
+11
+13
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata (removed)
@@ -1,9 +0,0 @@
-foo 3
-17
-19
-23
-
-bar 3
-29
-31
-37
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input Wed Mar 12 15:14:17 2014
@@ -1,9 +1,13 @@
-foo 3
+foo
+3
+3
17
19
23
-bar 3
+bar
+3
+3
29
31
37
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata (removed)
@@ -1,5 +0,0 @@
-foo 4
-11
-22
-33
-44
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input Wed Mar 12 15:14:17 2014
@@ -1,4 +1,6 @@
-foo 4
+foo
+4
+4
11
22
33
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata (removed)
@@ -1,5 +0,0 @@
-foo 4
-7
-6
-5
-4
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input Wed Mar 12 15:14:17 2014
@@ -1,4 +1,6 @@
-foo 4
+foo
+4
+4
7
6
5
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata (removed)
@@ -1,2 +0,0 @@
-invalid_count 1
-1later
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,4 @@
+invalid_count
+1
+1
+1later
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata (removed)
@@ -1,2 +0,0 @@
-overflow 1
-9223372036854775808
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/overflow.profdata.input Wed Mar 12 15:14:17 2014
@@ -1,2 +1,4 @@
-overflow 1
+overflow
+1
+1
9223372036854775808
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata (removed)
@@ -1 +0,0 @@
-three words long
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input (from r203703, llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/three-words-long.profdata&r1=203703&r2=203704&rev=203704&view=diff
==============================================================================
(empty)
Added: llvm/trunk/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input (added)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input Wed Mar 12 15:14:17 2014
@@ -0,0 +1,4 @@
+wrong_count
+3
+3
+1
Removed: llvm/trunk/test/tools/llvm-profdata/errors.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/errors.test?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/errors.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/errors.test (removed)
@@ -1,22 +0,0 @@
-RUN: not llvm-profdata %p/Inputs/empty.profdata %p/Inputs/foo3-1.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH
-RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo3bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH
-RUN: not llvm-profdata %p/Inputs/foo4-1.profdata %p/Inputs/empty.profdata 2>&1 | FileCheck %s --check-prefix=LENGTH
-LENGTH: error: {{.*}}: truncated file
-
-RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=NAME
-NAME: error: {{.*}}: function name mismatch
-
-RUN: not llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo4-1.profdata 2>&1 | FileCheck %s --check-prefix=COUNT
-COUNT: error: {{.*}}: function count mismatch
-
-RUN: not llvm-profdata %p/Inputs/overflow.profdata %p/Inputs/overflow.profdata 2>&1 | FileCheck %s --check-prefix=OVERFLOW
-OVERFLOW: error: {{.*}}: counter overflow
-
-RUN: not llvm-profdata %p/Inputs/invalid-count-later.profdata %p/Inputs/invalid-count-later.profdata 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
-INVALID-COUNT-LATER: error: {{.*}}: invalid counter
-
-RUN: not llvm-profdata %p/Inputs/bad-function-count.profdata %p/Inputs/bad-function-count.profdata 2>&1 | FileCheck %s --check-prefix=BAD-FUNCTION-COUNT
-BAD-FUNCTION-COUNT: error: {{.*}}: bad function count
-
-RUN: not llvm-profdata %p/Inputs/three-words-long.profdata %p/Inputs/three-words-long.profdata 2>&1 | FileCheck %s --check-prefix=INVALID-DATA
-INVALID-DATA: error: {{.*}}: invalid data
Added: llvm/trunk/test/tools/llvm-profdata/generate.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/generate.test?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/generate.test (added)
+++ llvm/trunk/test/tools/llvm-profdata/generate.test Wed Mar 12 15:14:17 2014
@@ -0,0 +1,38 @@
+RUN: llvm-profdata generate %p/Inputs/empty.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=EMPTY
+
+EMPTY: Total functions: 0
+EMPTY: Maximum function count: 0
+EMPTY: Maximum internal block count: 0
+
+RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3
+
+FOO3: foo:
+FOO3: Counters: 3
+FOO3: Function count: 1
+FOO3: Block counts: [2, 3]
+FOO3: Total functions: 1
+FOO3: Maximum function count: 1
+FOO3: Maximum internal block count: 3
+
+RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3
+
+FOO3BAR3: foo:
+FOO3BAR3: Counters: 3
+FOO3BAR3: Function count: 2
+FOO3BAR3: Block counts: [3, 5]
+FOO3BAR3: bar:
+FOO3BAR3: Counters: 3
+FOO3BAR3: Function count: 7
+FOO3BAR3: Block counts: [11, 13]
+FOO3BAR3: Total functions: 2
+FOO3BAR3: Maximum function count: 7
+FOO3BAR3: Maximum internal block count: 13
+
+RUN: not llvm-profdata generate %p/Inputs/invalid-count-later.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
+INVALID-COUNT-LATER: error: {{.*}}: Failed to read counter
+
+RUN: not llvm-profdata generate %p/Inputs/bad-hash.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=BAD-HASH
+BAD-HASH: error: {{.*}}: Failed to read hash
+
+RUN: not llvm-profdata generate %p/Inputs/wrong-count.profdata.input -o /dev/null 2>&1 | FileCheck %s --check-prefix=BAD-FUNCTION-COUNT
+BAD-FUNCTION-COUNT: error: {{.*}}: Truncated file
Added: llvm/trunk/test/tools/llvm-profdata/merge-errors.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/merge-errors.test?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/merge-errors.test (added)
+++ llvm/trunk/test/tools/llvm-profdata/merge-errors.test Wed Mar 12 15:14:17 2014
@@ -0,0 +1,21 @@
+RUN: llvm-profdata generate %p/Inputs/empty.profdata.input > %t-empty.profdata
+RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input > %t-foo3-1.profdata
+RUN: llvm-profdata generate %p/Inputs/bar3-1.profdata.input > %t-bar3-1.profdata
+RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input > %t-foo3bar3-1.profdata
+RUN: llvm-profdata generate %p/Inputs/foo4-1.profdata.input > %t-foo4-1.profdata
+
+RUN: not llvm-profdata merge %t-empty.profdata %t-foo3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH
+RUN: not llvm-profdata merge %t-foo3-1.profdata %t-foo3bar3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH
+RUN: not llvm-profdata merge %t-foo4-1.profdata %t-empty.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=LENGTH
+LENGTH: error: {{.*}}: Truncated file
+
+RUN: not llvm-profdata merge %t-foo3-1.profdata %t-bar3-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=NAME
+NAME: error: {{.*}}: Function name mismatch
+
+RUN: not llvm-profdata merge %t-foo3-1.profdata %t-foo4-1.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=COUNT
+COUNT: error: {{.*}}: Function count mismatch
+
+RUN: llvm-profdata generate %p/Inputs/overflow.profdata.input > %t-overflow.profdata
+
+RUN: not llvm-profdata merge %t-overflow.profdata %t-overflow.profdata -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW
+OVERFLOW: error: {{.*}}: Counter overflow
Added: llvm/trunk/test/tools/llvm-profdata/simple-merges.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/simple-merges.test?rev=203704&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/simple-merges.test (added)
+++ llvm/trunk/test/tools/llvm-profdata/simple-merges.test Wed Mar 12 15:14:17 2014
@@ -0,0 +1,33 @@
+RUN: llvm-profdata generate %p/Inputs/foo3-1.profdata.input > %t-foo3-1.profdata
+RUN: llvm-profdata generate %p/Inputs/foo3-2.profdata.input > %t-foo3-2.profdata
+
+RUN: llvm-profdata merge %t-foo3-1.profdata %t-foo3-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3
+RUN: llvm-profdata merge %t-foo3-2.profdata %t-foo3-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3
+FOO3: foo:
+FOO3: Counters: 3
+FOO3: Function count: 8
+FOO3: Block counts: [7, 6]
+
+RUN: llvm-profdata generate %p/Inputs/foo4-1.profdata.input > %t-foo4-1.profdata
+RUN: llvm-profdata generate %p/Inputs/foo4-2.profdata.input > %t-foo4-2.profdata
+
+RUN: llvm-profdata merge %t-foo4-1.profdata %t-foo4-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO4
+RUN: llvm-profdata merge %t-foo4-2.profdata %t-foo4-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO4
+FOO4: foo:
+FOO4: Counters: 4
+FOO4: Function count: 18
+FOO4: Block counts: [28, 38, 48]
+
+RUN: llvm-profdata generate %p/Inputs/foo3bar3-1.profdata.input > %t-foo3bar3-1.profdata
+RUN: llvm-profdata generate %p/Inputs/foo3bar3-2.profdata.input > %t-foo3bar3-2.profdata
+
+RUN: llvm-profdata merge %t-foo3bar3-1.profdata %t-foo3bar3-2.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3
+RUN: llvm-profdata merge %t-foo3bar3-2.profdata %t-foo3bar3-1.profdata 2>&1 | llvm-profdata show -all-functions -counts - | FileCheck %s --check-prefix=FOO3BAR3
+FOO3BAR3: foo:
+FOO3BAR3: Counters: 3
+FOO3BAR3: Function count: 19
+FOO3BAR3: Block counts: [22, 28]
+FOO3BAR3: bar:
+FOO3BAR3: Counters: 3
+FOO3BAR3: Function count: 36
+FOO3BAR3: Block counts: [42, 50]
Removed: llvm/trunk/test/tools/llvm-profdata/simple.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/simple.test?rev=203703&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/simple.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/simple.test (removed)
@@ -1,25 +0,0 @@
-RUN: llvm-profdata %p/Inputs/foo3-1.profdata %p/Inputs/foo3-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO3
-RUN: llvm-profdata %p/Inputs/foo3-2.profdata %p/Inputs/foo3-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO3
-FOO3: {{^foo 3$}}
-FOO3-NEXT: {{^8$}}
-FOO3-NEXT: {{^7$}}
-FOO3-NEXT: {{^6$}}
-
-RUN: llvm-profdata %p/Inputs/foo4-1.profdata %p/Inputs/foo4-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO4
-RUN: llvm-profdata %p/Inputs/foo4-2.profdata %p/Inputs/foo4-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO4
-FOO4: {{^foo 4$}}
-FOO4-NEXT: {{^18$}}
-FOO4-NEXT: {{^28$}}
-FOO4-NEXT: {{^38$}}
-FOO4-NEXT: {{^48$}}
-
-RUN: llvm-profdata %p/Inputs/foo3bar3-1.profdata %p/Inputs/foo3bar3-2.profdata 2>&1 | FileCheck %s --check-prefix=FOO3BAR3
-RUN: llvm-profdata %p/Inputs/foo3bar3-2.profdata %p/Inputs/foo3bar3-1.profdata 2>&1 | FileCheck %s --check-prefix=FOO3BAR3
-FOO3BAR3: {{^foo 3$}}
-FOO3BAR3-NEXT: {{^19$}}
-FOO3BAR3-NEXT: {{^22$}}
-FOO3BAR3-NEXT: {{^28$}}
-FOO3BAR3: {{^bar 3$}}
-FOO3BAR3-NEXT: {{^36$}}
-FOO3BAR3-NEXT: {{^42$}}
-FOO3BAR3-NEXT: {{^50$}}
Modified: llvm/trunk/tools/llvm-profdata/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/CMakeLists.txt?rev=203704&r1=203703&r2=203704&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-profdata/CMakeLists.txt Wed Mar 12 15:14:17 2014
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS core support )
+set(LLVM_LINK_COMPONENTS core profile support)
add_llvm_tool(llvm-profdata
llvm-profdata.cpp
Modified: llvm/trunk/tools/llvm-profdata/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/LLVMBuild.txt?rev=203704&r1=203703&r2=203704&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/LLVMBuild.txt (original)
+++ llvm/trunk/tools/llvm-profdata/LLVMBuild.txt Wed Mar 12 15:14:17 2014
@@ -19,4 +19,4 @@
type = Tool
name = llvm-profdata
parent = Tools
-required_libraries = Support
+required_libraries = Profile Support
Modified: llvm/trunk/tools/llvm-profdata/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/Makefile?rev=203704&r1=203703&r2=203704&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/Makefile (original)
+++ llvm/trunk/tools/llvm-profdata/Makefile Wed Mar 12 15:14:17 2014
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llvm-profdata
-LINK_COMPONENTS := core support
+LINK_COMPONENTS := core profile support
# This tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS := 1
Modified: llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp?rev=203704&r1=203703&r2=203704&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
+++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Wed Mar 12 15:14:17 2014
@@ -12,7 +12,10 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/StringRef.h"
+#include "llvm/Profile/ProfileDataReader.h"
+#include "llvm/Profile/ProfileDataWriter.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LineIterator.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PrettyStackTrace.h"
@@ -21,67 +24,6 @@
using namespace llvm;
-static cl::opt<std::string> Filename1(cl::Positional, cl::Required,
- cl::desc("file1"));
-static cl::opt<std::string> Filename2(cl::Positional, cl::Required,
- cl::desc("file2"));
-
-static cl::opt<std::string> OutputFilename("output", cl::value_desc("output"),
- cl::init("-"),
- cl::desc("Output file"));
-static cl::alias OutputFilenameA("o", cl::desc("Alias for --output"),
- cl::aliasopt(OutputFilename));
-
-static bool readLine(const char *&Start, const char *End, StringRef &S) {
- if (Start == End)
- return false;
-
- for (const char *I = Start; I != End; ++I) {
- assert(*I && "unexpected binary data");
- if (*I == '\n') {
- S = StringRef(Start, I - Start);
- Start = I + 1;
- return true;
- }
- }
-
- S = StringRef(Start, End - Start);
- Start = End;
- return true;
-}
-
-static StringRef getWord(const char *&Start, const char *End) {
- for (const char *I = Start; I != End; ++I)
- if (*I == ' ') {
- StringRef S(Start, I - Start);
- Start = I + 1;
- return S;
- }
- StringRef S(Start, End - Start);
- Start = End;
- return S;
-}
-
-static size_t splitWords(const StringRef &Line, std::vector<StringRef> &Words) {
- const char *Start = Line.data();
- const char *End = Line.data() + Line.size();
- Words.clear();
- while (Start != End)
- Words.push_back(getWord(Start, End));
- return Words.size();
-}
-
-static bool getNumber(const StringRef &S, uint64_t &N) {
- N = 0;
- for (StringRef::iterator I = S.begin(), E = S.end(); I != E; ++I)
- if (*I >= '0' && *I <= '9')
- N = N * 10 + (*I - '0');
- else
- return false;
-
- return true;
-}
-
static void exitWithError(const std::string &Message,
const std::string &Filename, int64_t Line = -1) {
errs() << "error: " << Filename;
@@ -91,21 +33,25 @@ static void exitWithError(const std::str
::exit(1);
}
-//===----------------------------------------------------------------------===//
-int main(int argc, char **argv) {
- // Print a stack trace if we signal out.
- sys::PrintStackTraceOnErrorSignal();
- PrettyStackTraceProgram X(argc, argv);
- llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
+int merge_main(int argc, const char *argv[]) {
+ cl::opt<std::string> Filename1(cl::Positional, cl::Required,
+ cl::desc("file1"));
+ cl::opt<std::string> Filename2(cl::Positional, cl::Required,
+ cl::desc("file2"));
+
+ cl::opt<std::string> OutputFilename("output", cl::value_desc("output"),
+ cl::init("-"),
+ cl::desc("Output file"));
+ cl::alias OutputFilenameA("o", cl::desc("Alias for --output"),
+ cl::aliasopt(OutputFilename));
cl::ParseCommandLineOptions(argc, argv, "LLVM profile data merger\n");
- std::unique_ptr<MemoryBuffer> File1;
- std::unique_ptr<MemoryBuffer> File2;
- if (error_code ec = MemoryBuffer::getFile(Filename1, File1))
- exitWithError(ec.message(), Filename1);
- if (error_code ec = MemoryBuffer::getFile(Filename2, File2))
- exitWithError(ec.message(), Filename2);
+ std::unique_ptr<ProfileDataReader> Reader1, Reader2;
+ if (error_code EC = ProfileDataReader::create(Filename1, Reader1))
+ exitWithError(EC.message(), Filename1);
+ if (error_code EC = ProfileDataReader::create(Filename2, Reader2))
+ exitWithError(EC.message(), Filename2);
if (OutputFilename.empty())
OutputFilename = "-";
@@ -115,63 +61,263 @@ int main(int argc, char **argv) {
if (!ErrorInfo.empty())
exitWithError(ErrorInfo, OutputFilename);
- const char *Start1 = File1->getBufferStart();
- const char *Start2 = File2->getBufferStart();
- const char *End1 = File1->getBufferEnd();
- const char *End2 = File2->getBufferEnd();
- const char *P1 = Start1;
- const char *P2 = Start2;
-
- StringRef Line1, Line2;
- int64_t Num = 0;
- while (readLine(P1, End1, Line1)) {
- ++Num;
- if (!readLine(P2, End2, Line2))
- exitWithError("truncated file", Filename2, Num);
-
- std::vector<StringRef> Words1, Words2;
- if (splitWords(Line1, Words1) != splitWords(Line2, Words2))
- exitWithError("data mismatch", Filename2, Num);
+ if (Output.is_displayed())
+ exitWithError("Refusing to write a binary file to stdout", OutputFilename);
- if (Words1.size() > 2)
- exitWithError("invalid data", Filename1, Num);
+ StringRef Name1, Name2;
+ std::vector<uint64_t> Counts1, Counts2, NewCounts;
+ uint64_t Hash1, Hash2;
+ ProfileDataWriter Writer;
+ ProfileDataReader::name_iterator I1 = Reader1->begin(),
+ E1 = Reader1->end(),
+ I2 = Reader2->begin(),
+ E2 = Reader2->end();
+ for (; I1 != E1 && I2 != E2; ++I1, ++I2) {
+ Name1 = *I1;
+ Name2 = *I2;
+ if (Name1 != Name2)
+ exitWithError("Function name mismatch", Filename2); // ???
+
+ if (error_code EC = Reader1->getFunctionCounts(Name1, Hash1, Counts1))
+ exitWithError(EC.message(), Filename1);
+ if (error_code EC = Reader2->getFunctionCounts(Name2, Hash2, Counts2))
+ exitWithError(EC.message(), Filename2);
+
+ if (Counts1.size() != Counts2.size())
+ exitWithError("Function count mismatch", Filename2); // ???
+ if (Hash1 != Hash2)
+ exitWithError("Function hash mismatch", Filename2); // ???
+
+ for (size_t II = 0, EE = Counts1.size(); II < EE; ++II) {
+ uint64_t Sum = Counts1[II] + Counts2[II];
+ if (Sum < Counts1[II])
+ exitWithError("Counter overflow", Filename2); // ???
+ NewCounts.push_back(Sum);
+ }
- if (Words1.empty()) {
- Output << "\n";
- continue;
+ Writer.addFunctionCounts(Name1, Hash1, NewCounts.size(), NewCounts.data());
+
+ Counts1.clear();
+ Counts2.clear();
+ NewCounts.clear();
+ }
+ if (I1 != E1 || I2 != E2)
+ exitWithError("Truncated file", Filename2);
+
+ Writer.write(Output);
+
+ return 0;
+}
+
+struct HashPrinter {
+ uint64_t Hash;
+ HashPrinter(uint64_t Hash) : Hash(Hash) {}
+ void print(raw_ostream &OS) const {
+ char Buf[18], *Cur = Buf;
+ *Cur++ = '0'; *Cur++ = 'x';
+ for (unsigned I = 16; I;) {
+ char Digit = 0xF & (Hash >> (--I * 4));
+ *Cur++ = (Digit < 10 ? '0' + Digit : 'A' + Digit - 10);
}
+ OS.write(Buf, 18);
+ }
+};
+static raw_ostream &operator<<(raw_ostream &OS, const HashPrinter &Hash) {
+ Hash.print(OS);
+ return OS;
+}
- if (Words1.size() == 2) {
- if (Words1[0] != Words2[0])
- exitWithError("function name mismatch", Filename2, Num);
-
- uint64_t N1, N2;
- if (!getNumber(Words1[1], N1))
- exitWithError("bad function count", Filename1, Num);
- if (!getNumber(Words2[1], N2))
- exitWithError("bad function count", Filename2, Num);
+struct FreqPrinter {
+ double Freq;
+ FreqPrinter(double Freq) : Freq(Freq) {}
+ void print(raw_ostream &OS) const {
+ OS << (unsigned)(Freq * 100) << "." << ((unsigned)(Freq * 1000) % 10)
+ << ((unsigned)(Freq * 10000) % 10) << "%";
+ }
+};
+static raw_ostream &operator<<(raw_ostream &OS, const FreqPrinter &Freq) {
+ Freq.print(OS);
+ return OS;
+}
- if (N1 != N2)
- exitWithError("function count mismatch", Filename2, Num);
+int show_main(int argc, const char *argv[]) {
+ cl::opt<std::string> Filename(cl::Positional, cl::Required,
+ cl::desc("<profdata-file>"));
+
+ cl::opt<bool> ShowCounts("counts", cl::init(false));
+ cl::opt<bool> ShowAllFunctions("all-functions", cl::init(false));
+ cl::opt<std::string> ShowFunction("function");
+
+ cl::opt<std::string> OutputFilename("output", cl::value_desc("output"),
+ cl::init("-"),
+ cl::desc("Output file"));
+ cl::alias OutputFilenameA("o", cl::desc("Alias for --output"),
+ cl::aliasopt(OutputFilename));
+
+ cl::ParseCommandLineOptions(argc, argv, "LLVM profile data summary\n");
+
+ std::unique_ptr<ProfileDataReader> Reader;
+ if (error_code EC = ProfileDataReader::create(Filename, Reader))
+ exitWithError(EC.message(), Filename);
- Output << Line1 << "\n";
- continue;
+ if (OutputFilename.empty())
+ OutputFilename = "-";
+
+ std::string ErrorInfo;
+ raw_fd_ostream OS(OutputFilename.data(), ErrorInfo, sys::fs::F_Text);
+ if (!ErrorInfo.empty())
+ exitWithError(ErrorInfo, OutputFilename);
+
+ if (ShowAllFunctions && !ShowFunction.empty())
+ errs() << "warning: -function argument ignored: showing all functions\n";
+
+ uint64_t MaxBlockCount = 0, MaxFunctionCount = 0;
+ uint64_t Hash;
+ double CallFreq;
+ size_t ShownFunctions = false;
+ std::vector<uint64_t> Counts;
+ for (const auto &Name : *Reader) {
+ bool Show = ShowAllFunctions || Name.find(ShowFunction) != Name.npos;
+ if (error_code EC = Reader->getFunctionCounts(Name, Hash, Counts))
+ exitWithError(EC.message(), Filename);
+ if (error_code EC = Reader->getCallFrequency(Name, Hash, CallFreq))
+ exitWithError(EC.message(), Filename);
+ if (Show) {
+ if (!ShownFunctions)
+ OS << "Counters:\n";
+ ++ShownFunctions;
+ OS << " " << Name << ":\n"
+ << " Hash: " << HashPrinter(Hash) << "\n"
+ << " Relative call frequency: " << FreqPrinter(CallFreq) << "\n"
+ << " Counters: " << Counts.size() << "\n"
+ << " Function count: " << Counts[0] << "\n";
}
- uint64_t N1, N2;
- if (!getNumber(Words1[0], N1))
- exitWithError("invalid counter", Filename1, Num);
- if (!getNumber(Words2[0], N2))
- exitWithError("invalid counter", Filename2, Num);
-
- uint64_t Sum = N1 + N2;
- if (Sum < N1)
- exitWithError("counter overflow", Filename2, Num);
+ if (Counts[0] > MaxFunctionCount)
+ MaxFunctionCount = Counts[0];
- Output << N1 + N2 << "\n";
+ if (Show && ShowCounts)
+ OS << " Block counts: [";
+ for (size_t I = 1, E = Counts.size(); I < E; ++I) {
+ if (Counts[I] > MaxBlockCount)
+ MaxBlockCount = Counts[I];
+ if (Show && ShowCounts)
+ OS << (I == 1 ? "" : ", ") << Counts[I];
+ }
+ if (Show && ShowCounts)
+ OS << "]\n";
+
+ Counts.clear();
}
- if (readLine(P2, End2, Line2))
- exitWithError("truncated file", Filename1, Num + 1);
+ if (ShowAllFunctions || !ShowFunction.empty())
+ OS << "Functions shown: " << ShownFunctions << "\n";
+ OS << "Total functions: " << Reader->numProfiledFunctions() << "\n";
+ OS << "Maximum function count: " << MaxFunctionCount << "\n";
+ OS << "Maximum internal block count: " << MaxBlockCount << "\n";
return 0;
}
+
+int generate_main(int argc, const char *argv[]) {
+ cl::opt<std::string> InputName(cl::Positional, cl::Required,
+ cl::desc("<input-file>"));
+
+ cl::opt<std::string> OutputFilename("output", cl::value_desc("output"),
+ cl::init("-"),
+ cl::desc("Output file"));
+ cl::alias OutputFilenameA("o", cl::desc("Alias for --output"),
+ cl::aliasopt(OutputFilename));
+
+ cl::ParseCommandLineOptions(argc, argv, "LLVM profile data generator\n");
+
+ if (OutputFilename.empty())
+ OutputFilename = "-";
+
+ std::string ErrorInfo;
+ raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_Text);
+ if (!ErrorInfo.empty())
+ exitWithError(ErrorInfo, OutputFilename);
+
+ if (Output.is_displayed())
+ exitWithError("Refusing to write a binary file to stdout", OutputFilename);
+
+ std::unique_ptr<MemoryBuffer> Buffer;
+ if (error_code EC = MemoryBuffer::getFile(InputName, Buffer))
+ exitWithError(EC.message(), InputName);
+
+ ProfileDataWriter Writer;
+ StringRef Name;
+ uint64_t Hash, NumCounters;
+ std::vector<uint64_t> Counters;
+ for (line_iterator I(*Buffer, '#'); !I.is_at_end(); ++I) {
+ if (I->empty())
+ continue;
+ Name = *I;
+ if ((++I).is_at_end())
+ exitWithError("Truncated file", InputName, I.line_number());
+ if (I->getAsInteger(10, Hash))
+ exitWithError("Failed to read hash", InputName, I.line_number());
+ if ((++I).is_at_end())
+ exitWithError("Truncated file", InputName, I.line_number());
+ if (I->getAsInteger(10, NumCounters))
+ exitWithError("Failed to read num counters", InputName, I.line_number());
+ for (uint64_t CurCounter = 0; CurCounter < NumCounters; ++CurCounter) {
+ uint64_t Counter;
+ if ((++I).is_at_end())
+ exitWithError("Truncated file", InputName, I.line_number());
+ if (I->getAsInteger(10, Counter))
+ exitWithError("Failed to read counter", InputName, I.line_number());
+ Counters.push_back(Counter);
+ }
+ Writer.addFunctionCounts(Name, Hash, NumCounters, Counters.data());
+ Counters.clear();
+ }
+
+ Writer.write(Output);
+
+ return 0;
+}
+
+int main(int argc, const char *argv[]) {
+ // Print a stack trace if we signal out.
+ sys::PrintStackTraceOnErrorSignal();
+ PrettyStackTraceProgram X(argc, argv);
+ llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
+
+ StringRef ProgName(sys::path::filename(argv[0]));
+ if (argc > 1) {
+ int (*func)(int, const char *[]) = 0;
+
+ if (strcmp(argv[1], "merge") == 0)
+ func = merge_main;
+ else if (strcmp(argv[1], "show") == 0)
+ func = show_main;
+ else if (strcmp(argv[1], "generate") == 0)
+ func = generate_main;
+
+ if (func) {
+ std::string Invocation(ProgName.str() + " " + argv[1]);
+ argv[1] = Invocation.c_str();
+ return func(argc - 1, argv + 1);
+ }
+
+ if (strcmp(argv[1], "-h") == 0 ||
+ strcmp(argv[1], "-help") == 0 ||
+ strcmp(argv[1], "--help") == 0) {
+
+ errs() << "OVERVIEW: LLVM profile data tools\n\n"
+ << "USAGE: " << ProgName << " <command> [args...]\n"
+ << "USAGE: " << ProgName << " <command> -help\n\n"
+ << "Available commands: merge, show, generate\n";
+ return 0;
+ }
+ }
+
+ if (argc < 2)
+ errs() << ProgName << ": No command specified!\n";
+ else
+ errs() << ProgName << ": Unknown command!\n";
+
+ errs() << "USAGE: " << ProgName << " <merge|show|generate> [args...]\n";
+ return 1;
+}
More information about the llvm-commits
mailing list