[compiler-rt] r269142 - Revert r268130 -- more bot failure

[Xinliang David Li via llvm-commits]

Author: davidxl
Date: Tue May 10 18:52:02 2016
New Revision: 269142

URL: http://llvm.org/viewvc/llvm-project?rev=269142&view=rev
Log:
Revert r268130 -- more bot failure

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=269142&r1=269141&r2=269142&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 Tue May 10 18:52:02 2016
@@ -53,7 +53,6 @@ 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=269142&r1=269141&r2=269142&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-value-prof-shared.test Tue May 10 18:52:02 2016
@@ -14,4 +14,3 @@
 // 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=269142&r1=269141&r2=269142&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-value-prof.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-value-prof.test Tue May 10 18:52:02 2016
@@ -3,10 +3,9 @@
 // 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
 
-// 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
+// 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
 // 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