[compiler-rt] r269130 - Reapply r268608 after IR instr bug fix

[Xinliang David Li via llvm-commits]

Rong reproduced the failure.  I have reverted the patch again.

David


On Tue, May 10, 2016 at 4:34 PM, Pete Cooper <peter_cooper at apple.com> wrote:

> Hi Rong
>
> Looks like its an incremental RA bot.
>
> Thanks,
> Pete
>
> On May 10, 2016, at 4:30 PM, Rong Xu <xur at google.com> wrote:
>
> Pete: what is the config of the buildbot that the test is failing?
>
> Thanks,
>
> -Rong
>
> On Tue, May 10, 2016 at 4:05 PM, Xinliang David Li <davidxl at google.com>
> wrote:
>
>> Rong, can you take a quick look?
>>
>> David
>>
>> On Tue, May 10, 2016 at 4:04 PM, Pete Cooper <peter_cooper at apple.com>
>> wrote:
>>
>>> Hi David
>>>
>>> I’m afraid this is failing our internal bots again.
>>>
>>> I took a look at the instrprof-value-prof.test.tmp.ir.proftxt file and
>>> although your check line is looking for :ir, that file doesn’t contain that
>>> string.
>>>
>>> Any ideas?
>>>
>>> I’ve attached the file here just in case its useful.  Let me know if any
>>> other files are of use.
>>>
>>> Thanks,
>>> Pete
>>>
>>>
>>>
>>> > On May 10, 2016, at 3:01 PM, Xinliang David Li via llvm-commits <
>>> llvm-commits at lists.llvm.org> wrote:
>>> >
>>> > Author: davidxl
>>> > Date: Tue May 10 17:01:20 2016
>>> > New Revision: 269130
>>> >
>>> > URL: http://llvm.org/viewvc/llvm-project?rev=269130&view=rev
>>> > Log:
>>> > Reapply r268608 after IR instr bug fix
>>> >
>>> > 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=269130&r1=269129&r2=269130&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 17:01:20 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=269130&r1=269129&r2=269130&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 17:01:20 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=269130&r1=269129&r2=269130&view=diff
>>> >
>>> ==============================================================================
>>> > --- compiler-rt/trunk/test/profile/instrprof-value-prof.test (original)
>>> > +++ compiler-rt/trunk/test/profile/instrprof-value-prof.test Tue May
>>> 10 17:01:20 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
>>> >
>>> >
>>> > _______________________________________________
>>> > llvm-commits mailing list
>>> > llvm-commits at lists.llvm.org
>>> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>
>>>
>>>
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160510/b9b68bba/attachment.html>