From 8f7aab5c61c636a4870b2b9dd3a9e11deedd4ef6 Mon Sep 17 00:00:00 2001 From: Calixte Denizet Date: Fri, 21 Sep 2018 09:17:14 +0000 Subject: [PATCH] [profile] Fix the tests for patch in https://reviews.llvm.org/D49916. Summary: The goal of D49916 is to remove some hit counters from lines like '}'. So as a consequence, the tests must be fixed. FYI, after holidays, I'll add more tests. Reviewers: marco-c, davidxl Reviewed By: marco-c Subscribers: delcypher, llvm-commits, #sanitizers, sylvestre.ledru Differential Revision: https://reviews.llvm.org/D49917 llvm-svn: 342718 --- compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov | 2 +- .../profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov | 2 +- .../profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov | 4 ++-- compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov | 2 +- .../test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov | 2 +- .../Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov | 4 ++-- .../Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov | 2 +- .../instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov | 2 +- .../Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov | 2 +- compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov | 4 ++-- compiler-rt/test/profile/instrprof-gcov-exceptions.test | 3 +-- 16 files changed, 19 insertions(+), 20 deletions(-) diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov index acb2076..71ffe37 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov @@ -87,5 +87,5 @@ // CHECK-NEXT: #####: 82: g2++; // CHECK-NEXT: -: 83: // CHECK-NEXT: 1: 84: return EXIT_SUCCESS; -// CHECK-NEXT: 1: 85:} +// CHECK-NEXT: -: 85:} // CHECK-NEXT: -: 86: diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov index 97eef4c..fe99774 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov @@ -87,5 +87,5 @@ // CHECK-NEXT: #####: 82: g2++; // CHECK-NEXT: -: 83: // CHECK-NEXT: 1: 84: return EXIT_SUCCESS; -// CHECK-NEXT: 1: 85:} +// CHECK-NEXT: -: 85:} // CHECK-NEXT: -: 86: diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov index 3af4ec9..6eff918 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: 1: 1:void func(int K) {} +// CHECK-NEXT: -: 1:void func(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov index 7101f74..3fc16b1 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func2.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: 1: 1:void func2(int K) {} +// CHECK-NEXT: -: 1:void func2(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov index 7101f74..3fc16b1 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func2.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: 1: 1:void func2(int K) {} +// CHECK-NEXT: -: 1:void func2(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov index 2a7b724..7e5e3fc 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov @@ -6,7 +6,7 @@ // CHECK-NEXT: -: 1:#include // CHECK-NEXT: -: 2: // CHECK-NEXT: -: 3:void asd(std::string i) { -// CHECK-NEXT: 1: 4:} +// CHECK-NEXT: -: 4:} // CHECK-NEXT: -: 5: // CHECK-NEXT: -: 6:int main(void) // CHECK-NEXT: -: 7:{ diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov index 92532af..c173d6d 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov @@ -13,7 +13,7 @@ // CHECK-NEXT:branch 0 taken 1 // CHECK-NEXT:branch 1 taken 0 // CHECK-NEXT: 1: 7: var++; -// CHECK-NEXT: 1: 8: } +// CHECK-NEXT: -: 8: } // CHECK-NEXT: -: 9: // CHECK-NEXT: 1: 10: if (a) {} // CHECK-NEXT:branch 0 taken 1 @@ -24,7 +24,7 @@ // CHECK-NEXT:branch 0 taken 0 // CHECK-NEXT:branch 1 taken 1 // CHECK-NEXT: #####: 14: var++; -// CHECK-NEXT: #####: 15: } +// CHECK-NEXT: -: 15: } // CHECK-NEXT: -: 16: // CHECK-NEXT: 1: 17: if (b) {} // CHECK-NEXT:branch 0 taken 0 diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov index fbc43d5..6e11c71 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: #####: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 1: 8: g2++; -// CHECK-NEXT: 1: 9:} +// CHECK-NEXT: -: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov index 779c885..a0bb1f8 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: #####: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 2: 8: g2++; -// CHECK-NEXT: 2: 9:} +// CHECK-NEXT: -: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov index 76503d9..84da7c9 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: 360000: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 640000: 8: g2++; -// CHECK-NEXT: 1000000: 9:} +// CHECK-NEXT: -: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov index b2dfe2a..49c1fc7 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 1: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: 1: 12:} +// CHECK-NEXT: -: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH @@ -38,4 +38,4 @@ // CHECK-NEXT: -: 33: bar(5); // CHECK-NEXT: -: 34: // CHECK-NEXT: -: 35: return 0; -// CHECK-NEXT: #####: 36:} +// CHECK-NEXT: -: 36:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov index f70e34e..d8003ce 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: 3: 12:} +// CHECK-NEXT: -: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov index b9ecff6..7f103cf 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: 3: 12:} +// CHECK-NEXT: -: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov index 7c9e0af..c893d7c 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: 3: 12:} +// CHECK-NEXT: -: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov index 1636ca6..9694acc 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov @@ -10,9 +10,9 @@ // CHECK-NEXT: -: 5: int i, j; // CHECK-NEXT: 1001: 6: for (i = 0; i < 1000; i++) // CHECK-NEXT: 1001000: 7: for (j = 0; j < 1000; j++) -// CHECK-NEXT: 1001000: 8: foo(i * j); +// CHECK-NEXT: 1000000: 8: foo(i * j); // CHECK-NEXT: -: 9: // CHECK-NEXT: 1: 10: if (g2 - g1 == 280001) // CHECK-NEXT: 1: 11: return 0; // CHECK-NEXT: #####: 12: return 1; -// CHECK-NEXT: 1: 13:} +// CHECK-NEXT: -: 13:} diff --git a/compiler-rt/test/profile/instrprof-gcov-exceptions.test b/compiler-rt/test/profile/instrprof-gcov-exceptions.test index 20ca47a..073200e 100644 --- a/compiler-rt/test/profile/instrprof-gcov-exceptions.test +++ b/compiler-rt/test/profile/instrprof-gcov-exceptions.test @@ -17,5 +17,4 @@ RUN: test -f instrprof-gcov-exceptions.gcno RUN: rm -f instrprof-gcov-exceptions.gcda RUN: %run %t RUN: llvm-cov gcov instrprof-gcov-exceptions.gcda -# The result should be the same, not using XFAIL as only this part of the test is failing. -RUN: not FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov +RUN: FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov -- 2.7.4