Skip to content

Commit

Permalink
[test] Don't test initial ".text" in llvm-mc --disassemble output
Browse files Browse the repository at this point in the history
This kludge will go away after #120185.
  • Loading branch information
MaskRay committed Dec 17, 2024
1 parent 417d2d7 commit a56ca3a
Show file tree
Hide file tree
Showing 26 changed files with 12 additions and 41 deletions.
6 changes: 2 additions & 4 deletions llvm/test/MC/Disassembler/AArch64/armv8.6a-amvs.s
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@
[0xa0,0xdb,0x3c,0xd5]
[0xc0,0xdb,0x3c,0xd5]
[0xe0,0xdb,0x3c,0xd5]
// CHECK: .text
// CHECK-NEXT: msr S3_3_C13_C2_6, x0 // encoding: [0xc0,0xd2,0x1b,0xd5]
// CHECK: msr S3_3_C13_C2_6, x0 // encoding: [0xc0,0xd2,0x1b,0xd5]
// CHECK-NEXT: mrs x0, AMCG1IDR_EL0 // encoding: [0xc0,0xd2,0x3b,0xd5]
// CHECK-NEXT: msr AMEVCNTVOFF00_EL2, x0 // encoding: [0x00,0xd8,0x1c,0xd5]
// CHECK-NEXT: msr AMEVCNTVOFF01_EL2, x0 // encoding: [0x20,0xd8,0x1c,0xd5]
Expand Down Expand Up @@ -134,8 +133,7 @@
// CHECK-NEXT: mrs x0, AMEVCNTVOFF113_EL2 // encoding: [0xa0,0xdb,0x3c,0xd5]
// CHECK-NEXT: mrs x0, AMEVCNTVOFF114_EL2 // encoding: [0xc0,0xdb,0x3c,0xd5]
// CHECK-NEXT: mrs x0, AMEVCNTVOFF115_EL2 // encoding: [0xe0,0xdb,0x3c,0xd5]
// NOAMVS: .text
// NOAMVS-NEXT: msr S3_3_C13_C2_6, x0 // encoding: [0xc0,0xd2,0x1b,0xd5]
// NOAMVS: msr S3_3_C13_C2_6, x0 // encoding: [0xc0,0xd2,0x1b,0xd5]
// NOAMVS-NEXT: mrs x0, S3_3_C13_C2_6 // encoding: [0xc0,0xd2,0x3b,0xd5]
// NOAMVS-NEXT: msr S3_4_C13_C8_0, x0 // encoding: [0x00,0xd8,0x1c,0xd5]
// NOAMVS-NEXT: msr S3_4_C13_C8_1, x0 // encoding: [0x20,0xd8,0x1c,0xd5]
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv8r-sysreg.txt
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@
[0xbe,0x6f,0x1c,0xd5]
[0x20,0xd0,0x1c,0xd5]

// CHECK: .text
// CHECK-NEXT: mrs x0, VSCTLR_EL2
// CHECK: mrs x0, VSCTLR_EL2
// CHECK-NEXT: mrs x0, MPUIR_EL1
// CHECK-NEXT: mrs x0, MPUIR_EL2
// CHECK-NEXT: mrs x0, PRENR_EL1
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv9.6a-lsui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@
[0x5f,0x34,0x20,0x59]
[0xff,0x37,0x22,0x59]

# CHECK: .text
# CHECK-NEXT: ldtxr x9, [sp]
# CHECK: ldtxr x9, [sp]
# CHECK-NEXT: ldtxr x9, [sp]
# CHECK-NEXT: ldtxr x10, [x11]
# CHECK-NEXT: ldtxr x10, [x11]
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv9.6a-occmo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
[0x0d,0x7b,0x0b,0xd5]
[0xe1,0x7b,0x0b,0xd5]

# CHECK: .text
# CHECK-NEXT: dc civaoc, x12
# CHECK: dc civaoc, x12
# CHECK-NEXT: dc cigdvaoc, x0
# CHECK-NEXT: dc cvaoc, x13
# CHECK-NEXT: dc cgdvaoc, x1
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv9.6a-pcdphint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
[0x1f,0x96,0x01,0xd5]
[0x3f,0x96,0x01,0xd5]

# CHECK: .text
# CHECK-NEXT: stshh keep
# CHECK: stshh keep
# CHECK-NEXT: stshh strm
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv9.6a-rme-gpc3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
[0xa3,0x21,0x3e,0xd5]
[0xa4,0x21,0x1e,0xd5]

# CHECK: .text
# CHECK-NEXT: sys #6, c7, c0, #0
# CHECK: sys #6, c7, c0, #0
# CHECK-NEXT: mrs x3, GPCBW_EL3
# CHECK-NEXT: msr GPCBW_EL3, x4
3 changes: 1 addition & 2 deletions llvm/test/MC/Disassembler/AArch64/armv9.6a-srmask.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
[0x23,0x14,0x1d,0xd5]
[0xa3,0x14,0x18,0xd5]

# CHECK: .text
# CHECK-NEXT: mrs x3, SCTLRMASK_EL1
# CHECK: mrs x3, SCTLRMASK_EL1
# CHECK-NEXT: mrs x3, SCTLRMASK_EL2
# CHECK-NEXT: mrs x3, SCTLRMASK_EL12
# CHECK-NEXT: mrs x3, CPACRMASK_EL1
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/eva/valid_R6-eva.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r6 -mattr=eva | FileCheck %s
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r6 -mattr=eva | FileCheck %s
# CHECK: .text
0x7c 0xff 0x7f 0x9b # CHECK: cachee 31, 255($7)
0x7c 0x80 0x80 0x1b # CHECK: cachee 0, -256($4)
0x7c 0x85 0xba 0x1b # CHECK: cachee 5, -140($4)
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/eva/valid_preR6-eva.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r2 -mattr=eva | FileCheck %s
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r3 -mattr=eva | FileCheck %s
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r5 -mattr=eva | FileCheck %s
# CHECK: .text
0x7c 0xff 0x7f 0x9b # CHECK: cachee 31, 255($7)
0x7c 0x80 0x80 0x1b # CHECK: cachee 0, -256($4)
0x7c 0x85 0xba 0x1b # CHECK: cachee 5, -140($4)
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mipsel-unknown-linux -disassemble -mcpu=mips1 | FileCheck %s
# CHECK: .text
0x85 0xc1 0x20 0x46 # CHECK: abs.d $f6, $f24
0x45 0x82 0x00 0x46 # CHECK: abs.s $f9, $f16
0x20 0xb8 0x45 0x02 # CHECK: add $23, $18, $5
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips1/valid-mips1.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips1 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x40 # CHECK: ssnop
0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mipsel-unknown-linux -disassemble -mcpu=mips2 | FileCheck %s
# CHECK: .text
0x85 0xc1 0x20 0x46 # CHECK: abs.d $f6, $f24
0x45 0x82 0x00 0x46 # CHECK: abs.s $f9, $f16
0x20 0xb8 0x45 0x02 # CHECK: add $23, $18, $5
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips2 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0d # CHECK: break
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips64el-unknown-linux -disassemble -mcpu=mips3 | FileCheck %s
# CHECK: .text
0x85 0xc1 0x20 0x46 # CHECK: abs.d $f6, $f24
0x45 0x82 0x00 0x46 # CHECK: abs.s $f9, $f16
0x20 0xb8 0x45 0x02 # CHECK: add $23, $18, $5
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips3 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0c # CHECK: syscall
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips64el-unknown-linux -disassemble -mcpu=mips4 | FileCheck %s
# CHECK: .text
0x85 0xc1 0x20 0x46 # CHECK: abs.d $f6, $f24
0x45 0x82 0x00 0x46 # CHECK: abs.s $f9, $f16
0x20 0xb8 0x45 0x02 # CHECK: add $23, $18, $5
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips4 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0c # CHECK: syscall
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Try a mips* triple to confirm that mips* vs mips64* triples no longer have
# an effect on the disassembler behaviour.
# RUN: llvm-mc --disassemble %s -triple=mipsel-unknown-linux -mcpu=mips64r2 | FileCheck %s
# CHECK: .text
0x05 0x73 0x20 0x46 # CHECK: abs.d $f12, $f14
0x85 0x39 0x00 0x46 # CHECK: abs.s $f6, $f7
0x20 0x48 0xc7 0x00 # CHECK: add $9, $6, $7
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Try a mips* triple to confirm that mips* vs mips64* triples no longer have
# an effect on the disassembler behaviour.
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips64r2 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0c # CHECK: syscall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc --disassemble %s -triple=mips64el-unknown-linux -mcpu=mips64r3 | FileCheck %s
# CHECK: .text
0x05 0x73 0x20 0x46 # CHECK: abs.d $f12, $f14
0x85 0x39 0x00 0x46 # CHECK: abs.s $f6, $f7
0x20 0x48 0xc7 0x00 # CHECK: add $9, $6, $7
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r3 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0c # CHECK: syscall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc --disassemble %s -triple=mips64el-unknown-linux -mcpu=mips64r5 | FileCheck %s
# CHECK: .text
0x05 0x73 0x20 0x46 # CHECK: abs.d $f12, $f14
0x85 0x39 0x00 0x46 # CHECK: abs.s $f6, $f7
0x20 0x48 0xc7 0x00 # CHECK: add $9, $6, $7
Expand Down
1 change: 0 additions & 1 deletion llvm/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r5 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
0x00 0x00 0x00 0x09 # CHECK: jr $zero
0x00 0x00 0x00 0x0c # CHECK: syscall
Expand Down
9 changes: 4 additions & 5 deletions llvm/test/MC/Disassembler/RISCV/colored.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# UNSUPPORTED: system-windows
# RUN: llvm-mc -triple=riscv64 -mattr=+zcmp,+zfa,+v --cdis %s | FileCheck %s --strict-whitespace --match-full-lines -check-prefixes=CHECK,ASM,ABINAME
# RUN: llvm-mc -triple=riscv64 -mattr=+zcmp,+zfa,+v -M numeric --cdis %s | FileCheck %s --strict-whitespace --match-full-lines -check-prefixes=CHECK,ASM,ARCHNAME
# RUN: llvm-mc -triple=riscv64 -mattr=+zcmp,+zfa,+v --cdis %s | FileCheck %s --strict-whitespace --match-full-lines -check-prefixes=ASM,ABINAME
# RUN: llvm-mc -triple=riscv64 -mattr=+zcmp,+zfa,+v -M numeric --cdis %s | FileCheck %s --strict-whitespace --match-full-lines -check-prefixes=ASM,ARCHNAME

# CHECK: .text
# Registers and immediates
0x03 0xe0 0x40 0x00
# ABINAME-NEXT: lwu zero, 4(ra)
# ARCHNAME-NEXT: lwu x0, 4(x1)
# ABINAME: lwu zero, 4(ra)
# ARCHNAME: lwu x0, 4(x1)

# Branch targets
0x63 0x00 0xb5 0x04
Expand Down
2 changes: 0 additions & 2 deletions llvm/test/MC/Disassembler/WebAssembly/wasm-error.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=wasm32-unknown-unknown | FileCheck %s

# CHECK: .text

# CHECK: block unknown_type
0x02 0x00

Expand Down
2 changes: 0 additions & 2 deletions llvm/test/MC/Disassembler/WebAssembly/wasm.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=wasm32-unknown-unknown | FileCheck %s

# CHECK: .text

# CHECK: nop
0x01

Expand Down

0 comments on commit a56ca3a

Please sign in to comment.