Back out Profile library and dependent commits

Chandler voiced some concern with checking this in without some
discussion first. Reverting for now.

This reverts r203703, r203704, r203708, and 203709.

llvm-svn: 203723

25 files changed, 77 insertions, 150 deletions

diff --git a/llvm/test/tools/llvm-profdata/Inputs/bad-function-count.profdata b/llvm/test/tools/llvm-profdata/Inputs/bad-function-count.profdata
new file mode 100644
index 00000000000..7d247626e5a
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/bad-function-count.profdata
@@ -0,0 +1,2 @@
+function_count_not 1count
+1
diff --git a/llvm/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input
deleted file mode 100644
index faa6f401525..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input
+++ /dev/null
@@ -1,4 +0,0 @@
-function_count_not
-badhash
-1
-1
diff --git a/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata b/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata
new file mode 100644
index 00000000000..cb8b409891a
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata
@@ -0,0 +1,4 @@
+bar 3
+1
+2
+3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input
deleted file mode 100644
index 5486e9d84d7..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input
+++ /dev/null
@@ -1,6 +0,0 @@
-bar
-3
-3
-1
-2
-3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/empty.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/empty.profdata
index e69de29bb2d..e69de29bb2d 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/empty.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/empty.profdata
diff --git a/llvm/test/tools/llvm-profdata/Inputs/extra-word.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/extra-word.profdata
index 67a662909cf..67a662909cf 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/extra-word.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/extra-word.profdata
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata b/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata
new file mode 100644
index 00000000000..d6f9f648b7b
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata
@@ -0,0 +1,4 @@
+foo 3
+1
+2
+3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input
deleted file mode 100644
index 14a62004357..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input
+++ /dev/null
@@ -1,6 +0,0 @@
-foo
-3
-3
-1
-2
-3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata b/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata
new file mode 100644
index 00000000000..94fd0343915
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata
@@ -0,0 +1,4 @@
+foo 3
+7
+5
+3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input
deleted file mode 100644
index 801846e4404..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input
+++ /dev/null
@@ -1,6 +0,0 @@
-foo
-3
-3
-7
-5
-3
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata b/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
new file mode 100644
index 00000000000..85b702d4977
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata
@@ -0,0 +1,9 @@
+foo 3
+2
+3
+5
+
+bar 3
+7
+11
+13
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input
deleted file mode 100644
index 12157b9f9ad..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input
+++ /dev/null
@@ -1,13 +0,0 @@
-foo
-3
-3
-2
-3
-5
-
-bar
-3
-3
-7
-11
-13
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
index f1f10bd6f3d..d652781a35c 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata
@@ -1,13 +1,9 @@
-foo
-3
-3
+foo 3
 17
 19
 23
 
-bar
-3
-3
+bar 3
 29
 31
 37
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo4-1.profdata
index 31d2a2ce756..4d694080bff 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo4-1.profdata
@@ -1,6 +1,4 @@
-foo
-4
-4
+foo 4
 11
 22
 33
diff --git a/llvm/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/foo4-2.profdata
index 01d8309b5ce..8d91d8bbef0 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/foo4-2.profdata
@@ -1,6 +1,4 @@
-foo
-4
-4
+foo 4
 7
 6
 5
diff --git a/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata b/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
new file mode 100644
index 00000000000..5575df3fda6
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata
@@ -0,0 +1,2 @@
+invalid_count 1
+1later
diff --git a/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input
deleted file mode 100644
index 2b61c55a676..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input
+++ /dev/null
@@ -1,4 +0,0 @@
-invalid_count
-1
-1
-1later
diff --git a/llvm/test/tools/llvm-profdata/Inputs/overflow.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/overflow.profdata
index c9a9d697ecf..bfb9a52d2ec 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/overflow.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/overflow.profdata
@@ -1,4 +1,2 @@
-overflow
-1
-1
+overflow 1
 9223372036854775808
diff --git a/llvm/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/three-words-long.profdata
index a4d45fb3bfa..a4d45fb3bfa 100644
--- a/llvm/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input
+++ b/llvm/test/tools/llvm-profdata/Inputs/three-words-long.profdata
diff --git a/llvm/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input b/llvm/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input
deleted file mode 100644
index 129db626d14..00000000000
--- a/llvm/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input
+++ /dev/null
@@ -1,4 +0,0 @@
-wrong_count
-3
-3
-1
diff --git a/llvm/test/tools/llvm-profdata/errors.test b/llvm/test/tools/llvm-profdata/errors.test
new file mode 100644
index 00000000000..6335ea95f9e
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/errors.test
@@ -0,0 +1,22 @@
+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
diff --git a/llvm/test/tools/llvm-profdata/generate.test b/llvm/test/tools/llvm-profdata/generate.test
deleted file mode 100644
index 71e8b50fcad..00000000000
--- a/llvm/test/tools/llvm-profdata/generate.test
+++ /dev/null
@@ -1,38 +0,0 @@
-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
diff --git a/llvm/test/tools/llvm-profdata/merge-errors.test b/llvm/test/tools/llvm-profdata/merge-errors.test
deleted file mode 100644
index 1ab08be9f14..00000000000
--- a/llvm/test/tools/llvm-profdata/merge-errors.test
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/llvm/test/tools/llvm-profdata/simple-merges.test b/llvm/test/tools/llvm-profdata/simple-merges.test
deleted file mode 100644
index 401ae6b58e3..00000000000
--- a/llvm/test/tools/llvm-profdata/simple-merges.test
+++ /dev/null
@@ -1,33 +0,0 @@
-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]
diff --git a/llvm/test/tools/llvm-profdata/simple.test b/llvm/test/tools/llvm-profdata/simple.test
new file mode 100644
index 00000000000..87073fad9cf
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/simple.test
@@ -0,0 +1,25 @@
+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$}}