fixup! [AArch64][llvm] Unify AArch64 tests into a single file (2/4) (NFC)

This is a series of patches (2/4) to unify assembly/disassembly of
recent AArch64 tests into a single file. The aim is to improve
consistency, so that all instructions and system registers are
thoroughly tested, and future test cases will be in a unified format.

This patch:
 * removes .txt tests which have only one feature required
 * makes the .s tests have a roundabout run line to test both encoding and assembly
 * creates diagnostic tests when needed
 * fixes naming convention of tests

Co-authored-by: Virginia Cangelosi <[email protected]>

Author: jthackray

llvm/test/MC/AArch64/armv9.2a-mec.s

@@ -5,13 +5,13 @@
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+mec < %s \
 // RUN:        | llvm-objdump -d --mattr=+mec --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+mec < %s \
-// RUN:   | llvm-objdump -d --mattr=-mec --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d --mattr=-mec --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+mec < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \
 // RUN:        | llvm-mc -triple=aarch64 -mattr=+mec -disassemble -show-encoding \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-
+// RUN: llvm-mc -triple aarch64 -disassemble < %s 2>&1 | FileCheck --check-prefix=CHECK-NO-MEC %s
 
 
 mrs x0, MECIDR_EL2
@@ -109,9 +109,21 @@ dc cigdpae, x0
 // CHECK-ENCODING: encoding: [0xe0,0x7e,0x0c,0xd5]
 // CHECK-ERROR: :[[@LINE-3]]:4: error: DC CIGDPAE requires: mec
 // CHECK-UNKNOWN:  d50c7ee0 sys #4, c7, c14, #7, x0
+// CHECK-NO-MEC: sys #4, c7, c14, #7, x0
 
 dc cipae, x0
 // CHECK-INST: dc cipae, x0
 // CHECK-ENCODING: encoding: [0x00,0x7e,0x0c,0xd5]
 // CHECK-ERROR: :[[@LINE-3]]:4: error: DC CIPAE requires: mec
 // CHECK-UNKNOWN:  d50c7e00 sys #4, c7, c14, #0, x0
+// CHECK-NO-MEC: sys #4, c7, c14, #0, x0
+
+sys #4, c7, c14, #7, x0
+// CHECK-INST: dc cigdpae, x0
+// CHECK-ENCODING: encoding: [0xe0,0x7e,0x0c,0xd5]
+// CHECK-UNKNOWN:  d50c7ee0 sys #4, c7, c14, #7, x0
+
+sys #4, c7, c14, #0, x0
+// CHECK-INST: dc cipae, x0
+// CHECK-ENCODING: encoding: [0x00,0x7e,0x0c,0xd5]
+// CHECK-UNKNOWN:  d50c7e00 sys #4, c7, c14, #0, x0

llvm/test/MC/AArch64/armv9.4a-gcs.s

@@ -5,13 +5,13 @@
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+gcs < %s \
 // RUN:        | llvm-objdump -d --mattr=+gcs --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+gcs < %s \
-// RUN:   | llvm-objdump -d --mattr=-gcs --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d --mattr=-gcs --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+gcs < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \
 // RUN:        | llvm-mc -triple=aarch64 -mattr=+gcs -disassemble -show-encoding \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-
+// RUN: not llvm-mc -triple aarch64 -show-encoding %s 2>%t | FileCheck %s --check-prefix=NO-GCS
 
 
 msr GCSCR_EL1, x0
@@ -154,11 +154,13 @@ gcsb dsync
 // CHECK-INST: gcsb dsync
 // CHECK-ENCODING: encoding: [0x7f,0x22,0x03,0xd5]
 // CHECK-UNKNOWN:  d503227f hint #19
+// NO-GCS: hint #19                              // encoding: [0x7f,0x22,0x03,0xd5]
 
 hint #19
 // CHECK-INST: gcsb dsync
 // CHECK-ENCODING: encoding: [0x7f,0x22,0x03,0xd5]
 // CHECK-UNKNOWN:  d503227f hint #19
+// NO-GCS: hint #19                              // encoding: [0x7f,0x22,0x03,0xd5]
 
 gcsstr x26, [x27]
 // CHECK-INST: gcsstr x26, [x27]

llvm/test/MC/AArch64/armv9.4a-lse128-diagnostics.s

@@ -3,15 +3,18 @@
 
 ldclrpl  x22, xzr, [sp]
 // CHECK-ERROR: error: invalid operand for instruction
+
 ldclrpl  xzr, x22, [sp]
 // CHECK-ERROR: error: invalid operand for instruction
 
 ldsetpl  x22, xzr, [sp]
 // CHECK-ERROR: error: invalid operand for instruction
+
 ldsetpl  xzr, x22, [sp]
 // CHECK-ERROR: error: invalid operand for instruction
 
 swppl    x22, xzr, [sp]
 // CHECK-ERROR: error: invalid operand for instruction
+
 swppl    xzr, x22, [sp]
 // CHECK-ERROR: error: invalid operand for instruction

llvm/test/MC/AArch64/armv9.4a-lse128.s

@@ -5,7 +5,7 @@
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+lse128 < %s \
 // RUN:        | llvm-objdump -d --mattr=+lse128 - | FileCheck %s --check-prefix=CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+lse128 < %s \
-// RUN:   | llvm-objdump -d --mattr=-lse128 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d --mattr=-lse128 - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+lse128 < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \
@@ -19,36 +19,43 @@ ldclrp   x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x11,0x22,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19221161 <unknown>
+
 ldclrp   x21, x22, [sp]
 // CHECK-INST: ldclrp x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x13,0x36,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  193613f5 <unknown>
+
 ldclrpa  x1, x2, [x11]
 // CHECK-INST: ldclrpa x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x11,0xa2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19a21161 <unknown>
+
 ldclrpa  x21, x22, [sp]
 // CHECK-INST: ldclrpa x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x13,0xb6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19b613f5 <unknown>
+
 ldclrpal x1, x2, [x11]
 // CHECK-INST: ldclrpal x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x11,0xe2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19e21161 <unknown>
+
 ldclrpal x21, x22, [sp]
 // CHECK-INST: ldclrpal x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x13,0xf6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19f613f5 <unknown>
+
 ldclrpl  x1, x2, [x11]
 // CHECK-INST: ldclrpl x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x11,0x62,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19621161 <unknown>
+
 ldclrpl  x21, x22, [sp]
 // CHECK-INST: ldclrpl x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x13,0x76,0x19]
@@ -60,36 +67,43 @@ ldsetp   x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x31,0x22,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19223161 <unknown>
+
 ldsetp   x21, x22, [sp]
 // CHECK-INST: ldsetp x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x33,0x36,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  193633f5 <unknown>
+
 ldsetpa  x1, x2, [x11]
 // CHECK-INST: ldsetpa x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x31,0xa2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19a23161 <unknown>
+
 ldsetpa  x21, x22, [sp]
 // CHECK-INST: ldsetpa x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x33,0xb6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19b633f5 <unknown>
+
 ldsetpal x1, x2, [x11]
 // CHECK-INST: ldsetpal x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x31,0xe2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19e23161 <unknown>
+
 ldsetpal x21, x22, [sp]
 // CHECK-INST: ldsetpal x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x33,0xf6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19f633f5 <unknown>
+
 ldsetpl  x1, x2, [x11]
 // CHECK-INST: ldsetpl x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x31,0x62,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19623161 <unknown>
+
 ldsetpl  x21, x22, [sp]
 // CHECK-INST: ldsetpl x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x33,0x76,0x19]
@@ -101,36 +115,43 @@ swpp     x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x81,0x22,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19228161 <unknown>
+
 swpp     x21, x22, [sp]
 // CHECK-INST: swpp x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x83,0x36,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  193683f5 <unknown>
+
 swppa    x1, x2, [x11]
 // CHECK-INST: swppa x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x81,0xa2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19a28161 <unknown>
+
 swppa    x21, x22, [sp]
 // CHECK-INST: swppa x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x83,0xb6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19b683f5 <unknown>
+
 swppal   x1, x2, [x11]
 // CHECK-INST: swppal x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x81,0xe2,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19e28161 <unknown>
+
 swppal   x21, x22, [sp]
 // CHECK-INST: swppal x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x83,0xf6,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19f683f5 <unknown>
+
 swppl    x1, x2, [x11]
 // CHECK-INST: swppl x1, x2, [x11]
 // CHECK-ENCODING: encoding: [0x61,0x81,0x62,0x19]
 // CHECK-ERROR: :[[@LINE-3]]:1: error: instruction requires: lse128
 // CHECK-UNKNOWN:  19628161 <unknown>
+
 swppl    x21, x22, [sp]
 // CHECK-INST: swppl x21, x22, [sp]
 // CHECK-ENCODING: encoding: [0xf5,0x83,0x76,0x19]

llvm/test/MC/AArch64/armv9.5a-cpa.s

@@ -5,7 +5,7 @@
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+cpa < %s \
 // RUN:        | llvm-objdump -d --mattr=+cpa - | FileCheck %s --check-prefix=CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+cpa < %s \
-// RUN:   | llvm-objdump -d --mattr=-cpa - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d --mattr=-cpa - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+cpa < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \

llvm/test/MC/AArch64/armv9.6a-mpam.s

@@ -3,7 +3,7 @@
 // RUN: llvm-mc -triple=aarch64 -filetype=obj < %s \
 // RUN:        | llvm-objdump -d - | FileCheck %s --check-prefix=CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj < %s \
-// RUN:   | llvm-objdump -d - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \
@@ -20,26 +20,32 @@ msr MPAMBW3_EL3, x0
 // CHECK-INST: msr MPAMBW3_EL3, x0
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x1e,0xd5]
 // CHECK-UNKNOWN:  d51ea580 msr MPAMBW3_EL3, x0
+
 msr MPAMBW2_EL2, x0
 // CHECK-INST: msr MPAMBW2_EL2, x0
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x1c,0xd5]
 // CHECK-UNKNOWN:  d51ca580 msr MPAMBW2_EL2, x0
+
 msr MPAMBW1_EL1, x0
 // CHECK-INST: msr MPAMBW1_EL1, x0
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x18,0xd5]
 // CHECK-UNKNOWN:  d518a580 msr MPAMBW1_EL1, x0
+
 msr MPAMBW1_EL12, x0
 // CHECK-INST: msr MPAMBW1_EL12, x0
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x1d,0xd5]
 // CHECK-UNKNOWN:  d51da580 msr MPAMBW1_EL12, x0
+
 msr MPAMBW0_EL1, x0
 // CHECK-INST: msr MPAMBW0_EL1, x0
 // CHECK-ENCODING: encoding: [0xa0,0xa5,0x18,0xd5]
 // CHECK-UNKNOWN:  d518a5a0 msr MPAMBW0_EL1, x0
+
 msr MPAMBWCAP_EL2, x0
 // CHECK-INST: msr MPAMBWCAP_EL2, x0
 // CHECK-ENCODING: encoding: [0xc0,0xa5,0x1c,0xd5]
 // CHECK-UNKNOWN:  d51ca5c0 msr MPAMBWCAP_EL2, x0
+
 msr MPAMBWSM_EL1, x0
 // CHECK-INST: msr MPAMBWSM_EL1, x0
 // CHECK-ENCODING: encoding: [0xe0,0xa5,0x18,0xd5]
@@ -49,30 +55,37 @@ mrs x0, MPAMBWIDR_EL1
 // CHECK-INST: mrs x0, MPAMBWIDR_EL1
 // CHECK-ENCODING: encoding: [0xa0,0xa4,0x38,0xd5]
 // CHECK-UNKNOWN:  d538a4a0 mrs x0, MPAMBWIDR_EL1
+
 mrs x0, MPAMBW3_EL3
 // CHECK-INST: mrs x0, MPAMBW3_EL3
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x3e,0xd5]
 // CHECK-UNKNOWN:  d53ea580 mrs x0, MPAMBW3_EL3
+
 mrs x0, MPAMBW2_EL2
 // CHECK-INST: mrs x0, MPAMBW2_EL2
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53ca580 mrs x0, MPAMBW2_EL2
+
 mrs x0, MPAMBW1_EL1
 // CHECK-INST: mrs x0, MPAMBW1_EL1
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x38,0xd5]
 // CHECK-UNKNOWN:  d538a580 mrs x0, MPAMBW1_EL1
+
 mrs x0, MPAMBW1_EL12
 // CHECK-INST: mrs x0, MPAMBW1_EL12
 // CHECK-ENCODING: encoding: [0x80,0xa5,0x3d,0xd5]
 // CHECK-UNKNOWN:  d53da580 mrs x0, MPAMBW1_EL12
+
 mrs x0, MPAMBW0_EL1
 // CHECK-INST: mrs x0, MPAMBW0_EL1
 // CHECK-ENCODING: encoding: [0xa0,0xa5,0x38,0xd5]
 // CHECK-UNKNOWN:  d538a5a0 mrs x0, MPAMBW0_EL1
+
 mrs x0, MPAMBWCAP_EL2
 // CHECK-INST: mrs x0, MPAMBWCAP_EL2
 // CHECK-ENCODING: encoding: [0xc0,0xa5,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53ca5c0 mrs x0, MPAMBWCAP_EL2
+
 mrs x0, MPAMBWSM_EL1
 // CHECK-INST: mrs x0, MPAMBWSM_EL1
 // CHECK-ENCODING: encoding: [0xe0,0xa5,0x38,0xd5]