From: Justin Bogner <mail@justinbogner.com>
Date: Wed, 30 Jul 2014 23:02:01 +0000 (+0000)
Subject: llvm-profdata: Use consistent file suffixes in tests
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2adcddcd8427f208ba0b87e62084a43f2947c9a3;p=oota-llvm.git

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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214357 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/tools/llvm-profdata/Inputs/bad-hash.profdata b/test/tools/llvm-profdata/Inputs/bad-hash.profdata
deleted file mode 100644
index faa6f401525..00000000000
--- a/test/tools/llvm-profdata/Inputs/bad-hash.profdata
+++ /dev/null
@@ -1,4 +0,0 @@
-function_count_not
-badhash
-1
-1
diff --git a/test/tools/llvm-profdata/Inputs/bad-hash.proftext b/test/tools/llvm-profdata/Inputs/bad-hash.proftext
new file mode 100644
index 00000000000..faa6f401525
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/bad-hash.proftext
@@ -0,0 +1,4 @@
+function_count_not
+badhash
+1
+1
diff --git a/test/tools/llvm-profdata/Inputs/bar3-1.profdata b/test/tools/llvm-profdata/Inputs/bar3-1.profdata
deleted file mode 100644
index 5486e9d84d7..00000000000
--- a/test/tools/llvm-profdata/Inputs/bar3-1.profdata
+++ /dev/null
@@ -1,6 +0,0 @@
-bar
-3
-3
-1
-2
-3
diff --git a/test/tools/llvm-profdata/Inputs/bar3-1.proftext b/test/tools/llvm-profdata/Inputs/bar3-1.proftext
new file mode 100644
index 00000000000..5486e9d84d7
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/bar3-1.proftext
@@ -0,0 +1,6 @@
+bar
+3
+3
+1
+2
+3
diff --git a/test/tools/llvm-profdata/Inputs/c-general.profdata b/test/tools/llvm-profdata/Inputs/c-general.profdata
deleted file mode 100644
index e8cef21de5f..00000000000
Binary files a/test/tools/llvm-profdata/Inputs/c-general.profdata and /dev/null differ
diff --git a/test/tools/llvm-profdata/Inputs/c-general.profraw b/test/tools/llvm-profdata/Inputs/c-general.profraw
new file mode 100644
index 00000000000..e8cef21de5f
Binary files /dev/null and b/test/tools/llvm-profdata/Inputs/c-general.profraw differ
diff --git a/test/tools/llvm-profdata/Inputs/empty.profdata b/test/tools/llvm-profdata/Inputs/empty.profdata
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/tools/llvm-profdata/Inputs/empty.proftext b/test/tools/llvm-profdata/Inputs/empty.proftext
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/tools/llvm-profdata/Inputs/extra-word.profdata b/test/tools/llvm-profdata/Inputs/extra-word.profdata
deleted file mode 100644
index 67a662909cf..00000000000
--- a/test/tools/llvm-profdata/Inputs/extra-word.profdata
+++ /dev/null
@@ -1,2 +0,0 @@
-extra 1 word
-1
diff --git a/test/tools/llvm-profdata/Inputs/extra-word.proftext b/test/tools/llvm-profdata/Inputs/extra-word.proftext
new file mode 100644
index 00000000000..67a662909cf
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/extra-word.proftext
@@ -0,0 +1,2 @@
+extra 1 word
+1
diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.profdata b/test/tools/llvm-profdata/Inputs/foo3-1.profdata
deleted file mode 100644
index 14a62004357..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo3-1.profdata
+++ /dev/null
@@ -1,6 +0,0 @@
-foo
-3
-3
-1
-2
-3
diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.proftext b/test/tools/llvm-profdata/Inputs/foo3-1.proftext
new file mode 100644
index 00000000000..14a62004357
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo3-1.proftext
@@ -0,0 +1,6 @@
+foo
+3
+3
+1
+2
+3
diff --git a/test/tools/llvm-profdata/Inputs/foo3-2.profdata b/test/tools/llvm-profdata/Inputs/foo3-2.profdata
deleted file mode 100644
index 801846e4404..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo3-2.profdata
+++ /dev/null
@@ -1,6 +0,0 @@
-foo
-3
-3
-7
-5
-3
diff --git a/test/tools/llvm-profdata/Inputs/foo3-2.proftext b/test/tools/llvm-profdata/Inputs/foo3-2.proftext
new file mode 100644
index 00000000000..801846e4404
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo3-2.proftext
@@ -0,0 +1,6 @@
+foo
+3
+3
+7
+5
+3
diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata b/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
deleted file mode 100644
index 12157b9f9ad..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
+++ /dev/null
@@ -1,13 +0,0 @@
-foo
-3
-3
-2
-3
-5
-
-bar
-3
-3
-7
-11
-13
diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext b/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext
new file mode 100644
index 00000000000..12157b9f9ad
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo3bar3-1.proftext
@@ -0,0 +1,13 @@
+foo
+3
+3
+2
+3
+5
+
+bar
+3
+3
+7
+11
+13
diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata b/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
deleted file mode 100644
index f1f10bd6f3d..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
+++ /dev/null
@@ -1,13 +0,0 @@
-foo
-3
-3
-17
-19
-23
-
-bar
-3
-3
-29
-31
-37
diff --git a/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext b/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext
new file mode 100644
index 00000000000..f1f10bd6f3d
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo3bar3-2.proftext
@@ -0,0 +1,13 @@
+foo
+3
+3
+17
+19
+23
+
+bar
+3
+3
+29
+31
+37
diff --git a/test/tools/llvm-profdata/Inputs/foo4-1.profdata b/test/tools/llvm-profdata/Inputs/foo4-1.profdata
deleted file mode 100644
index 31d2a2ce756..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo4-1.profdata
+++ /dev/null
@@ -1,7 +0,0 @@
-foo
-4
-4
-11
-22
-33
-44
diff --git a/test/tools/llvm-profdata/Inputs/foo4-1.proftext b/test/tools/llvm-profdata/Inputs/foo4-1.proftext
new file mode 100644
index 00000000000..31d2a2ce756
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo4-1.proftext
@@ -0,0 +1,7 @@
+foo
+4
+4
+11
+22
+33
+44
diff --git a/test/tools/llvm-profdata/Inputs/foo4-2.profdata b/test/tools/llvm-profdata/Inputs/foo4-2.profdata
deleted file mode 100644
index 01d8309b5ce..00000000000
--- a/test/tools/llvm-profdata/Inputs/foo4-2.profdata
+++ /dev/null
@@ -1,7 +0,0 @@
-foo
-4
-4
-7
-6
-5
-4
diff --git a/test/tools/llvm-profdata/Inputs/foo4-2.proftext b/test/tools/llvm-profdata/Inputs/foo4-2.proftext
new file mode 100644
index 00000000000..01d8309b5ce
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/foo4-2.proftext
@@ -0,0 +1,7 @@
+foo
+4
+4
+7
+6
+5
+4
diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
deleted file mode 100644
index 2b61c55a676..00000000000
--- a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
+++ /dev/null
@@ -1,4 +0,0 @@
-invalid_count
-1
-1
-1later
diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext b/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext
new file mode 100644
index 00000000000..2b61c55a676
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/invalid-count-later.proftext
@@ -0,0 +1,4 @@
+invalid_count
+1
+1
+1later
diff --git a/test/tools/llvm-profdata/Inputs/no-counts.profdata b/test/tools/llvm-profdata/Inputs/no-counts.profdata
deleted file mode 100644
index 5c1fa15c086..00000000000
--- a/test/tools/llvm-profdata/Inputs/no-counts.profdata
+++ /dev/null
@@ -1,3 +0,0 @@
-no_counts
-0
-0
diff --git a/test/tools/llvm-profdata/Inputs/no-counts.proftext b/test/tools/llvm-profdata/Inputs/no-counts.proftext
new file mode 100644
index 00000000000..5c1fa15c086
--- /dev/null
+++ b/test/tools/llvm-profdata/Inputs/no-counts.proftext
@@ -0,0 +1,3 @@
+no_counts
+0
+0
diff --git a/test/tools/llvm-profdata/c-general.test b/test/tools/llvm-profdata/c-general.test
index 9b6cd7f4828..01435303d44 100644
--- a/test/tools/llvm-profdata/c-general.test
+++ b/test/tools/llvm-profdata/c-general.test
@@ -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:
diff --git a/test/tools/llvm-profdata/hash-mismatch.profdata b/test/tools/llvm-profdata/hash-mismatch.profdata
deleted file mode 100644
index 12632588b64..00000000000
--- a/test/tools/llvm-profdata/hash-mismatch.profdata
+++ /dev/null
@@ -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
diff --git a/test/tools/llvm-profdata/hash-mismatch.proftext b/test/tools/llvm-profdata/hash-mismatch.proftext
new file mode 100644
index 00000000000..e4f1a4ca431
--- /dev/null
+++ b/test/tools/llvm-profdata/hash-mismatch.proftext
@@ -0,0 +1,17 @@
+# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
+# CHECK: hash-mismatch.proftext: foo: Function hash mismatch
+
+foo
+3
+3
+1
+2
+3
+
+foo
+4
+4
+11
+22
+33
+44
diff --git a/test/tools/llvm-profdata/lit.local.cfg b/test/tools/llvm-profdata/lit.local.cfg
index 33bc0a9ac58..d44913a8239 100644
--- a/test/tools/llvm-profdata/lit.local.cfg
+++ b/test/tools/llvm-profdata/lit.local.cfg
@@ -1 +1 @@
-config.suffixes.add('.profdata')
+config.suffixes.add('.proftext')
diff --git a/test/tools/llvm-profdata/multiple-inputs.test b/test/tools/llvm-profdata/multiple-inputs.test
index 82d417e2b7b..35f530a1f0f 100644
--- a/test/tools/llvm-profdata/multiple-inputs.test
+++ b/test/tools/llvm-profdata/multiple-inputs.test
@@ -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
diff --git a/test/tools/llvm-profdata/overflow.profdata b/test/tools/llvm-profdata/overflow.profdata
deleted file mode 100644
index 62ced0552ce..00000000000
--- a/test/tools/llvm-profdata/overflow.profdata
+++ /dev/null
@@ -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
diff --git a/test/tools/llvm-profdata/overflow.proftext b/test/tools/llvm-profdata/overflow.proftext
new file mode 100644
index 00000000000..cbf3bf16182
--- /dev/null
+++ b/test/tools/llvm-profdata/overflow.proftext
@@ -0,0 +1,12 @@
+# RUN: llvm-profdata merge %s -o %t.out 2>&1 | FileCheck %s
+# CHECK: overflow.proftext: overflow: Counter overflow
+
+overflow
+1
+1
+9223372036854775808
+
+overflow
+1
+1
+9223372036854775808
diff --git a/test/tools/llvm-profdata/text-format-errors.test b/test/tools/llvm-profdata/text-format-errors.test
index 870001f4816..01513e4fcb9 100644
--- a/test/tools/llvm-profdata/text-format-errors.test
+++ b/test/tools/llvm-profdata/text-format-errors.test
@@ -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