Skip to content

Commit af692b7

Browse files
jthackrayvirginia-cangelosi
jthackray
and
virginia-cangelosi
committed
[AArch64][llvm] Unify AArch64 tests into a single file (3/4) (NFC)
This is a series of patches (3/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 multiple feature dependancies * makes the .s tests have a roundabout run line to test both encoding and assembly * creates diagnostic tests when needed Co-authored-by: Virginia Cangelosi <virginia.cangelosi@arm.com>
1 parent be8bcde commit af692b7

29 files changed

+4887
-5095
lines changed

‎llvm/test/MC/AArch64/armv8.6a-fgt.s

Lines changed: 105 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,133 @@
1-
// RUN: llvm-mc -triple aarch64 -show-encoding -mattr=+fgt < %s | FileCheck %s
2-
// RUN: llvm-mc -triple aarch64 -show-encoding -mattr=+v8.6a < %s | FileCheck %s
3-
// RUN: not llvm-mc -triple aarch64 -show-encoding < %s 2>&1 | FileCheck %s --check-prefix=NOFGT
1+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+v8.6a < %s \
2+
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
3+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+fgt < %s \
4+
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
5+
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
6+
// RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
7+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+fgt < %s \
8+
// RUN: | llvm-objdump -d --mattr=+fgt - | FileCheck %s --check-prefix=CHECK-INST
9+
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+fgt < %s \
10+
// RUN: | llvm-objdump -d --mattr=-fgt - | FileCheck %s --check-prefix=CHECK-UNKNOWN
11+
// Disassemble encoding and check the re-encoding (-show-encoding) matches.
12+
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+fgt < %s \
13+
// RUN: | sed '/.text/d' | sed 's/.*encoding: //g' \
14+
// RUN: | llvm-mc -triple=aarch64 -mattr=+fgt -disassemble -show-encoding \
15+
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
16+
17+
418

519
msr HFGRTR_EL2, x0
20+
// CHECK-INST: msr HFGRTR_EL2, x0
21+
// CHECK-ENCODING: encoding: [0x80,0x11,0x1c,0xd5]
22+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
23+
// CHECK-UNKNOWN: d51c1180 msr S3_4_C1_C1_4, x0
624
msr HFGWTR_EL2, x5
25+
// CHECK-INST: msr HFGWTR_EL2, x5
26+
// CHECK-ENCODING: encoding: [0xa5,0x11,0x1c,0xd5]
27+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
28+
// CHECK-UNKNOWN: d51c11a5 msr S3_4_C1_C1_5, x5
729
msr HFGITR_EL2, x10
30+
// CHECK-INST: msr HFGITR_EL2, x10
31+
// CHECK-ENCODING: encoding: [0xca,0x11,0x1c,0xd5]
32+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
33+
// CHECK-UNKNOWN: d51c11ca msr S3_4_C1_C1_6, x10
834
msr HDFGRTR_EL2, x15
35+
// CHECK-INST: msr HDFGRTR_EL2, x15
36+
// CHECK-ENCODING: encoding: [0x8f,0x31,0x1c,0xd5]
37+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
38+
// CHECK-UNKNOWN: d51c318f msr S3_4_C3_C1_4, x15
939
msr HDFGWTR_EL2, x20
40+
// CHECK-INST: msr HDFGWTR_EL2, x20
41+
// CHECK-ENCODING: encoding: [0xb4,0x31,0x1c,0xd5]
42+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
43+
// CHECK-UNKNOWN: d51c31b4 msr S3_4_C3_C1_5, x20
1044
msr HAFGRTR_EL2, x25
11-
// CHECK: msr HFGRTR_EL2, x0 // encoding: [0x80,0x11,0x1c,0xd5]
12-
// CHECK: msr HFGWTR_EL2, x5 // encoding: [0xa5,0x11,0x1c,0xd5]
13-
// CHECK: msr HFGITR_EL2, x10 // encoding: [0xca,0x11,0x1c,0xd5]
14-
// CHECK: msr HDFGRTR_EL2, x15 // encoding: [0x8f,0x31,0x1c,0xd5]
15-
// CHECK: msr HDFGWTR_EL2, x20 // encoding: [0xb4,0x31,0x1c,0xd5]
16-
// CHECK: msr HAFGRTR_EL2, x25 // encoding: [0xd9,0x31,0x1c,0xd5]
17-
// NOFGT: error: expected writable system register or pstate
18-
// NOFGT: error: expected writable system register or pstate
19-
// NOFGT: error: expected writable system register or pstate
20-
// NOFGT: error: expected writable system register or pstate
21-
// NOFGT: error: expected writable system register or pstate
22-
// NOFGT: error: expected writable system register or pstate
45+
// CHECK-INST: msr HAFGRTR_EL2, x25
46+
// CHECK-ENCODING: encoding: [0xd9,0x31,0x1c,0xd5]
47+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
48+
// CHECK-UNKNOWN: d51c31d9 msr S3_4_C3_C1_6, x25
2349

2450
mrs x30, HFGRTR_EL2
51+
// CHECK-INST: mrs x30, HFGRTR_EL2
52+
// CHECK-ENCODING: encoding: [0x9e,0x11,0x3c,0xd5]
53+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
54+
// CHECK-UNKNOWN: d53c119e mrs x30, S3_4_C1_C1_4
2555
mrs x25, HFGWTR_EL2
56+
// CHECK-INST: mrs x25, HFGWTR_EL2
57+
// CHECK-ENCODING: encoding: [0xb9,0x11,0x3c,0xd5]
58+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
59+
// CHECK-UNKNOWN: d53c11b9 mrs x25, S3_4_C1_C1_5
2660
mrs x20, HFGITR_EL2
61+
// CHECK-INST: mrs x20, HFGITR_EL2
62+
// CHECK-ENCODING: encoding: [0xd4,0x11,0x3c,0xd5]
63+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
64+
// CHECK-UNKNOWN: d53c11d4 mrs x20, S3_4_C1_C1_6
2765
mrs x15, HDFGRTR_EL2
66+
// CHECK-INST: mrs x15, HDFGRTR_EL2
67+
// CHECK-ENCODING: encoding: [0x8f,0x31,0x3c,0xd5]
68+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
69+
// CHECK-UNKNOWN: d53c318f mrs x15, S3_4_C3_C1_4
2870
mrs x10, HDFGWTR_EL2
71+
// CHECK-INST: mrs x10, HDFGWTR_EL2
72+
// CHECK-ENCODING: encoding: [0xaa,0x31,0x3c,0xd5]
73+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
74+
// CHECK-UNKNOWN: d53c31aa mrs x10, S3_4_C3_C1_5
2975
mrs x5, HAFGRTR_EL2
30-
// CHECK: mrs x30, HFGRTR_EL2 // encoding: [0x9e,0x11,0x3c,0xd5]
31-
// CHECK: mrs x25, HFGWTR_EL2 // encoding: [0xb9,0x11,0x3c,0xd5]
32-
// CHECK: mrs x20, HFGITR_EL2 // encoding: [0xd4,0x11,0x3c,0xd5]
33-
// CHECK: mrs x15, HDFGRTR_EL2 // encoding: [0x8f,0x31,0x3c,0xd5]
34-
// CHECK: mrs x10, HDFGWTR_EL2 // encoding: [0xaa,0x31,0x3c,0xd5]
35-
// CHECK: mrs x5, HAFGRTR_EL2 // encoding: [0xc5,0x31,0x3c,0xd5]
36-
// NOFGT: error: expected readable system register
37-
// NOFGT: error: expected readable system register
38-
// NOFGT: error: expected readable system register
39-
// NOFGT: error: expected readable system register
40-
// NOFGT: error: expected readable system register
41-
// NOFGT: error: expected readable system register
76+
// CHECK-INST: mrs x5, HAFGRTR_EL2
77+
// CHECK-ENCODING: encoding: [0xc5,0x31,0x3c,0xd5]
78+
// CHECK-ERROR: :[[@LINE-3]]:11: error: expected readable system register
79+
// CHECK-UNKNOWN: d53c31c5 mrs x5, S3_4_C3_C1_6
4280

4381

4482
mrs x3, HDFGRTR2_EL2
83+
// CHECK-INST: mrs x3, HDFGRTR2_EL2
84+
// CHECK-ENCODING: encoding: [0x03,0x31,0x3c,0xd5]
85+
// CHECK-ERROR: :[[@LINE-3]]:9: error: expected readable system register
86+
// CHECK-UNKNOWN: d53c3103 mrs x3, S3_4_C3_C1_0
4587
mrs x3, HDFGWTR2_EL2
88+
// CHECK-INST: mrs x3, HDFGWTR2_EL2
89+
// CHECK-ENCODING: encoding: [0x23,0x31,0x3c,0xd5]
90+
// CHECK-ERROR: :[[@LINE-3]]:9: error: expected readable system register
91+
// CHECK-UNKNOWN: d53c3123 mrs x3, S3_4_C3_C1_1
4692
mrs x3, HFGRTR2_EL2
93+
// CHECK-INST: mrs x3, HFGRTR2_EL2
94+
// CHECK-ENCODING: encoding: [0x43,0x31,0x3c,0xd5]
95+
// CHECK-ERROR: :[[@LINE-3]]:9: error: expected readable system register
96+
// CHECK-UNKNOWN: d53c3143 mrs x3, S3_4_C3_C1_2
4797
mrs x3, HFGWTR2_EL2
98+
// CHECK-INST: mrs x3, HFGWTR2_EL2
99+
// CHECK-ENCODING: encoding: [0x63,0x31,0x3c,0xd5]
100+
// CHECK-ERROR: :[[@LINE-3]]:9: error: expected readable system register
101+
// CHECK-UNKNOWN: d53c3163 mrs x3, S3_4_C3_C1_3
48102
mrs x3, HFGITR2_EL2
49-
// CHECK: mrs x3, HDFGRTR2_EL2 // encoding: [0x03,0x31,0x3c,0xd5]
50-
// CHECK: mrs x3, HDFGWTR2_EL2 // encoding: [0x23,0x31,0x3c,0xd5]
51-
// CHECK: mrs x3, HFGRTR2_EL2 // encoding: [0x43,0x31,0x3c,0xd5]
52-
// CHECK: mrs x3, HFGWTR2_EL2 // encoding: [0x63,0x31,0x3c,0xd5]
53-
// CHECK: mrs x3, HFGITR2_EL2 // encoding: [0xe3,0x31,0x3c,0xd5]
54-
// NOFGT: error: expected readable system register
55-
// NOFGT: error: expected readable system register
56-
// NOFGT: error: expected readable system register
57-
// NOFGT: error: expected readable system register
58-
// NOFGT: error: expected readable system register
103+
// CHECK-INST: mrs x3, HFGITR2_EL2
104+
// CHECK-ENCODING: encoding: [0xe3,0x31,0x3c,0xd5]
105+
// CHECK-ERROR: :[[@LINE-3]]:9: error: expected readable system register
106+
// CHECK-UNKNOWN: d53c31e3 mrs x3, S3_4_C3_C1_7
59107

60108

61109
msr HDFGRTR2_EL2, x3
110+
// CHECK-INST: msr HDFGRTR2_EL2, x3
111+
// CHECK-ENCODING: encoding: [0x03,0x31,0x1c,0xd5]
112+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
113+
// CHECK-UNKNOWN: d51c3103 msr S3_4_C3_C1_0, x3
62114
msr HDFGWTR2_EL2, x3
115+
// CHECK-INST: msr HDFGWTR2_EL2, x3
116+
// CHECK-ENCODING: encoding: [0x23,0x31,0x1c,0xd5]
117+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
118+
// CHECK-UNKNOWN: d51c3123 msr S3_4_C3_C1_1, x3
63119
msr HFGRTR2_EL2, x3
120+
// CHECK-INST: msr HFGRTR2_EL2, x3
121+
// CHECK-ENCODING: encoding: [0x43,0x31,0x1c,0xd5]
122+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
123+
// CHECK-UNKNOWN: d51c3143 msr S3_4_C3_C1_2, x3
64124
msr HFGWTR2_EL2, x3
125+
// CHECK-INST: msr HFGWTR2_EL2, x3
126+
// CHECK-ENCODING: encoding: [0x63,0x31,0x1c,0xd5]
127+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
128+
// CHECK-UNKNOWN: d51c3163 msr S3_4_C3_C1_3, x3
65129
msr HFGITR2_EL2, x3
66-
// CHECK: msr HDFGRTR2_EL2, x3 // encoding: [0x03,0x31,0x1c,0xd5]
67-
// CHECK: msr HDFGWTR2_EL2, x3 // encoding: [0x23,0x31,0x1c,0xd5]
68-
// CHECK: msr HFGRTR2_EL2, x3 // encoding: [0x43,0x31,0x1c,0xd5]
69-
// CHECK: msr HFGWTR2_EL2, x3 // encoding: [0x63,0x31,0x1c,0xd5]
70-
// CHECK: msr HFGITR2_EL2, x3 // encoding: [0xe3,0x31,0x1c,0xd5]
71-
// NOFGT: error: expected writable system register
72-
// NOFGT: error: expected writable system register
73-
// NOFGT: error: expected writable system register
74-
// NOFGT: error: expected writable system register
75-
// NOFGT: error: expected writable system register
130+
// CHECK-INST: msr HFGITR2_EL2, x3
131+
// CHECK-ENCODING: encoding: [0xe3,0x31,0x1c,0xd5]
132+
// CHECK-ERROR: :[[@LINE-3]]:5: error: expected writable system register or pstate
133+
// CHECK-UNKNOWN: d51c31e3 msr S3_4_C3_C1_7, x3

0 commit comments

Comments
 (0)