Skip to content

Commit 0372676

Browse files
sdesmalen-armtstellar
sdesmalen-arm
authored and
tstellar
committed
[AArch64][SME] Remove term 'streaming-sve' from assembler diagnostics.
'streaming-sve' is not a feature that users should be able to set, hence why it shouldn't show up in user-diagnostics. The only flag that end-users should be able to set is '+sme'. Reviewed By: paulwalker-arm Differential Revision: https://reviews.llvm.org/D120256 (cherry picked from commit ffa4dfc)
1 parent f58ab32 commit 0372676

File tree

498 files changed

+5791
-5791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+5791
-5791
lines changed

‎llvm/lib/Target/AArch64/AArch64InstrInfo.td‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,23 +143,23 @@ def HasSMEF64 : Predicate<"Subtarget->hasSMEF64()">,
143143
def HasSMEI64 : Predicate<"Subtarget->hasSMEI64()">,
144144
AssemblerPredicate<(all_of FeatureSMEI64), "sme-i64">;
145145
def HasStreamingSVE : Predicate<"Subtarget->hasStreamingSVE()">,
146-
AssemblerPredicate<(all_of FeatureStreamingSVE), "streaming-sve">;
146+
AssemblerPredicate<(all_of FeatureStreamingSVE), "sme">;
147147
// A subset of SVE(2) instructions are legal in Streaming SVE execution mode,
148148
// they should be enabled if either has been specified.
149149
def HasSVEorStreamingSVE
150150
: Predicate<"Subtarget->hasSVE() || Subtarget->hasStreamingSVE()">,
151151
AssemblerPredicate<(any_of FeatureSVE, FeatureStreamingSVE),
152-
"streaming-sve or sve">;
152+
"sve or sme">;
153153
def HasSVE2orStreamingSVE
154154
: Predicate<"Subtarget->hasSVE2() || Subtarget->hasStreamingSVE()">,
155155
AssemblerPredicate<(any_of FeatureSVE2, FeatureStreamingSVE),
156-
"streaming-sve or sve2">;
156+
"sve2 or sme">;
157157
// A subset of NEON instructions are legal in Streaming SVE execution mode,
158158
// they should be enabled if either has been specified.
159159
def HasNEONorStreamingSVE
160160
: Predicate<"Subtarget->hasNEON() || Subtarget->hasStreamingSVE()">,
161161
AssemblerPredicate<(any_of FeatureNEON, FeatureStreamingSVE),
162-
"streaming-sve or neon">;
162+
"neon or sme">;
163163
def HasRCPC : Predicate<"Subtarget->hasRCPC()">,
164164
AssemblerPredicate<(all_of FeatureRCPC), "rcpc">;
165165
def HasAltNZCV : Predicate<"Subtarget->hasAlternativeNZCV()">,

‎llvm/test/MC/AArch64/SME/revd.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ revd z31.q, p7/m, z31.q
4242
movprfx z21, z25
4343
// CHECK-INST: movprfx z21, z25
4444
// CHECK-ENCODING: [0x35,0xbf,0x20,0x04]
45-
// CHECK-ERROR: instruction requires: streaming-sve or sve
45+
// CHECK-ERROR: instruction requires: sve or sme
4646
// CHECK-UNKNOWN: 35 bf 20 04 <unknown>
4747

4848
revd z21.q, p5/m, z10.q

‎llvm/test/MC/AArch64/SME/sclamp.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ sclamp z31.d, z31.d, z31.d
126126
movprfx z23, z27
127127
// CHECK-INST: movprfx z23, z27
128128
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
129-
// CHECK-ERROR: instruction requires: streaming-sve or sve
129+
// CHECK-ERROR: instruction requires: sve or sme
130130
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
131131

132132
sclamp z23.b, z13.b, z8.b
@@ -138,7 +138,7 @@ sclamp z23.b, z13.b, z8.b
138138
movprfx z23, z27
139139
// CHECK-INST: movprfx z23, z27
140140
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
141-
// CHECK-ERROR: instruction requires: streaming-sve or sve
141+
// CHECK-ERROR: instruction requires: sve or sme
142142
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
143143

144144
sclamp z23.h, z13.h, z8.h
@@ -150,7 +150,7 @@ sclamp z23.h, z13.h, z8.h
150150
movprfx z23, z27
151151
// CHECK-INST: movprfx z23, z27
152152
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
153-
// CHECK-ERROR: instruction requires: streaming-sve or sve
153+
// CHECK-ERROR: instruction requires: sve or sme
154154
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
155155

156156
sclamp z23.s, z13.s, z8.s
@@ -162,7 +162,7 @@ sclamp z23.s, z13.s, z8.s
162162
movprfx z23, z27
163163
// CHECK-INST: movprfx z23, z27
164164
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
165-
// CHECK-ERROR: instruction requires: streaming-sve or sve
165+
// CHECK-ERROR: instruction requires: sve or sme
166166
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
167167

168168
sclamp z23.d, z13.d, z8.d

‎llvm/test/MC/AArch64/SME/streaming-mode-neon.s‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,62 @@
1515
fmulx s0, s1, s2
1616
// CHECK-INST: fmulx s0, s1, s2
1717
// CHECK-ENCODING: [0x20,0xdc,0x22,0x5e]
18-
// CHECK-ERROR: instruction requires: streaming-sve or neon
18+
// CHECK-ERROR: instruction requires: neon or sme
1919

2020
fmulx d0, d1, d2
2121
// CHECK-INST: fmulx d0, d1, d2
2222
// CHECK-ENCODING: [0x20,0xdc,0x62,0x5e]
23-
// CHECK-ERROR: instruction requires: streaming-sve or neon
23+
// CHECK-ERROR: instruction requires: neon or sme
2424

2525
frecps s0, s1, s2
2626
// CHECK-INST: frecps s0, s1, s2
2727
// CHECK-ENCODING: [0x20,0xfc,0x22,0x5e]
28-
// CHECK-ERROR: instruction requires: streaming-sve or neon
28+
// CHECK-ERROR: instruction requires: neon or sme
2929

3030
frecps d0, d1, d2
3131
// CHECK-INST: frecps d0, d1, d2
3232
// CHECK-ENCODING: [0x20,0xfc,0x62,0x5e]
33-
// CHECK-ERROR: instruction requires: streaming-sve or neon
33+
// CHECK-ERROR: instruction requires: neon or sme
3434

3535
frsqrts s0, s1, s2
3636
// CHECK-INST: frsqrts s0, s1, s2
3737
// CHECK-ENCODING: [0x20,0xfc,0xa2,0x5e]
38-
// CHECK-ERROR: instruction requires: streaming-sve or neon
38+
// CHECK-ERROR: instruction requires: neon or sme
3939

4040
frsqrts d0, d1, d2
4141
// CHECK-INST: frsqrts d0, d1, d2
4242
// CHECK-ENCODING: [0x20,0xfc,0xe2,0x5e]
43-
// CHECK-ERROR: instruction requires: streaming-sve or neon
43+
// CHECK-ERROR: instruction requires: neon or sme
4444

4545
frecpe s0, s1
4646
// CHECK-INST: frecpe s0, s1
4747
// CHECK-ENCODING: [0x20,0xd8,0xa1,0x5e]
48-
// CHECK-ERROR: instruction requires: streaming-sve or neon
48+
// CHECK-ERROR: instruction requires: neon or sme
4949

5050
frecpe d0, d1
5151
// CHECK-INST: frecpe d0, d1
5252
// CHECK-ENCODING: [0x20,0xd8,0xe1,0x5e]
53-
// CHECK-ERROR: instruction requires: streaming-sve or neon
53+
// CHECK-ERROR: instruction requires: neon or sme
5454

5555
frecpx s0, s1
5656
// CHECK-INST: frecpx s0, s1
5757
// CHECK-ENCODING: [0x20,0xf8,0xa1,0x5e]
58-
// CHECK-ERROR: instruction requires: streaming-sve or neon
58+
// CHECK-ERROR: instruction requires: neon or sme
5959

6060
frecpx d0, d1
6161
// CHECK-INST: frecpx d0, d1
6262
// CHECK-ENCODING: [0x20,0xf8,0xe1,0x5e]
63-
// CHECK-ERROR: instruction requires: streaming-sve or neon
63+
// CHECK-ERROR: instruction requires: neon or sme
6464

6565
frsqrte s0, s1
6666
// CHECK-INST: frsqrte s0, s1
6767
// CHECK-ENCODING: [0x20,0xd8,0xa1,0x7e]
68-
// CHECK-ERROR: instruction requires: streaming-sve or neon
68+
// CHECK-ERROR: instruction requires: neon or sme
6969

7070
frsqrte d0, d1
7171
// CHECK-INST: frsqrte d0, d1
7272
// CHECK-ENCODING: [0x20,0xd8,0xe1,0x7e]
73-
// CHECK-ERROR: instruction requires: streaming-sve or neon
73+
// CHECK-ERROR: instruction requires: neon or sme
7474

7575
// Vector to GPR integer move instructions
7676

‎llvm/test/MC/AArch64/SME/uclamp.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ uclamp z31.d, z31.d, z31.d
126126
movprfx z23, z27
127127
// CHECK-INST: movprfx z23, z27
128128
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
129-
// CHECK-ERROR: instruction requires: streaming-sve or sve
129+
// CHECK-ERROR: instruction requires: sve or sme
130130
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
131131

132132
uclamp z23.b, z13.b, z8.b
@@ -138,7 +138,7 @@ uclamp z23.b, z13.b, z8.b
138138
movprfx z23, z27
139139
// CHECK-INST: movprfx z23, z27
140140
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
141-
// CHECK-ERROR: instruction requires: streaming-sve or sve
141+
// CHECK-ERROR: instruction requires: sve or sme
142142
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
143143

144144
uclamp z23.h, z13.h, z8.h
@@ -150,7 +150,7 @@ uclamp z23.h, z13.h, z8.h
150150
movprfx z23, z27
151151
// CHECK-INST: movprfx z23, z27
152152
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
153-
// CHECK-ERROR: instruction requires: streaming-sve or sve
153+
// CHECK-ERROR: instruction requires: sve or sme
154154
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
155155

156156
uclamp z23.s, z13.s, z8.s
@@ -162,7 +162,7 @@ uclamp z23.s, z13.s, z8.s
162162
movprfx z23, z27
163163
// CHECK-INST: movprfx z23, z27
164164
// CHECK-ENCODING: [0x77,0xbf,0x20,0x04]
165-
// CHECK-ERROR: instruction requires: streaming-sve or sve
165+
// CHECK-ERROR: instruction requires: sve or sme
166166
// CHECK-UNKNOWN: 77 bf 20 04 <unknown>
167167

168168
uclamp z23.d, z13.d, z8.d

‎llvm/test/MC/AArch64/SVE/abs.s‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,49 @@
1212
abs z0.b, p0/m, z0.b
1313
// CHECK-INST: abs z0.b, p0/m, z0.b
1414
// CHECK-ENCODING: [0x00,0xa0,0x16,0x04]
15-
// CHECK-ERROR: instruction requires: streaming-sve or sve
15+
// CHECK-ERROR: instruction requires: sve or sme
1616
// CHECK-UNKNOWN: 00 a0 16 04 <unknown>
1717

1818
abs z0.h, p0/m, z0.h
1919
// CHECK-INST: abs z0.h, p0/m, z0.h
2020
// CHECK-ENCODING: [0x00,0xa0,0x56,0x04]
21-
// CHECK-ERROR: instruction requires: streaming-sve or sve
21+
// CHECK-ERROR: instruction requires: sve or sme
2222
// CHECK-UNKNOWN: 00 a0 56 04 <unknown>
2323

2424
abs z0.s, p0/m, z0.s
2525
// CHECK-INST: abs z0.s, p0/m, z0.s
2626
// CHECK-ENCODING: [0x00,0xa0,0x96,0x04]
27-
// CHECK-ERROR: instruction requires: streaming-sve or sve
27+
// CHECK-ERROR: instruction requires: sve or sme
2828
// CHECK-UNKNOWN: 00 a0 96 04 <unknown>
2929

3030
abs z0.d, p0/m, z0.d
3131
// CHECK-INST: abs z0.d, p0/m, z0.d
3232
// CHECK-ENCODING: [0x00,0xa0,0xd6,0x04]
33-
// CHECK-ERROR: instruction requires: streaming-sve or sve
33+
// CHECK-ERROR: instruction requires: sve or sme
3434
// CHECK-UNKNOWN: 00 a0 d6 04 <unknown>
3535

3636
abs z31.b, p7/m, z31.b
3737
// CHECK-INST: abs z31.b, p7/m, z31.b
3838
// CHECK-ENCODING: [0xff,0xbf,0x16,0x04]
39-
// CHECK-ERROR: instruction requires: streaming-sve or sve
39+
// CHECK-ERROR: instruction requires: sve or sme
4040
// CHECK-UNKNOWN: ff bf 16 04 <unknown>
4141

4242
abs z31.h, p7/m, z31.h
4343
// CHECK-INST: abs z31.h, p7/m, z31.h
4444
// CHECK-ENCODING: [0xff,0xbf,0x56,0x04]
45-
// CHECK-ERROR: instruction requires: streaming-sve or sve
45+
// CHECK-ERROR: instruction requires: sve or sme
4646
// CHECK-UNKNOWN: ff bf 56 04 <unknown>
4747

4848
abs z31.s, p7/m, z31.s
4949
// CHECK-INST: abs z31.s, p7/m, z31.s
5050
// CHECK-ENCODING: [0xff,0xbf,0x96,0x04]
51-
// CHECK-ERROR: instruction requires: streaming-sve or sve
51+
// CHECK-ERROR: instruction requires: sve or sme
5252
// CHECK-UNKNOWN: ff bf 96 04 <unknown>
5353

5454
abs z31.d, p7/m, z31.d
5555
// CHECK-INST: abs z31.d, p7/m, z31.d
5656
// CHECK-ENCODING: [0xff,0xbf,0xd6,0x04]
57-
// CHECK-ERROR: instruction requires: streaming-sve or sve
57+
// CHECK-ERROR: instruction requires: sve or sme
5858
// CHECK-UNKNOWN: ff bf d6 04 <unknown>
5959

6060

@@ -64,23 +64,23 @@ abs z31.d, p7/m, z31.d
6464
movprfx z4.d, p7/z, z6.d
6565
// CHECK-INST: movprfx z4.d, p7/z, z6.d
6666
// CHECK-ENCODING: [0xc4,0x3c,0xd0,0x04]
67-
// CHECK-ERROR: instruction requires: streaming-sve or sve
67+
// CHECK-ERROR: instruction requires: sve or sme
6868
// CHECK-UNKNOWN: c4 3c d0 04 <unknown>
6969

7070
abs z4.d, p7/m, z31.d
7171
// CHECK-INST: abs z4.d, p7/m, z31.d
7272
// CHECK-ENCODING: [0xe4,0xbf,0xd6,0x04]
73-
// CHECK-ERROR: instruction requires: streaming-sve or sve
73+
// CHECK-ERROR: instruction requires: sve or sme
7474
// CHECK-UNKNOWN: e4 bf d6 04 <unknown>
7575

7676
movprfx z4, z6
7777
// CHECK-INST: movprfx z4, z6
7878
// CHECK-ENCODING: [0xc4,0xbc,0x20,0x04]
79-
// CHECK-ERROR: instruction requires: streaming-sve or sve
79+
// CHECK-ERROR: instruction requires: sve or sme
8080
// CHECK-UNKNOWN: c4 bc 20 04 <unknown>
8181

8282
abs z4.d, p7/m, z31.d
8383
// CHECK-INST: abs z4.d, p7/m, z31.d
8484
// CHECK-ENCODING: [0xe4,0xbf,0xd6,0x04]
85-
// CHECK-ERROR: instruction requires: streaming-sve or sve
85+
// CHECK-ERROR: instruction requires: sve or sme
8686
// CHECK-UNKNOWN: e4 bf d6 04 <unknown>

0 commit comments

Comments
 (0)