[compiler-rt] r224276 - Update lib/profile tests for metadata assembly change

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Mon Dec 15 15:34:19 2014
New Revision: 224276

URL: http://llvm.org/viewvc/llvm-project?rev=224276&view=rev
Log:
Update lib/profile tests for metadata assembly change

Running the upgrade script from PR21532.  Hopefully this will unstick
compiler-rt bots [1] after r224257.

[1]: http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/181/

Modified:
    compiler-rt/trunk/test/profile/instrprof-basic.c
    compiler-rt/trunk/test/profile/instrprof-reset-counters.c
    compiler-rt/trunk/test/profile/instrprof-set-filename.c
    compiler-rt/trunk/test/profile/instrprof-without-libc.c
    compiler-rt/trunk/test/profile/instrprof-write-file-atexit-explicitly.c
    compiler-rt/trunk/test/profile/instrprof-write-file-only.c
    compiler-rt/trunk/test/profile/instrprof-write-file.c

Modified: compiler-rt/trunk/test/profile/instrprof-basic.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-basic.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-basic.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-basic.c Mon Dec 15 15:34:19 2014
@@ -27,5 +27,5 @@ int main(int argc, const char *argv[]) {
   return 1;
 }
 
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
-// CHECK: ![[PD2]] = metadata !{metadata !"branch_weights", i32 2, i32 1}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}
+// CHECK: ![[PD2]] = !{!"branch_weights", i32 2, i32 1}

Modified: compiler-rt/trunk/test/profile/instrprof-reset-counters.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-reset-counters.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-reset-counters.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-reset-counters.c Mon Dec 15 15:34:19 2014
@@ -16,4 +16,4 @@ void foo(int N) {
   // CHECK: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[FOO:[0-9]+]]
   if (N) {}
 }
-// CHECK: ![[FOO]] = metadata !{metadata !"branch_weights", i32 2, i32 1}
+// CHECK: ![[FOO]] = !{!"branch_weights", i32 2, i32 1}

Modified: compiler-rt/trunk/test/profile/instrprof-set-filename.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-set-filename.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-set-filename.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-set-filename.c Mon Dec 15 15:34:19 2014
@@ -11,4 +11,4 @@ int main(int argc, const char *argv[]) {
   __llvm_profile_set_filename(argv[1]);
   return 0;
 }
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}

Modified: compiler-rt/trunk/test/profile/instrprof-without-libc.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-without-libc.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-without-libc.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-without-libc.c Mon Dec 15 15:34:19 2014
@@ -46,7 +46,7 @@ int main(int argc, const char *argv[]) {
   return fclose(File);
 #endif
 }
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}
 
 // CHECK-SYMBOLS-NOT: ___cxx_global_var_init
 // CHECK-SYMBOLS-NOT: ___llvm_profile_register_write_file_atexit

Modified: compiler-rt/trunk/test/profile/instrprof-write-file-atexit-explicitly.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-write-file-atexit-explicitly.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-write-file-atexit-explicitly.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-write-file-atexit-explicitly.c Mon Dec 15 15:34:19 2014
@@ -14,4 +14,4 @@ int main(int argc, const char *argv[]) {
   __llvm_profile_set_filename(argv[1]);
   return 0;
 }
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}

Modified: compiler-rt/trunk/test/profile/instrprof-write-file-only.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-write-file-only.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-write-file-only.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-write-file-only.c Mon Dec 15 15:34:19 2014
@@ -32,4 +32,4 @@ int foo(int X) {
   // CHECK: br i1 %{{.*}}, label %{{.*}}, label %{{[^,]+$}}
   return X <= 0 ? -X : X;
 }
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}

Modified: compiler-rt/trunk/test/profile/instrprof-write-file.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-write-file.c?rev=224276&r1=224275&r2=224276&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-write-file.c (original)
+++ compiler-rt/trunk/test/profile/instrprof-write-file.c Mon Dec 15 15:34:19 2014
@@ -30,5 +30,5 @@ int foo(int X) {
   // CHECK2: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[PD2:[0-9]+]]
   return X <= 0 ? -X : X;
 }
-// CHECK: ![[PD1]] = metadata !{metadata !"branch_weights", i32 1, i32 2}
-// CHECK2: ![[PD2]] = metadata !{metadata !"branch_weights", i32 2, i32 1}
+// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}
+// CHECK2: ![[PD2]] = !{!"branch_weights", i32 2, i32 1}