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