Commit 5a1a5cc8 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r295116: 

------------------------------------------------------------------------
r295116 | dim | 2017-02-14 14:49:49 -0800 (Tue, 14 Feb 2017) | 18 lines

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
------------------------------------------------------------------------

llvm-svn: 296357
parent 3fde7cb0

llvm/test/tools/llvm-xray/X86/Inputs/simple-xray-instrmap.yaml

+6 −12
Original line number Diff line number Diff line 
---

- { 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 }

...

llvm/test/tools/llvm-xray/X86/account-simple-case.yaml

+2 −4
Original line number Diff line number Diff line
@@ -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

llvm/test/tools/llvm-xray/X86/account-simple-sorting.yaml

+10 −20
Original line number Diff line number Diff line
@@ -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

llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml

+4 −8
Original line number Diff line number Diff line
@@ -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:  ...

llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt

+6 −12
Original line number Diff line number Diff line
@@ -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: ...