[compiler-rt] r269219 - Reapply r268608

[Rong Xu via llvm-commits]

Author: xur
Date: Wed May 11 13:37:08 2016
New Revision: 269219

URL: http://llvm.org/viewvc/llvm-project?rev=269219&view=rev
Log:
Reapply r268608 

Re-enable the tests after IR instrumentation fix (r269146).
Check-in on behalf of davidxl.


Modified:
    compiler-rt/trunk/test/profile/Inputs/instrprof-value-prof-real.c
    compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test
    compiler-rt/trunk/test/profile/instrprof-value-prof.test

Modified: compiler-rt/trunk/test/profile/Inputs/instrprof-value-prof-real.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-value-prof-real.c?rev=269219&r1=269218&r2=269219&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-value-prof-real.c (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-value-prof-real.c Wed May 11 13:37:08 2016
@@ -53,6 +53,7 @@ int main() {
   return 0;
 }
 
+// IR: :ir
 // CHECK-LABEL:  main:
 // CHECK:	[ 0, foo_1_1_1_1_1_1_1_1_1, 1000 ]
 // CHECK-NEXT:	[ 0, foo_1_1_1_1_1_1_1_1_2, 999 ]

Modified: compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test?rev=269219&r1=269218&r2=269219&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test Wed May 11 13:37:08 2016
@@ -14,3 +14,4 @@
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
 // RUN: llvm-profdata merge -text  %t.ir.profdata -o %t.ir.proftxt 
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=SHARED
+// RUN: FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=IR < %t.ir.proftxt

Modified: compiler-rt/trunk/test/profile/instrprof-value-prof.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-value-prof.test?rev=269219&r1=269218&r2=269219&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-value-prof.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-value-prof.test Wed May 11 13:37:08 2016
@@ -3,9 +3,10 @@
 // RUN: llvm-profdata merge -o %t.profdata %t.profraw
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
 
-// do two step build before the clang option is ready
-// RUN: %clang -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -c -o %t.ir.o  %S/Inputs/instrprof-value-prof-real.c
-// RUN: %clang_profgen -O2 -o %t.ir  %t.ir.o
+// IR level instrumentation
+// RUN: %clang_profgen -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -o %t.ir  %S/Inputs/instrprof-value-prof-real.c
 // RUN: env LLVM_PROFILE_FILE=%t.ir.profraw %run %t.ir
 // RUN: llvm-profdata merge -o %t.ir.profdata %t.ir.profraw
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
+// RUN: llvm-profdata merge -text  %t.ir.profdata -o %t.ir.proftxt 
+// RUN: FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=IR < %t.ir.proftxt