[InstrProf] Fix macOS profile tests after D156569

In https://reviews.llvm.org/D156569 we changed the format of the IRPGO
counter names which broke some macOS tests because the `__profc_`
variable names changed. Use `{{_?}}` to allow mangled names to be
prefixed with `_` to pass tests.

Reviewed By: thakis

Differential Revision: https://reviews.llvm.org/D157321

Author: ellishg

clang/test/CodeGen/profile-filter.c

@@ -37,11 +37,11 @@ unsigned i;
 // EXCLUDE: noprofile
 // EXCLUDE: @test1
 unsigned test1(void) {
-  // CHECK: %pgocount = load i64, ptr @__profc_test1
-  // FUNC: %pgocount = load i64, ptr @__profc_test1
-  // FILE: %pgocount = load i64, ptr @__profc_test1
-  // SECTION-NOT: %pgocount = load i64, ptr @__profc_test1
-  // EXCLUDE-NOT: %pgocount = load i64, ptr @__profc_test1
+  // CHECK: %pgocount = load i64, ptr @__profc_{{_?}}test1
+  // FUNC: %pgocount = load i64, ptr @__profc_{{_?}}test1
+  // FILE: %pgocount = load i64, ptr @__profc_{{_?}}test1
+  // SECTION-NOT: %pgocount = load i64, ptr @__profc_{{_?}}test1
+  // EXCLUDE-NOT: %pgocount = load i64, ptr @__profc_{{_?}}test1
   return i + 1;
 }
 
@@ -56,10 +56,10 @@ unsigned test1(void) {
 // EXCLUDE-NOT: noprofile
 // EXCLUDE: @test2
 unsigned test2(void) {
-  // CHECK: %pgocount = load i64, ptr @__profc_test2
-  // FUNC-NOT: %pgocount = load i64, ptr @__profc_test2
-  // FILE: %pgocount = load i64, ptr @__profc_test2
-  // SECTION: %pgocount = load i64, ptr @__profc_test2
-  // EXCLUDE: %pgocount = load i64, ptr @__profc_test2
+  // CHECK: %pgocount = load i64, ptr @__profc_{{_?}}test2
+  // FUNC-NOT: %pgocount = load i64, ptr @__profc_{{_?}}test2
+  // FILE: %pgocount = load i64, ptr @__profc_{{_?}}test2
+  // SECTION: %pgocount = load i64, ptr @__profc_{{_?}}test2
+  // EXCLUDE: %pgocount = load i64, ptr @__profc_{{_?}}test2
   return i - 1;
 }

clang/test/Profile/gcc-flag-compatibility.c

@@ -9,8 +9,8 @@
 
 // On AIX, -flto used to be required with -fprofile-generate. gcc-flag-compatibility-aix.c is used to do the testing on AIX with -flto
 // RUN: %clang %s -c -S -o - -emit-llvm -fprofile-generate | FileCheck -check-prefix=PROFILE-GEN %s
-// PROFILE-GEN: @__profc_main = {{(private|internal)}} global [2 x i64] zeroinitializer, section
-// PROFILE-GEN: @__profd_main =
+// PROFILE-GEN: @__profc_{{_?}}main = {{(private|internal)}} global [2 x i64] zeroinitializer, section
+// PROFILE-GEN: @__profd_{{_?}}main =
 
 // Check that -fprofile-generate=/path/to generates /path/to/default.profraw
 // RxUN: %clang %s -c -S -o - -emit-llvm -fprofile-generate=/path/to | FileCheck -check-prefixes=PROFILE-GEN,PROFILE-GEN-EQ %s

compiler-rt/test/profile/Inputs/instrprof-value-prof-evict.c

@@ -61,80 +61,80 @@ int main() {
   }
 
   // check site, target patterns
-  // CHECK: 0, callee_0
+  // CHECK: 0, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqTwoTarget_1, 1);
 
-  // CHECK-NEXT: 1, callee_0
+  // CHECK-NEXT: 1, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqTwoTarget_2, 1);
 
-  // CHECK-NEXT: 2, callee_0
+  // CHECK-NEXT: 2, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqTwoTarget_3, 1);
 
-  // CHECK-NEXT: 3, callee_0
+  // CHECK-NEXT: 3, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqTwoTarget_4, 1);
 
-  // CHECK-NEXT: 4, callee_0
+  // CHECK-NEXT: 4, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqThreeTarget_1, 1);
 
-  // CHECK-NEXT: 5, callee_0
+  // CHECK-NEXT: 5, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqThreeTarget_2, 1);
 
-  // CHECK-NEXT: 6, callee_0
+  // CHECK-NEXT: 6, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqThreeTarget_3, 1);
 
-  // CHECK-NEXT: 7, callee_0
+  // CHECK-NEXT: 7, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqThreeTarget_4, 1);
 
-  // CHECK-NEXT: 8, callee_0
-  // CHECK-NEXT: 8, callee_1
+  // CHECK-NEXT: 8, {{_?}}callee_0
+  // CHECK-NEXT: 8, {{_?}}callee_1
   INDIRECT_CALLSITE(CallSeqThreeTarget_1, 2);
 
-  // CHECK-NEXT: 9, callee_0
-  // CHECK-NEXT: 9, callee_1
+  // CHECK-NEXT: 9, {{_?}}callee_0
+  // CHECK-NEXT: 9, {{_?}}callee_1
   INDIRECT_CALLSITE(CallSeqThreeTarget_2, 2);
 
-  // CHECK-NEXT: 10, callee_0
-  // CHECK-NEXT: 10, callee_1
+  // CHECK-NEXT: 10, {{_?}}callee_0
+  // CHECK-NEXT: 10, {{_?}}callee_1
   INDIRECT_CALLSITE(CallSeqThreeTarget_3, 2);
 
-  // CHECK-NEXT: 11, callee_0
-  // CHECK-NEXT: 11, callee_1
+  // CHECK-NEXT: 11, {{_?}}callee_0
+  // CHECK-NEXT: 11, {{_?}}callee_1
   INDIRECT_CALLSITE(CallSeqThreeTarget_4, 2);
 
-  // CHECK-NEXT: 12, callee_0
+  // CHECK-NEXT: 12, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqFourTarget_1, 1);
 
-  // CHECK-NEXT: 13, callee_0
+  // CHECK-NEXT: 13, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqFourTarget_2, 1);
 
-  // CHECK-NEXT: 14, callee_0
+  // CHECK-NEXT: 14, {{_?}}callee_0
   INDIRECT_CALLSITE(CallSeqFourTarget_3, 1);
 
-  // CHECK-NEXT: 15, callee_0
-  // CHECK-NEXT: 15, callee_3
+  // CHECK-NEXT: 15, {{_?}}callee_0
+  // CHECK-NEXT: 15, {{_?}}callee_3
   INDIRECT_CALLSITE(CallSeqFourTarget_1, 2);
 
-  // CHECK-NEXT: 16, callee_0
-  // CHECK-NEXT: 16, callee_3
+  // CHECK-NEXT: 16, {{_?}}callee_0
+  // CHECK-NEXT: 16, {{_?}}callee_3
   INDIRECT_CALLSITE(CallSeqFourTarget_2, 2);
 
-  // CHECK-NEXT: 17, callee_0
-  // CHECK-NEXT: 17, callee_3
+  // CHECK-NEXT: 17, {{_?}}callee_0
+  // CHECK-NEXT: 17, {{_?}}callee_3
   INDIRECT_CALLSITE(CallSeqFourTarget_3, 2);
 
-  // CHECK-NEXT: 18, callee_0
-  // CHECK-NEXT: 18, callee_3
-  // CHECK-NEXT: 18, callee_2
+  // CHECK-NEXT: 18, {{_?}}callee_0
+  // CHECK-NEXT: 18, {{_?}}callee_3
+  // CHECK-NEXT: 18, {{_?}}callee_2
   INDIRECT_CALLSITE(CallSeqFourTarget_1, 3);
 
-  // CHECK-NEXT: 19, callee_0
-  // CHECK-NEXT: 19, callee_3
-  // CHECK-NEXT: 19, callee_2
+  // CHECK-NEXT: 19, {{_?}}callee_0
+  // CHECK-NEXT: 19, {{_?}}callee_3
+  // CHECK-NEXT: 19, {{_?}}callee_2
   INDIRECT_CALLSITE(CallSeqFourTarget_2, 3);
 
-  // CHECK-NEXT: 20, callee_0
-  // CHECK-NEXT: 20, callee_3
-  // CHECK-NEXT: 20, callee_2
+  // CHECK-NEXT: 20, {{_?}}callee_0
+  // CHECK-NEXT: 20, {{_?}}callee_3
+  // CHECK-NEXT: 20, {{_?}}callee_2
   INDIRECT_CALLSITE(CallSeqFourTarget_3, 3);
 
   return 0;