[profile] Fix the tests for patch in https://reviews.llvm.org/D49916.

[calixte]

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.

[marco-c]

test/profile/Inputs/instrprof-dlopen-func.c.gcov

6 ↗

(On Diff #157687)

Shouldn't this be 1?

[calixte]

test/profile/Inputs/instrprof-dlopen-func.c.gcov

6 ↗

(On Diff #157687)

With the patch to attach function line def to first block, we'll have 1. But here we've 0 since "ret void" isn't instrumented.

[calixte]

Fix the tests.

compiler-rt/trunk/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov

 // CHECK-NEXT:        1:   77:  int n = 10;
 // CHECK-NEXT:        -:   78:
 // CHECK-NEXT:        1:   79:  if (n % 5 == 0)
 // CHECK-NEXT:        1:   80:    g1++;
 // CHECK-NEXT:        -:   81:  else
 // CHECK-NEXT:    #####:   82:    g2++;
 // CHECK-NEXT:        -:   83:
 // CHECK-NEXT:        1:   84:  return EXIT_SUCCESS;
-// CHECK-NEXT:        1:   85:}
+// CHECK-NEXT:        -:   85:}
 // CHECK-NEXT:        -:   86:

compiler-rt/trunk/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov

 // CHECK-NEXT:        1:   77:  int n = 10;
 // CHECK-NEXT:        -:   78:
 // CHECK-NEXT:        1:   79:  if (n % 5 == 0)
 // CHECK-NEXT:        1:   80:    g1++;
 // CHECK-NEXT:        -:   81:  else
 // CHECK-NEXT:    #####:   82:    g2++;
 // CHECK-NEXT:        -:   83:
 // CHECK-NEXT:        1:   84:  return EXIT_SUCCESS;
-// CHECK-NEXT:        1:   85:}
+// CHECK-NEXT:        -:   85:}
 // CHECK-NEXT:        -:   86:

compiler-rt/trunk/test/profile/Inputs/instrprof-dlopen-func.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-dlopen-func.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-dlopen-func.gcno
 // 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) {}

compiler-rt/trunk/test/profile/Inputs/instrprof-dlopen-func2.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-dlopen-func2.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-dlopen-func2.gcno
 // 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) {}

compiler-rt/trunk/test/profile/Inputs/instrprof-dlopen-func3.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-dlopen-func2.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-dlopen-func2.gcno
 // 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) {}

compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-gcov-exceptions.cpp
 // CHECK-NEXT:        -:    0:Graph:instrprof-gcov-exceptions.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-gcov-exceptions.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:#include <string>
 // 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:{
 // CHECK-NEXT:        1:    8:  asd("22");
 // CHECK-NEXT:        -:    9:
 // CHECK-NEXT:        1:   10:  return 0;
 // CHECK-NEXT:        -:   11:}

compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-gcov-multiple-bbs-single-line.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-gcov-multiple-bbs-single-line.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-gcov-multiple-bbs-single-line.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:function main called 1 returned 100% blocks executed 80%
 // CHECK-NEXT:        -:    1:int main(void)
 // CHECK-NEXT:        -:    2:{
 // CHECK-NEXT:        -:    3:  int var;
 // CHECK-NEXT:        -:    4:
 // CHECK-NEXT:        1:    5:  int a = 1;
 // CHECK-NEXT:        1:    6:  if (a) {
 // 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
 // CHECK-NEXT:branch  1 taken 0
 // CHECK-NEXT:        -:   11:
 // CHECK-NEXT:        1:   12:  int b = 0;
 // CHECK-NEXT:        1:   13:  if (b) {
 // 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
 // CHECK-NEXT:branch  1 taken 1
 // CHECK-NEXT:        -:   18:
 // CHECK-NEXT:        1:   19:  return 0;
 // CHECK-NEXT:        -:   20:}

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-lib.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-lib.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-lib.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-lib.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:void foo(int n) {
 // CHECK-NEXT:        1:    5:  if (n % 5 == 0)
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:        1:    8:    g2++;
-// CHECK-NEXT:        1:    9:}
+// CHECK-NEXT:        -:    9:}

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-lib.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-lib.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-lib.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:void foo(int n) {
 // CHECK-NEXT:        2:    5:  if (n % 5 == 0)
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:        2:    8:    g2++;
-// CHECK-NEXT:        2:    9:}
+// CHECK-NEXT:        -:    9:}

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-lib.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-lib.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-lib.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:void foo(int n) {
 // CHECK-NEXT:  1000000:    5:  if (n % 5 == 0)
 // CHECK-NEXT:   360000:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:   640000:    8:    g2++;
-// CHECK-NEXT:  1000000:    9:}
+// CHECK-NEXT:        -:    9:}

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-main-gcov-flush.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-main-gcov-flush.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-main-gcov-flush.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:extern void foo(int n);
 // CHECK-NEXT:        -:    2:extern void __gcov_flush(void);
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
 // CHECK-NEXT:        -:    7:void bar(int n) {
 // CHECK-NEXT:        1:    8:  if (n % 5 == 0)
 // 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
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
 // CHECK-NEXT:        -:   18:
 // CHECK-NEXT:        1:   19:  bar(5);
 // CHECK-NEXT:        -:   20:
 // CHECK-NEXT:        1:   21:  __gcov_flush();
 // CHECK-NEXT:        -:   22:
 // CHECK-NEXT:        1:   23:  bar(5);
 // CHECK-NEXT:        -:   24:
 // CHECK-NEXT:        -:   25:#ifdef SHARED_CALL_AFTER_GCOV_FLUSH
 // CHECK-NEXT:        1:   26:  foo(1);
 // CHECK-NEXT:        -:   27:#endif
 // CHECK-NEXT:        -:   28:
 // CHECK-NEXT:        -:   29:#ifdef EXIT_ABRUPTLY
 // CHECK-NEXT:        1:   30:  _exit(0);
 // CHECK-NEXT:        -:   31:#endif
 // CHECK-NEXT:        -:   32:
 // CHECK-NEXT:        -:   33:  bar(5);
 // CHECK-NEXT:        -:   34:
 // CHECK-NEXT:        -:   35:  return 0;
-// CHECK-NEXT:    #####:   36:}
+// CHECK-NEXT:        -:   36:}

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-main-gcov-flush.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-main-gcov-flush.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-main-gcov-flush.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:extern void foo(int n);
 // CHECK-NEXT:        -:    2:extern void __gcov_flush(void);
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
 // CHECK-NEXT:        -:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // 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
 // CHECK-NEXT:        -:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
 // CHECK-NEXT:        -:   18:
 // CHECK-NEXT:        1:   19:  bar(5);
 // CHECK-NEXT:        -:   20:

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-main-gcov-flush.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-main-gcov-flush.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-main-gcov-flush.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:extern void foo(int n);
 // CHECK-NEXT:        -:    2:extern void __gcov_flush(void);
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
 // CHECK-NEXT:        -:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // 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
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
 // CHECK-NEXT:        -:   18:
 // CHECK-NEXT:        1:   19:  bar(5);
 // CHECK-NEXT:        -:   20:

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-main-gcov-flush.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-main-gcov-flush.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-main-gcov-flush.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:extern void foo(int n);
 // CHECK-NEXT:        -:    2:extern void __gcov_flush(void);
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
 // CHECK-NEXT:        -:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // 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
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
 // CHECK-NEXT:        -:   18:
 // CHECK-NEXT:        1:   19:  bar(5);
 // CHECK-NEXT:        -:   20:

compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov

 // CHECK:        -:    0:Source:{{.*}}Inputs/instrprof-shared-main.c
 // CHECK-NEXT:        -:    0:Graph:instrprof-shared-main.gcno
 // CHECK-NEXT:        -:    0:Data:instrprof-shared-main.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:extern int g1, g2;
 // CHECK-NEXT:        -:    2:extern void foo(int n);
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int main() {
 // 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:}

compiler-rt/trunk/test/profile/instrprof-gcov-exceptions.test

 
 # Test with exceptions enabled, the result in terms of line counts should be the same.
 RUN: %clangxx --coverage -o %t %S/Inputs/instrprof-gcov-exceptions.cpp
 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