diff options
author | Justin Bogner <mail@justinbogner.com> | 2014-03-12 22:00:57 +0000 |
---|---|---|
committer | Justin Bogner <mail@justinbogner.com> | 2014-03-12 22:00:57 +0000 |
commit | efa9416a21d7cac98996b92a805321ad061f54c0 (patch) | |
tree | a69da4d26ec90b29ec8aa9fea0a40cfb6c13474e /test/tools | |
parent | 4a0593ccd38cf01419e957e3947ed24cb3e06a07 (diff) | |
download | llvm-efa9416a21d7cac98996b92a805321ad061f54c0.tar.gz llvm-efa9416a21d7cac98996b92a805321ad061f54c0.tar.bz2 llvm-efa9416a21d7cac98996b92a805321ad061f54c0.tar.xz |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203723 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/tools')
25 files changed, 77 insertions, 150 deletions
diff --git a/test/tools/llvm-profdata/Inputs/bad-function-count.profdata b/test/tools/llvm-profdata/Inputs/bad-function-count.profdata new file mode 100644 index 0000000000..7d247626e5 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/bad-function-count.profdata @@ -0,0 +1,2 @@ +function_count_not 1count +1 diff --git a/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input b/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input deleted file mode 100644 index faa6f40152..0000000000 --- a/test/tools/llvm-profdata/Inputs/bad-hash.profdata.input +++ /dev/null @@ -1,4 +0,0 @@ -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 new file mode 100644 index 0000000000..cb8b409891 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/bar3-1.profdata @@ -0,0 +1,4 @@ +bar 3 +1 +2 +3 diff --git a/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input b/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input deleted file mode 100644 index 5486e9d84d..0000000000 --- a/test/tools/llvm-profdata/Inputs/bar3-1.profdata.input +++ /dev/null @@ -1,6 +0,0 @@ -bar -3 -3 -1 -2 -3 diff --git a/test/tools/llvm-profdata/Inputs/empty.profdata.input b/test/tools/llvm-profdata/Inputs/empty.profdata index e69de29bb2..e69de29bb2 100644 --- a/test/tools/llvm-profdata/Inputs/empty.profdata.input +++ b/test/tools/llvm-profdata/Inputs/empty.profdata diff --git a/test/tools/llvm-profdata/Inputs/extra-word.profdata.input b/test/tools/llvm-profdata/Inputs/extra-word.profdata index 67a662909c..67a662909c 100644 --- a/test/tools/llvm-profdata/Inputs/extra-word.profdata.input +++ b/test/tools/llvm-profdata/Inputs/extra-word.profdata diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.profdata b/test/tools/llvm-profdata/Inputs/foo3-1.profdata new file mode 100644 index 0000000000..d6f9f648b7 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/foo3-1.profdata @@ -0,0 +1,4 @@ +foo 3 +1 +2 +3 diff --git a/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input b/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input deleted file mode 100644 index 14a6200435..0000000000 --- a/test/tools/llvm-profdata/Inputs/foo3-1.profdata.input +++ /dev/null @@ -1,6 +0,0 @@ -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 new file mode 100644 index 0000000000..94fd034391 --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/foo3-2.profdata @@ -0,0 +1,4 @@ +foo 3 +7 +5 +3 diff --git a/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input b/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input deleted file mode 100644 index 801846e440..0000000000 --- a/test/tools/llvm-profdata/Inputs/foo3-2.profdata.input +++ /dev/null @@ -1,6 +0,0 @@ -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 new file mode 100644 index 0000000000..85b702d497 --- /dev/null +++ b/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/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input b/test/tools/llvm-profdata/Inputs/foo3bar3-1.profdata.input deleted file mode 100644 index 12157b9f9a..0000000000 --- a/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/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input b/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata index f1f10bd6f3..d652781a35 100644 --- a/test/tools/llvm-profdata/Inputs/foo3bar3-2.profdata.input +++ b/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/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input b/test/tools/llvm-profdata/Inputs/foo4-1.profdata index 31d2a2ce75..4d694080bf 100644 --- a/test/tools/llvm-profdata/Inputs/foo4-1.profdata.input +++ b/test/tools/llvm-profdata/Inputs/foo4-1.profdata @@ -1,6 +1,4 @@ -foo -4 -4 +foo 4 11 22 33 diff --git a/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input b/test/tools/llvm-profdata/Inputs/foo4-2.profdata index 01d8309b5c..8d91d8bbef 100644 --- a/test/tools/llvm-profdata/Inputs/foo4-2.profdata.input +++ b/test/tools/llvm-profdata/Inputs/foo4-2.profdata @@ -1,6 +1,4 @@ -foo -4 -4 +foo 4 7 6 5 diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata new file mode 100644 index 0000000000..5575df3fda --- /dev/null +++ b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata @@ -0,0 +1,2 @@ +invalid_count 1 +1later diff --git a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input b/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input deleted file mode 100644 index 2b61c55a67..0000000000 --- a/test/tools/llvm-profdata/Inputs/invalid-count-later.profdata.input +++ /dev/null @@ -1,4 +0,0 @@ -invalid_count -1 -1 -1later diff --git a/test/tools/llvm-profdata/Inputs/overflow.profdata.input b/test/tools/llvm-profdata/Inputs/overflow.profdata index c9a9d697ec..bfb9a52d2e 100644 --- a/test/tools/llvm-profdata/Inputs/overflow.profdata.input +++ b/test/tools/llvm-profdata/Inputs/overflow.profdata @@ -1,4 +1,2 @@ -overflow -1 -1 +overflow 1 9223372036854775808 diff --git a/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input b/test/tools/llvm-profdata/Inputs/three-words-long.profdata index a4d45fb3bf..a4d45fb3bf 100644 --- a/test/tools/llvm-profdata/Inputs/three-words-long.profdata.input +++ b/test/tools/llvm-profdata/Inputs/three-words-long.profdata diff --git a/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input b/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input deleted file mode 100644 index 129db626d1..0000000000 --- a/test/tools/llvm-profdata/Inputs/wrong-count.profdata.input +++ /dev/null @@ -1,4 +0,0 @@ -wrong_count -3 -3 -1 diff --git a/test/tools/llvm-profdata/errors.test b/test/tools/llvm-profdata/errors.test new file mode 100644 index 0000000000..6335ea95f9 --- /dev/null +++ b/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/test/tools/llvm-profdata/generate.test b/test/tools/llvm-profdata/generate.test deleted file mode 100644 index 71e8b50fca..0000000000 --- a/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/test/tools/llvm-profdata/merge-errors.test b/test/tools/llvm-profdata/merge-errors.test deleted file mode 100644 index 1ab08be9f1..0000000000 --- a/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/test/tools/llvm-profdata/simple-merges.test b/test/tools/llvm-profdata/simple-merges.test deleted file mode 100644 index 401ae6b58e..0000000000 --- a/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/test/tools/llvm-profdata/simple.test b/test/tools/llvm-profdata/simple.test new file mode 100644 index 0000000000..87073fad9c --- /dev/null +++ b/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$}} |