[llvm] r295116 - Disable wrapping llvm-xray YAML output
Dean Michael Berris via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 25 14:46:35 PST 2017
LGTM -- definitely OK with it. :)
On Sat, Feb 25, 2017 at 6:53 AM Dimitry Andric <dimitry at andric.com> wrote:
> Hans, I know it's rather late in the release cycle, but would you mind if
> we merged this one? It's a minor fix to make sure llvm-xray tests succeed
> on all platforms.
>
> That is, if Dean is OK with it, of course. :)
>
> -Dimitry
>
> > On 14 Feb 2017, at 23:49, Dimitry Andric via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
> >
> > Author: dim
> > Date: Tue Feb 14 16:49:49 2017
> > New Revision: 295116
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=295116&view=rev
> > Log:
> > Disable wrapping llvm-xray YAML output
> >
> > Summary:
> > The YAML output produced by llvm-xray is supposed to be wrapped at the
> > arbitrary default of 70 columns set by `yaml:Output`. Unfortunately,
> > the wrapping is rather unpredictable, and can easily go past the set
> > number of columns, depending on the execution environment.
> >
> > To make the YAML output environment-independent, disable wrapping
> > instead.
> >
> > Reviewers: dberris
> >
> > Reviewed By: dberris
> >
> > Subscribers: fhahn, llvm-commits
> >
> > Differential Revision: https://reviews.llvm.org/D29962
> >
> > Modified:
> > llvm/trunk/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml
> > llvm/trunk/test/tools/llvm-xray/X86/account-simple-case.yaml
> > llvm/trunk/test/tools/llvm-xray/X86/account-simple-sorting.yaml
> > llvm/trunk/test/tools/llvm-xray/X86/convert-roundtrip.yaml
> > llvm/trunk/test/tools/llvm-xray/X86/convert-to-yaml.txt
> > llvm/trunk/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
> >
> llvm/trunk/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
> > llvm/trunk/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
> > llvm/trunk/test/tools/llvm-xray/X86/extract-instrmap.ll
> > llvm/trunk/test/tools/llvm-xray/X86/graph-simple-case.yaml
> > llvm/trunk/tools/llvm-xray/xray-converter.cc
> > llvm/trunk/tools/llvm-xray/xray-extract.cc
> >
> > Modified:
> llvm/trunk/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml
> (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml
> Tue Feb 14 16:49:49 2017
> > @@ -1,14 +1,8 @@
> > ---
> > -- { id: 1, address: 0x000000000041CA40, function: 0x000000000041CA40,
> kind: function-enter,
> > - always-instrument: true }
> > -- { id: 1, address: 0x000000000041CA50, function: 0x000000000041CA40,
> kind: tail-exit,
> > - always-instrument: true }
> > -- { id: 2, address: 0x000000000041CA70, function: 0x000000000041CA70,
> kind: function-enter,
> > - always-instrument: true }
> > -- { id: 2, address: 0x000000000041CA7C, function: 0x000000000041CA70,
> kind: tail-exit,
> > - always-instrument: true }
> > -- { id: 3, address: 0x000000000041CAA0, function: 0x000000000041CAA0,
> kind: function-enter,
> > - always-instrument: true }
> > -- { id: 3, address: 0x000000000041CAB4, function: 0x000000000041CAA0,
> kind: function-exit,
> > - always-instrument: true }
> > +- { id: 1, address: 0x000000000041CA40, function: 0x000000000041CA40,
> kind: function-enter, always-instrument: true }
> > +- { id: 1, address: 0x000000000041CA50, function: 0x000000000041CA40,
> kind: tail-exit, always-instrument: true }
> > +- { id: 2, address: 0x000000000041CA70, function: 0x000000000041CA70,
> kind: function-enter, always-instrument: true }
> > +- { id: 2, address: 0x000000000041CA7C, function: 0x000000000041CA70,
> kind: tail-exit, always-instrument: true }
> > +- { id: 3, address: 0x000000000041CAA0, function: 0x000000000041CAA0,
> kind: function-enter, always-instrument: true }
> > +- { id: 3, address: 0x000000000041CAB4, function: 0x000000000041CAA0,
> kind: function-exit, always-instrument: true }
> > ...
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/account-simple-case.yaml
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/account-simple-case.yaml?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/account-simple-case.yaml
> (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/account-simple-case.yaml Tue Feb
> 14 16:49:49 2017
> > @@ -7,10 +7,8 @@ header:
> > nonstop-tsc: true
> > cycle-frequency: 2601000000
> > records:
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10001 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10100 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10001 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10100 }
> > ...
> >
> > #CHECK: Functions with latencies: 1
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/account-simple-sorting.yaml
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/account-simple-sorting.yaml?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/account-simple-sorting.yaml
> (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/account-simple-sorting.yaml Tue
> Feb 14 16:49:49 2017
> > @@ -17,27 +17,17 @@ header:
> > cycle-frequency: 1
> > records:
> > # Function id: 1
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10001 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10100 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10101 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10200 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10201 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10300 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10001 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10100 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10101 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10200 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10201 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10300 }
> > # Function id: 2
> > - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter,
> > - tsc: 10001 }
> > - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit,
> > - tsc: 10002 }
> > - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter,
> > - tsc: 10101 }
> > - - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit,
> > - tsc: 10102 }
> > + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter,
> tsc: 10001 }
> > + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit,
> tsc: 10002 }
> > + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-enter,
> tsc: 10101 }
> > + - { type: 0, func-id: 2, cpu: 1, thread: 222, kind: function-exit,
> tsc: 10102 }
> >
> > #DEFAULT: Functions with latencies: 2
> > #DEFAULT-NEXT: funcid count [ min, med, 90p, 99p, max] sum function
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/convert-roundtrip.yaml
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-roundtrip.yaml?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/convert-roundtrip.yaml (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/convert-roundtrip.yaml Tue Feb
> 14 16:49:49 2017
> > @@ -7,10 +7,8 @@ header:
> > nonstop-tsc: true
> > cycle-frequency: 2601000000
> > records:
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10001 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10100 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10001 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10100 }
> > ...
> >
> > #CHECK: ---
> > @@ -21,8 +19,6 @@ records:
> > #CHECK-NEXT: nonstop-tsc: true
> > #CHECK-NEXT: cycle-frequency: 2601000000
> > #CHECK-NEXT: records:
> > -#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread:
> 111, kind: function-enter,
> > -#CHECK-NEXT: tsc: 10001 }
> > -#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread:
> 111, kind: function-exit,
> > -#CHECK-NEXT: tsc: 10100 }
> > +#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread:
> 111, kind: function-enter, tsc: 10001 }
> > +#CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 1, thread:
> 111, kind: function-exit, tsc: 10100 }
> > #CHECK-NEXT: ...
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/convert-to-yaml.txt
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-to-yaml.txt?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/convert-to-yaml.txt (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/convert-to-yaml.txt Tue Feb 14
> 16:49:49 2017
> > @@ -8,16 +8,10 @@
> > ; CHECK-NEXT: nonstop-tsc: true
> > ; CHECK-NEXT: cycle-frequency: 2601000000
> > ; CHECK-NEXT: records:
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841453914 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454542 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454670 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454762 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454802 }
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841494828 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841453914 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841454542 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841454670 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841454762 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841454802 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841494828 }
> > ; CHECK-NEXT: ...
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-with-debug-syms.txt?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
> (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/convert-with-debug-syms.txt Tue
> Feb 14 16:49:49 2017
> > @@ -8,16 +8,10 @@
> > ; CHECK-NEXT: nonstop-tsc: true
> > ; CHECK-NEXT: cycle-frequency: 2601000000
> > ; CHECK-NEXT: records:
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841453914 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu:
> 37, thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454542 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu:
> 37, thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454670 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu:
> 37, thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454762 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu:
> 37, thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454802 }
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841494828 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841453914 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu:
> 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: {{.*foo.*}}, cpu:
> 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu:
> 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: {{.*bar.*}}, cpu:
> 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: main, cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841494828 }
> > ; CHECK-NEXT: ...
> >
> > Modified:
> llvm/trunk/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > ---
> llvm/trunk/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
> (original)
> > +++
> llvm/trunk/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
> Tue Feb 14 16:49:49 2017
> > @@ -8,16 +8,10 @@
> > ; CHECK-NEXT: nonstop-tsc: true
> > ; CHECK-NEXT: cycle-frequency: 2601000000
> > ; CHECK-NEXT: records:
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-enter, tsc: 3315356841453914 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-enter, tsc: 3315356841454542 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-exit, tsc: 3315356841454670 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-enter, tsc: 3315356841454762 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-exit, tsc: 3315356841454802 }
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu:
> 37, thread: 84697,
> > -; CHECK-NEXT: kind: function-exit, tsc: 3315356841494828 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu:
> 37, thread: 84697, kind: function-enter, tsc: 3315356841453914 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu:
> 37, thread: 84697, kind: function-enter, tsc: 3315356841454542 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '@(41ca70)', cpu:
> 37, thread: 84697, kind: function-exit, tsc: 3315356841454670 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu:
> 37, thread: 84697, kind: function-enter, tsc: 3315356841454762 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '@(41ca40)', cpu:
> 37, thread: 84697, kind: function-exit, tsc: 3315356841454802 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '@(41caa0)', cpu:
> 37, thread: 84697, kind: function-exit, tsc: 3315356841494828 }
> > ; CHECK-NEXT: ...
> >
> > Modified:
> llvm/trunk/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
> (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
> Tue Feb 14 16:49:49 2017
> > @@ -8,16 +8,10 @@
> > ; CHECK-NEXT: nonstop-tsc: true
> > ; CHECK-NEXT: cycle-frequency: 2601000000
> > ; CHECK-NEXT: records:
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841453914 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454542 }
> > -; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454670 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-enter,
> > -; CHECK-NEXT: tsc: 3315356841454762 }
> > -; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841454802 }
> > -; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-exit,
> > -; CHECK-NEXT: tsc: 3315356841494828 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841453914 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841454542 }
> > +; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841454670 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-enter, tsc: 3315356841454762 }
> > +; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841454802 }
> > +; CHECK-NEXT: - { type: 0, func-id: 3, function: '3', cpu: 37,
> thread: 84697, kind: function-exit, tsc: 3315356841494828 }
> > ; CHECK-NEXT: ...
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/extract-instrmap.ll
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/extract-instrmap.ll?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/extract-instrmap.ll (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/extract-instrmap.ll Tue Feb 14
> 16:49:49 2017
> > @@ -4,12 +4,8 @@
> > ; RUN: llvm-xray extract %S/Inputs/elf64-example.bin | FileCheck %s
> >
> > ; CHECK: ---
> > -; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function:
> 0x000000000041C900, kind: function-enter,
> > -; CHECK-NEXT: always-instrument: true }
> > -; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function:
> 0x000000000041C900, kind: function-exit,
> > -; CHECK-NEXT: always-instrument: true }
> > -; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function:
> 0x000000000041C930, kind: function-enter,
> > -; CHECK-NEXT: always-instrument: true }
> > -; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function:
> 0x000000000041C930, kind: function-exit,
> > -; CHECK-NEXT: always-instrument: true }
> > +; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function:
> 0x000000000041C900, kind: function-enter, always-instrument: true }
> > +; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function:
> 0x000000000041C900, kind: function-exit, always-instrument: true }
> > +; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function:
> 0x000000000041C930, kind: function-enter, always-instrument: true }
> > +; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function:
> 0x000000000041C930, kind: function-exit, always-instrument: true }
> > ; CHECK-NEXT: ...
> >
> > Modified: llvm/trunk/test/tools/llvm-xray/X86/graph-simple-case.yaml
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/graph-simple-case.yaml?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/test/tools/llvm-xray/X86/graph-simple-case.yaml (original)
> > +++ llvm/trunk/test/tools/llvm-xray/X86/graph-simple-case.yaml Tue Feb
> 14 16:49:49 2017
> > @@ -23,10 +23,8 @@ header:
> > nonstop-tsc: true
> > cycle-frequency: 2601000000
> > records:
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> > - tsc: 10001 }
> > - - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> > - tsc: 10100 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-enter,
> tsc: 10001 }
> > + - { type: 0, func-id: 1, cpu: 1, thread: 111, kind: function-exit,
> tsc: 10100 }
> > ...
> >
> >
> >
> > Modified: llvm/trunk/tools/llvm-xray/xray-converter.cc
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-converter.cc?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/tools/llvm-xray/xray-converter.cc (original)
> > +++ llvm/trunk/tools/llvm-xray/xray-converter.cc Tue Feb 14 16:49:49 2017
> > @@ -88,7 +88,7 @@ void TraceConverter::exportAsYAML(const
> > : llvm::to_string(R.FuncId),
> > R.TSC, R.TId});
> > }
> > - Output Out(OS);
> > + Output Out(OS, nullptr, 0);
> > Out << Trace;
> > }
> >
> >
> > Modified: llvm/trunk/tools/llvm-xray/xray-extract.cc
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-extract.cc?rev=295116&r1=295115&r2=295116&view=diff
> >
> ==============================================================================
> > --- llvm/trunk/tools/llvm-xray/xray-extract.cc (original)
> > +++ llvm/trunk/tools/llvm-xray/xray-extract.cc Tue Feb 14 16:49:49 2017
> > @@ -60,7 +60,7 @@ void exportAsYAML(const InstrumentationM
> > YAMLSleds.push_back({*FuncId, Sled.Address, Sled.Function, Sled.Kind,
> > Sled.AlwaysInstrument});
> > }
> > - Output Out(OS);
> > + Output Out(OS, nullptr, 0);
> > Out << YAMLSleds;
> > }
> >
> >
> >
> > _______________________________________________
> > 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/20170225/7c98f322/attachment.html>
More information about the llvm-commits
mailing list