From 95e6f5c655fa39c26e4dc8d5ca65749af69cb484 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 10 Apr 2020 09:41:41 -0700 Subject: [PATCH] [llvm-xray][test] Combine two AArch64 tests Rename extract-instrmap-aarch64.test to extract-instrmap.test because the path component `AArch64` conveys the target name clearly. Additionally, adopt a convention we start to use in LLVM binary utilities: prepend `#` to CHECK/RUN lines and `##` to comment lines even if the file contains no code. The notation makes CHECK/RUN/comments stand out. Reviewed By: dberris Differential Revision: https://reviews.llvm.org/D77883 --- .../AArch64/extract-instrmap-aarch64-mangled.test | 14 ------------ .../AArch64/extract-instrmap-aarch64.test | 14 ------------ .../tools/llvm-xray/AArch64/extract-instrmap.test | 25 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64-mangled.test delete mode 100644 llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64.test create mode 100644 llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test diff --git a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64-mangled.test b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64-mangled.test deleted file mode 100644 index 5c87551..0000000 --- a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64-mangled.test +++ /dev/null @@ -1,14 +0,0 @@ -This test makes sure we can extract the instrumentation map from an -XRay-instrumented PIE file. - -RUN: yaml2obj %S/Inputs/elf64-pic.yaml -o %t.so -RUN: llvm-xray extract -s --no-demangle %t.so | FileCheck %s - -CHECK: --- -CHECK-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: _Z3foov } -CHECK-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: _Z3foov } -CHECK-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: _Z3barv } -CHECK-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: _Z3barv } -CHECK-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: _Z3jarv } -CHECK-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: _Z3jarv } -CHECK-NEXT: ... diff --git a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64.test b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64.test deleted file mode 100644 index 8f39548..0000000 --- a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap-aarch64.test +++ /dev/null @@ -1,14 +0,0 @@ -This test makes sure we can extract the instrumentation map from an -XRay-instrumented PIE file. - -RUN: yaml2obj %S/Inputs/elf64-pic.yaml -o %t.so -RUN: llvm-xray extract %t.so -s | FileCheck %s - -CHECK: --- -CHECK-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: 'foo()' } -CHECK-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: 'foo()' } -CHECK-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: 'bar()' } -CHECK-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: 'bar()' } -CHECK-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: 'jar()' } -CHECK-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: 'jar()' } -CHECK-NEXT: ... diff --git a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test new file mode 100644 index 0000000..3f796ae --- /dev/null +++ b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test @@ -0,0 +1,25 @@ +## This test makes sure we can extract the instrumentation map from an +## XRay-instrumented PIE file. + +# RUN: yaml2obj %S/Inputs/elf64-pic.yaml -o %t.so +# RUN: llvm-xray extract %t.so -s | FileCheck %s + +# CHECK: --- +# CHECK-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: 'foo()' } +# CHECK-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: 'foo()' } +# CHECK-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: 'bar()' } +# CHECK-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: 'bar()' } +# CHECK-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: 'jar()' } +# CHECK-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: 'jar()' } +# CHECK-NEXT: ... + +# RUN: llvm-xray extract -s --no-demangle %t.so | FileCheck --check-prefix=MANGLED %s + +# MANGLED: --- +# MANGLED-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: _Z3foov } +# MANGLED-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: _Z3foov } +# MANGLED-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: _Z3barv } +# MANGLED-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: _Z3barv } +# MANGLED-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: _Z3jarv } +# MANGLED-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: _Z3jarv } +# MANGLED-NEXT: ... -- 2.7.4