[llvm] r214357 - llvm-profdata: Use consistent file suffixes in tests
Justin Bogner
mail at justinbogner.com
Wed Jul 30 16:02:01 PDT 2014
Author: bogner
Date: Wed Jul 30 18:02:01 2014
New Revision: 214357
URL: http://llvm.org/viewvc/llvm-project?rev=214357&view=rev
Log:
llvm-profdata: Use consistent file suffixes in tests
In some places we've been using different suffixes for the different
file formats involved in instrprof, but in others we've just
ambiguously used .profdata. Update the test files to indicate the
types of file more obviously.
No functional change.
Added:
llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profraw
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/empty.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata
llvm/trunk/test/tools/llvm-profdata/hash-mismatch.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata
llvm/trunk/test/tools/llvm-profdata/overflow.proftext
- copied, changed from r214355, llvm/trunk/test/tools/llvm-profdata/overflow.profdata
Removed:
llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata
llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.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/no-counts.profdata
llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata
llvm/trunk/test/tools/llvm-profdata/overflow.profdata
Modified:
llvm/trunk/test/tools/llvm-profdata/c-general.test
llvm/trunk/test/tools/llvm-profdata/lit.local.cfg
llvm/trunk/test/tools/llvm-profdata/multiple-inputs.test
llvm/trunk/test/tools/llvm-profdata/text-format-errors.test
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata?rev=214356&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata (removed)
@@ -1,4 +0,0 @@
-function_count_not
-badhash
-1
-1
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.proftext (from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/bad-hash.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,6 +0,0 @@
-bar
-3
-3
-1
-2
-3
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/bar3-1.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata?rev=214356&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata (original) and llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata (removed) differ
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profraw (from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profraw?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profraw&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/c-general.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&view=auto
==============================================================================
(empty)
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/empty.proftext (from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/empty.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/empty.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/empty.profdata&r1=214355&r2=214357&rev=214357&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=214356&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.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/extra-word.profdata&r1=214355&r2=214357&rev=214357&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=214356&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,6 +0,0 @@
-foo
-3
-3
-1
-2
-3
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-1.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,6 +0,0 @@
-foo
-3
-3
-7
-5
-3
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3-2.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,13 +0,0 @@
-foo
-3
-3
-2
-3
-5
-
-bar
-3
-3
-7
-11
-13
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,13 +0,0 @@
-foo
-3
-3
-17
-19
-23
-
-bar
-3
-3
-29
-31
-37
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,7 +0,0 @@
-foo
-4
-4
-11
-22
-33
-44
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-1.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,7 +0,0 @@
-foo
-4
-4
-7
-6
-5
-4
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/foo4-2.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
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=214356&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,4 +0,0 @@
-invalid_count
-1
-1
-1later
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext (from r214355, 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.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
Removed: llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata?rev=214356&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata (removed)
@@ -1,3 +0,0 @@
-no_counts
-0
-0
Copied: llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.proftext (from r214355, llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.proftext?p2=llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.proftext&p1=llvm/trunk/test/tools/llvm-profdata/Inputs/no-counts.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
(empty)
Modified: llvm/trunk/test/tools/llvm-profdata/c-general.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/c-general.test?rev=214357&r1=214356&r2=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/c-general.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/c-general.test Wed Jul 30 18:02:01 2014
@@ -7,10 +7,10 @@ REGENERATE: $ CFE=$SRC/tools/clang
REGENERATE: $ TESTDIR=$SRC/test/tools/llvm-profdata
REGENERATE: $ CFE_TESTDIR=$CFE/test/Profile
REGENERATE: $ clang -o a.out -fprofile-instr-generate $CFE_TESTDIR/test/Profile/c-general.c
-REGENERATE: $ LLVM_PROFILE_FILE=$TESTDIR/Inputs/c-general.profdata ./a.out
+REGENERATE: $ LLVM_PROFILE_FILE=$TESTDIR/Inputs/c-general.profraw ./a.out
-RUN: llvm-profdata show %p/Inputs/c-general.profdata -o - | FileCheck %s -check-prefix=CHECK
-RUN: llvm-profdata show %p/Inputs/c-general.profdata -o - --function=switches | FileCheck %s -check-prefix=SWITCHES -check-prefix=CHECK
+RUN: llvm-profdata show %p/Inputs/c-general.profraw -o - | FileCheck %s -check-prefix=CHECK
+RUN: llvm-profdata show %p/Inputs/c-general.profraw -o - --function=switches | FileCheck %s -check-prefix=SWITCHES -check-prefix=CHECK
SWITCHES-LABEL: Counters:
SWITCHES-NEXT: switches:
Removed: llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata?rev=214356&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata (removed)
@@ -1,17 +0,0 @@
-# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
-# CHECK: hash-mismatch.profdata: foo: Function hash mismatch
-
-foo
-3
-3
-1
-2
-3
-
-foo
-4
-4
-11
-22
-33
-44
Copied: llvm/trunk/test/tools/llvm-profdata/hash-mismatch.proftext (from r214355, llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/hash-mismatch.proftext?p2=llvm/trunk/test/tools/llvm-profdata/hash-mismatch.proftext&p1=llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/hash-mismatch.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/hash-mismatch.proftext Wed Jul 30 18:02:01 2014
@@ -1,5 +1,5 @@
# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
-# CHECK: hash-mismatch.profdata: foo: Function hash mismatch
+# CHECK: hash-mismatch.proftext: foo: Function hash mismatch
foo
3
Modified: llvm/trunk/test/tools/llvm-profdata/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/lit.local.cfg?rev=214357&r1=214356&r2=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/lit.local.cfg (original)
+++ llvm/trunk/test/tools/llvm-profdata/lit.local.cfg Wed Jul 30 18:02:01 2014
@@ -1 +1 @@
-config.suffixes.add('.profdata')
+config.suffixes.add('.proftext')
Modified: llvm/trunk/test/tools/llvm-profdata/multiple-inputs.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/multiple-inputs.test?rev=214357&r1=214356&r2=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/multiple-inputs.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/multiple-inputs.test Wed Jul 30 18:02:01 2014
@@ -1,8 +1,8 @@
Some very basic tests for the multiple input cases.
-RUN: llvm-profdata merge %p/Inputs/foo3-1.profdata %p/Inputs/foo3-2.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3-1.proftext %p/Inputs/foo3-2.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3
-RUN: llvm-profdata merge %p/Inputs/foo3-2.profdata %p/Inputs/foo3-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3-2.proftext %p/Inputs/foo3-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3
FOO3: foo:
FOO3: Counters: 3
@@ -12,9 +12,9 @@ FOO3: Total functions: 1
FOO3: Maximum function count: 8
FOO3: Maximum internal block count: 7
-RUN: llvm-profdata merge %p/Inputs/foo4-1.profdata %p/Inputs/foo4-2.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo4-1.proftext %p/Inputs/foo4-2.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO4
-RUN: llvm-profdata merge %p/Inputs/foo4-2.profdata %p/Inputs/foo4-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo4-2.proftext %p/Inputs/foo4-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO4
FOO4: foo:
FOO4: Counters: 4
@@ -24,9 +24,9 @@ FOO4: Total functions: 1
FOO4: Maximum function count: 18
FOO4: Maximum internal block count: 48
-RUN: llvm-profdata merge %p/Inputs/foo3bar3-1.profdata %p/Inputs/foo3bar3-2.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3bar3-1.proftext %p/Inputs/foo3bar3-2.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3BAR3
-RUN: llvm-profdata merge %p/Inputs/foo3bar3-2.profdata %p/Inputs/foo3bar3-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3bar3-2.proftext %p/Inputs/foo3bar3-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3BAR3
FOO3BAR3: foo:
FOO3BAR3: Counters: 3
@@ -40,7 +40,7 @@ FOO3BAR3: Total functions: 2
FOO3BAR3: Maximum function count: 36
FOO3BAR3: Maximum internal block count: 50
-RUN: llvm-profdata merge %p/Inputs/empty.profdata %p/Inputs/foo3-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/empty.proftext %p/Inputs/foo3-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3EMPTY
FOO3EMPTY: foo:
FOO3EMPTY: Counters: 3
@@ -50,7 +50,7 @@ FOO3EMPTY: Total functions: 1
FOO3EMPTY: Maximum function count: 1
FOO3EMPTY: Maximum internal block count: 3
-RUN: llvm-profdata merge %p/Inputs/foo3-1.profdata %p/Inputs/foo3bar3-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3-1.proftext %p/Inputs/foo3bar3-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=FOO3FOO3BAR3
FOO3FOO3BAR3: foo:
FOO3FOO3BAR3: Counters: 3
@@ -64,7 +64,7 @@ FOO3FOO3BAR3: Total functions: 2
FOO3FOO3BAR3: Maximum function count: 7
FOO3FOO3BAR3: Maximum internal block count: 13
-RUN: llvm-profdata merge %p/Inputs/foo3-1.profdata %p/Inputs/bar3-1.profdata -o %t
+RUN: llvm-profdata merge %p/Inputs/foo3-1.proftext %p/Inputs/bar3-1.proftext -o %t
RUN: llvm-profdata show %t -all-functions -counts | FileCheck %s --check-prefix=DISJOINT
DISJOINT: foo:
DISJOINT: Counters: 3
Removed: llvm/trunk/test/tools/llvm-profdata/overflow.profdata
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/overflow.profdata?rev=214356&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/overflow.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/overflow.profdata (removed)
@@ -1,12 +0,0 @@
-# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
-# CHECK: overflow.profdata: overflow: Counter overflow
-
-overflow
-1
-1
-9223372036854775808
-
-overflow
-1
-1
-9223372036854775808
Copied: llvm/trunk/test/tools/llvm-profdata/overflow.proftext (from r214355, llvm/trunk/test/tools/llvm-profdata/overflow.profdata)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/overflow.proftext?p2=llvm/trunk/test/tools/llvm-profdata/overflow.proftext&p1=llvm/trunk/test/tools/llvm-profdata/overflow.profdata&r1=214355&r2=214357&rev=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/overflow.profdata (original)
+++ llvm/trunk/test/tools/llvm-profdata/overflow.proftext Wed Jul 30 18:02:01 2014
@@ -1,5 +1,5 @@
# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
-# CHECK: overflow.profdata: overflow: Counter overflow
+# CHECK: overflow.proftext: overflow: Counter overflow
overflow
1
Modified: llvm/trunk/test/tools/llvm-profdata/text-format-errors.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/text-format-errors.test?rev=214357&r1=214356&r2=214357&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/text-format-errors.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/text-format-errors.test Wed Jul 30 18:02:01 2014
@@ -1,10 +1,10 @@
-RUN: not llvm-profdata show %p/Inputs/invalid-count-later.profdata 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
-RUN: not llvm-profdata merge %p/Inputs/invalid-count-later.profdata %p/Inputs/invalid-count-later.profdata -o %t.out 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
-INVALID-COUNT-LATER: error: {{.*}}invalid-count-later.profdata: Malformed profile data
+RUN: not llvm-profdata show %p/Inputs/invalid-count-later.proftext 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
+RUN: not llvm-profdata merge %p/Inputs/invalid-count-later.proftext %p/Inputs/invalid-count-later.profdata -o %t.out 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
+INVALID-COUNT-LATER: error: {{.*}}invalid-count-later.proftext: Malformed profile data
-RUN: not llvm-profdata show %p/Inputs/bad-hash.profdata 2>&1 | FileCheck %s --check-prefix=BAD-HASH
-RUN: not llvm-profdata merge %p/Inputs/bad-hash.profdata %p/Inputs/bad-hash.profdata -o %t.out 2>&1 | FileCheck %s --check-prefix=BAD-HASH
-BAD-HASH: error: {{.*}}bad-hash.profdata: Malformed profile data
+RUN: not llvm-profdata show %p/Inputs/bad-hash.proftext 2>&1 | FileCheck %s --check-prefix=BAD-HASH
+RUN: not llvm-profdata merge %p/Inputs/bad-hash.proftext %p/Inputs/bad-hash.proftext -o %t.out 2>&1 | FileCheck %s --check-prefix=BAD-HASH
+BAD-HASH: error: {{.*}}bad-hash.proftext: Malformed profile data
-RUN: not llvm-profdata show %p/Inputs/no-counts.profdata 2>&1 | FileCheck %s --check-prefix=NO-COUNTS
-NO-COUNTS: error: {{.*}}no-counts.profdata: Malformed profile data
+RUN: not llvm-profdata show %p/Inputs/no-counts.proftext 2>&1 | FileCheck %s --check-prefix=NO-COUNTS
+NO-COUNTS: error: {{.*}}no-counts.proftext: Malformed profile data
More information about the llvm-commits
mailing list