[llvm] 7af4374 - [MC][test] Improve some llvm-objdump -t tests
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 3 17:27:31 PST 2020
Author: Fangrui Song
Date: 2020-03-03T17:27:06-08:00
New Revision: 7af4374ff81120f6efa3c851b9c3063d76291195
URL: https://github.com/llvm/llvm-project/commit/7af4374ff81120f6efa3c851b9c3063d76291195
DIFF: https://github.com/llvm/llvm-project/commit/7af4374ff81120f6efa3c851b9c3063d76291195.diff
LOG: [MC][test] Improve some llvm-objdump -t tests
Delete two redundant tests.
Added:
Modified:
llvm/test/MC/AArch64/mapping-within-section.s
llvm/test/MC/AArch64/size-directive.s
llvm/test/MC/ELF/common-redeclare.s
llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
Removed:
llvm/test/MC/AArch64/arm64-mapping-across-sections.s
llvm/test/MC/AArch64/arm64-mapping-within-section.s
################################################################################
diff --git a/llvm/test/MC/AArch64/arm64-mapping-across-sections.s b/llvm/test/MC/AArch64/arm64-mapping-across-sections.s
deleted file mode 100644
index 00b324cb8264..000000000000
--- a/llvm/test/MC/AArch64/arm64-mapping-across-sections.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// RUN: llvm-mc -triple=arm64-none-linux-gnu -filetype=obj < %s | llvm-objdump -t - | FileCheck %s
-
- .text
- add w0, w0, w0
-
-// .wibble should *not* inherit .text's mapping symbol. It's a completely
diff erent section.
- .section .wibble
- add w0, w0, w0
-
-// A setion should be able to start with a $d
- .section .starts_data
- .word 42
-
-// Changing back to .text should not emit a redundant $x
- .text
- add w0, w0, w0
-
-// With all those constraints, we want:
-// + .text to have $x at 0 and no others
-// + .wibble to have $x at 0
-// + .starts_data to have $d at 0
-
-
-// CHECK: 00000000 .starts_data 00000000 $d
-// CHECK-NEXT: 00000000 .text 00000000 $x
-// CHECK-NEXT: 00000000 .wibble 00000000 $x
-// CHECK-NOT: ${{[adtx]}}
-
diff --git a/llvm/test/MC/AArch64/arm64-mapping-within-section.s b/llvm/test/MC/AArch64/arm64-mapping-within-section.s
deleted file mode 100644
index f515cb9a5c0b..000000000000
--- a/llvm/test/MC/AArch64/arm64-mapping-within-section.s
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: llvm-mc -triple=arm64-none-linux-gnu -filetype=obj < %s | llvm-objdump -t - | FileCheck %s
-
- .text
-// $x at 0x0000
- add w0, w0, w0
-// $d at 0x0004
- .ascii "012"
- .byte 1
- .hword 2
- .word 4
- .xword 8
- .single 4.0
- .double 8.0
- .space 10
- .zero 3
- .fill 10, 2, 42
- .org 100, 12
-// $x at 0x0018
- add x0, x0, x0
-
-// CHECK: 00000004 .text 00000000 $d
-// CHECK-NEXT: 00000000 .text 00000000 $x
-// CHECK-NEXT: 00000064 .text 00000000 $x
diff --git a/llvm/test/MC/AArch64/mapping-within-section.s b/llvm/test/MC/AArch64/mapping-within-section.s
index c8bd804fa0e3..c7c3bbe08bed 100644
--- a/llvm/test/MC/AArch64/mapping-within-section.s
+++ b/llvm/test/MC/AArch64/mapping-within-section.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj < %s | llvm-objdump -t - | FileCheck %s
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s | llvm-nm - | FileCheck %s
.text
// $x at 0x0000
@@ -18,6 +18,6 @@
// $x at 0x0018
add x0, x0, x0
-// CHECK: 00000004 .text 00000000 $d
-// CHECK-NEXT: 00000000 .text 00000000 $x
-// CHECK-NEXT: 00000064 .text 00000000 $x
+// CHECK: 0000000000000004 t $d.1
+// CHECK-NEXT: 0000000000000000 t $x.0
+// CHECK-NEXT: 0000000000000064 t $x.2
diff --git a/llvm/test/MC/AArch64/size-directive.s b/llvm/test/MC/AArch64/size-directive.s
index 5c9ac26f17e5..831ae62b6ee8 100644
--- a/llvm/test/MC/AArch64/size-directive.s
+++ b/llvm/test/MC/AArch64/size-directive.s
@@ -2,7 +2,7 @@
// RUN: | FileCheck %s --check-prefix=CHECK-ASM
// RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=obj -o %t
// RUN: llvm-readobj -S --sd %t | FileCheck %s --check-prefix=CHECK-OBJ
-// RUN: llvm-objdump -t %t | FileCheck %s --check-prefix=CHECK-SYMS
+// RUN: llvm-readelf -s %t | FileCheck %s --check-prefix=SYMS
.section .size.aarch64_size
@@ -31,9 +31,10 @@ aarch64_size:
// CHECK-OBJ-NEXT: 0010: 00000000 0000 |......|
// CHECK-OBJ-NEXT: )
-// CHECK-SYMS: 0000000000000000 .size.aarch64_size 00000000 $d.0
-// CHECK-SYMS: 0000000000000000 g F .size.aarch64_size 00000000 aarch64_size
-// CHECK-SYMS: 0000000000000000 *UND* 00000000 also_double_word
-// CHECK-SYMS: 0000000000000000 *UND* 00000000 double_word
-// CHECK-SYMS: 0000000000000000 *UND* 00000000 full_word
-// CHECK-SYMS: 0000000000000000 *UND* 00000000 half_word
+// SYMS: Type Bind Vis Ndx Name
+// SYMS: NOTYPE LOCAL DEFAULT 3 $d.0
+// SYMS-NEXT: FUNC GLOBAL DEFAULT 3 aarch64_size
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND also_double_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND double_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND full_word
+// SYMS-NEXT: NOTYPE GLOBAL DEFAULT UND half_word
diff --git a/llvm/test/MC/ELF/common-redeclare.s b/llvm/test/MC/ELF/common-redeclare.s
index 66de9b0ec59e..0dd73c94597f 100644
--- a/llvm/test/MC/ELF/common-redeclare.s
+++ b/llvm/test/MC/ELF/common-redeclare.s
@@ -1,5 +1,6 @@
-# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s | llvm-objdump -t - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s | llvm-readelf -s - | FileCheck %s
-# CHECK: 0000000000000004 g O *COM* 00000004 C
+# CHECK: Value Size Type Bind Vis Ndx Name
+# CHECK: 0000000000000004 4 OBJECT GLOBAL DEFAULT COM C
.comm C,4,4
.comm C,4,4
diff --git a/llvm/test/MC/PowerPC/ppc64-localentry-symbols.s b/llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
index a663af57ad45..4bfc05d3ca74 100644
--- a/llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
+++ b/llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
@@ -1,11 +1,11 @@
# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-freebsd13.0 %s -o %t
-# RUN: llvm-objdump -t %t | FileCheck %s
+# RUN: llvm-readelf -s %t | FileCheck %s
-# CHECK: 0000000000000000 gw F .text 00000000 0x60 __impl_foo
-# CHECK: 0000000000000000 g F .text 00000000 0x60 foo
-# CHECK: 0000000000000000 gw F .text 00000000 0x60 foo at FBSD_1.1
-# CHECK: 0000000000000008 g F .text 00000000 0x60 func
-# CHECK: 0000000000000008 gw F .text 00000000 0x60 weak_func
+# CHECK: Type Bind Vis Ndx Name
+# CHECK: FUNC GLOBAL DEFAULT [<other: 0x60>] 2 foo
+# CHECK-NEXT: FUNC WEAK DEFAULT [<other: 0x60>] 2 foo at FBSD_1.1
+# CHECK-NEXT: FUNC GLOBAL DEFAULT [<other: 0x60>] 2 func
+# CHECK-NEXT: FUNC WEAK DEFAULT [<other: 0x60>] 2 weak_func
.text
.abiversion 2
More information about the llvm-commits
mailing list