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

jthackray · virginia-cangelosi · jthackray · commit b69735fcb68b · 2025-08-06T16:07:26.000+01:00
This is a series of patches (1/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:
 * unifies errorless .s and .txt tests into a single file
 * remove .txt tests which don't have feature requirements
 * makes the .s tests have a roundabout run line to test both encoding and assembly

Co-authored-by: Virginia Cangelosi &lt;virginia.cangelosi@arm.com&gt;
diff --git a/llvm/test/MC/AArch64/armv8.9a-ats1a.s b/llvm/test/MC/AArch64/armv8.9a-ats1a.s
@@ -1,9 +1,7 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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-prefixes=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' \
diff --git a/llvm/test/MC/AArch64/armv9.4a-ebep.s b/llvm/test/MC/AArch64/armv9.4a-ebep.s
@@ -1,37 +1,39 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // RUN: llvm-mc -triple=aarch64 -filetype=obj < %s \
-// RUN:        | llvm-objdump -d --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-INST
-// RUN: llvm-mc -triple=aarch64 -filetype=obj < %s \
-// RUN:   | llvm-objdump -d --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
+// RUN:        | llvm-objdump -d --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 < %s \
 // RUN:        | sed '/.text/d' | sed 's/.*encoding: //g' \
 // RUN:        | llvm-mc -triple=aarch64 -disassemble -show-encoding \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 
 
-
 mrs x2, PM
 // CHECK-INST: mrs x2, PM
 // CHECK-ENCODING: encoding: [0x22,0x43,0x38,0xd5]
 // CHECK-UNKNOWN:  d5384322 mrs x2, PM
+
 mrs x3, PM
 // CHECK-INST: mrs x3, PM
 // CHECK-ENCODING: encoding: [0x23,0x43,0x38,0xd5]
 // CHECK-UNKNOWN:  d5384323 mrs x3, PM
+
 msr PM, x3
 // CHECK-INST: msr PM, x3
 // CHECK-ENCODING: encoding: [0x23,0x43,0x18,0xd5]
 // CHECK-UNKNOWN:  d5184323 msr PM, x3
+
 msr PM, x6
 // CHECK-INST: msr PM, x6
 // CHECK-ENCODING: encoding: [0x26,0x43,0x18,0xd5]
 // CHECK-UNKNOWN:  d5184326 msr PM, x6
+
 msr PM, #0
 // CHECK-INST: msr PM, #0
 // CHECK-ENCODING: encoding: [0x1f,0x42,0x01,0xd5]
 // CHECK-UNKNOWN:  d501421f msr PM, #0
+
 msr PM, #1
 // CHECK-INST: msr PM, #1
 // CHECK-ENCODING: encoding: [0x1f,0x43,0x01,0xd5]
diff --git a/llvm/test/MC/AArch64/armv9.5a-e3dse.s b/llvm/test/MC/AArch64/armv9.5a-e3dse.s
@@ -1,9 +1,7 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
diff --git a/llvm/test/MC/AArch64/armv9.5a-fgwte3.s b/llvm/test/MC/AArch64/armv9.5a-fgwte3.s
@@ -1,21 +1,19 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
 // RUN:        | llvm-mc -triple=aarch64 -disassemble -show-encoding \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 
 
-
 mrs x0, FGWTE3_EL3
 // CHECK-INST: mrs x0, FGWTE3_EL3
 // CHECK-ENCODING: encoding: [0xa0,0x11,0x3e,0xd5]
 // CHECK-UNKNOWN:  d53e11a0 mrs x0, FGWTE3_EL3
+
 msr FGWTE3_EL3, x0
 // CHECK-INST: msr FGWTE3_EL3, x0
 // CHECK-ENCODING: encoding: [0xa0,0x11,0x1e,0xd5]
diff --git a/llvm/test/MC/AArch64/armv9.5a-hacdbs.s b/llvm/test/MC/AArch64/armv9.5a-hacdbs.s
@@ -1,21 +1,19 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
 // RUN:        | llvm-mc -triple=aarch64 -disassemble -show-encoding \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 
 
-
 mrs x0, HACDBSBR_EL2
 // CHECK-INST: mrs x0, HACDBSBR_EL2
 // CHECK-ENCODING: encoding: [0x80,0x23,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53c2380 mrs x0, HACDBSBR_EL2
+
 msr HACDBSBR_EL2, x0
 // CHECK-INST: msr HACDBSBR_EL2, x0
 // CHECK-ENCODING: encoding: [0x80,0x23,0x1c,0xd5]
@@ -25,6 +23,7 @@ mrs x0, HACDBSCONS_EL2
 // CHECK-INST: mrs x0, HACDBSCONS_EL2
 // CHECK-ENCODING: encoding: [0xa0,0x23,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53c23a0 mrs x0, HACDBSCONS_EL2
+
 msr HACDBSCONS_EL2, x0
 // CHECK-INST: msr HACDBSCONS_EL2, x0
 // CHECK-ENCODING: encoding: [0xa0,0x23,0x1c,0xd5]
diff --git a/llvm/test/MC/AArch64/armv9.5a-hdbss.s b/llvm/test/MC/AArch64/armv9.5a-hdbss.s
@@ -1,9 +1,7 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
@@ -16,6 +14,7 @@ mrs x0, HDBSSBR_EL2
 // CHECK-INST: mrs x0, HDBSSBR_EL2
 // CHECK-ENCODING: encoding: [0x40,0x23,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53c2340 mrs x0, HDBSSBR_EL2
+
 msr HDBSSBR_EL2, x0
 // CHECK-INST: msr HDBSSBR_EL2, x0
 // CHECK-ENCODING: encoding: [0x40,0x23,0x1c,0xd5]
@@ -25,6 +24,7 @@ mrs x0, HDBSSPROD_EL2
 // CHECK-INST: mrs x0, HDBSSPROD_EL2
 // CHECK-ENCODING: encoding: [0x60,0x23,0x3c,0xd5]
 // CHECK-UNKNOWN:  d53c2360 mrs x0, HDBSSPROD_EL2
+
 msr HDBSSPROD_EL2, x0
 // CHECK-INST: msr HDBSSPROD_EL2, x0
 // CHECK-ENCODING: encoding: [0x60,0x23,0x1c,0xd5]
diff --git a/llvm/test/MC/AArch64/armv9.5a-spmu2.s b/llvm/test/MC/AArch64/armv9.5a-spmu2.s
@@ -1,9 +1,7 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
diff --git a/llvm/test/MC/AArch64/armv9.5a-step2.s b/llvm/test/MC/AArch64/armv9.5a-step2.s
@@ -1,9 +1,7 @@
 // RUN: llvm-mc -triple=aarch64 -show-encoding < %s \
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // 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' \
diff --git a/llvm/test/MC/AArch64/armv9.6a-srmask.s b/llvm/test/MC/AArch64/armv9.6a-srmask.s
diff --git a/llvm/test/MC/AArch64/armv9.6a-statistical-profiling.s b/llvm/test/MC/AArch64/armv9.6a-statistical-profiling.s
diff --git a/llvm/test/MC/AArch64/armv9.6a-trbe-exception.s b/llvm/test/MC/AArch64/armv9.6a-trbe-exception.s
