Skip to content

Commit b44b72e

Browse files
topperctopperc
committed
[RISCV] Check line and column numbers for errors in XCVmem-invalid.s. NFC
I was trying a change that caused some of the error messages in this test to change. I was having trouble updating the test because FileCheck kept scanning ahead when I missed updating a line. Checking the line number should make it easier to update.
1 parent 0744d49 commit b44b72e

File tree

1 file changed

+74
-74
lines changed

1 file changed

+74
-74
lines changed

‎llvm/test/MC/RISCV/corev/XCVmem-invalid.s

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,223 +2,223 @@
22
# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
33

44
cv.lb t0, (0), 0
5-
# CHECK-ERROR: operands must be register and register
5+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
66

77
cv.lb 0, (t1), 0
8-
# CHECK-ERROR: invalid operand for instruction
8+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
99

1010
cv.lb 0, (0), t2
11-
# CHECK-ERROR: invalid operand for instruction
11+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
1212

1313
cv.lb t0, (t1), -2049
14-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
14+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
1515

1616
cv.lb t0, (t1), 2048
17-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
17+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
1818

1919
cv.lb t0, (0), t1
20-
# CHECK-ERROR: operands must be register and register
20+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
2121

2222
cv.lb 0, (t1), t1
23-
# CHECK-ERROR: invalid operand for instruction
23+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
2424

2525
cv.lb t0
26-
# CHECK-ERROR: too few operands for instruction
26+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
2727

2828
cv.lb t0, (t2)
29-
# CHECK-ERROR: too few operands for instruction
29+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
3030

3131
cv.lb t0, (t1), t2, t3
32-
# CHECK-ERROR: invalid operand for instruction
32+
# CHECK-ERROR: :[[@LINE-1]]:21: error: invalid operand for instruction
3333

3434
cv.lbu t0, (0), 0
35-
# CHECK-ERROR: operands must be register and register
35+
# CHECK-ERROR: :[[@LINE-1]]:12: error: operands must be register and register
3636

3737
cv.lbu 0, (t1), 0
38-
# CHECK-ERROR: invalid operand for instruction
38+
# CHECK-ERROR: :[[@LINE-1]]:8: error: invalid operand for instruction
3939

4040
cv.lbu 0, (0), t0
41-
# CHECK-ERROR: invalid operand for instruction
41+
# CHECK-ERROR: :[[@LINE-1]]:8: error: invalid operand for instruction
4242

4343
cv.lbu t0, (t1), -2049
44-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
44+
# CHECK-ERROR: :[[@LINE-1]]:18: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
4545

4646
cv.lbu t0, (t1), 2048
47-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
47+
# CHECK-ERROR: :[[@LINE-1]]:18: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
4848

4949
cv.lbu t0, (0), t1
50-
# CHECK-ERROR: operands must be register and register
50+
# CHECK-ERROR: :[[@LINE-1]]:12: error: operands must be register and register
5151

5252
cv.lbu 0, (t1), t1
53-
# CHECK-ERROR: invalid operand for instruction
53+
# CHECK-ERROR: :[[@LINE-1]]:8: error: invalid operand for instruction
5454

5555
cv.lbu t0
56-
# CHECK-ERROR: too few operands for instruction
56+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
5757

5858
cv.lbu t0, (t2)
59-
# CHECK-ERROR: too few operands for instruction
59+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
6060

6161
cv.lbu t0, (t1), t2, t3
62-
# CHECK-ERROR: invalid operand for instruction
62+
# CHECK-ERROR: :[[@LINE-1]]:22: error: invalid operand for instruction
6363

6464
cv.lh t0, (0), 0
65-
# CHECK-ERROR: operands must be register and register
65+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
6666

6767
cv.lh 0, (t1), 0
68-
# CHECK-ERROR: invalid operand for instruction
68+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
6969

7070
cv.lh 0, (0), t2
71-
# CHECK-ERROR: invalid operand for instruction
71+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
7272

7373
cv.lh t0, (t1), -2049
74-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
74+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
7575

7676
cv.lh t0, (t1), 2048
77-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
77+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
7878

7979
cv.lh t0, (0), t1
80-
# CHECK-ERROR: operands must be register and register
80+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
8181

8282
cv.lh t0, t1(0)
83-
# CHECK-ERROR: expected register
83+
# CHECK-ERROR: :[[@LINE-1]]:14: error: expected register
8484

8585
cv.lh 0, (t1), t1
86-
# CHECK-ERROR: invalid operand for instruction
86+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
8787

8888
cv.lh t0
89-
# CHECK-ERROR: too few operands for instruction
89+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
9090

9191
cv.lh t0, (t1)
92-
# CHECK-ERROR: too few operands for instruction
92+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
9393

9494
cv.lh t0, (t1), t2, t3
95-
# CHECK-ERROR: invalid operand for instruction
95+
# CHECK-ERROR: :[[@LINE-1]]:21: error: invalid operand for instruction
9696

9797
cv.lhu t0, (0), 0
98-
# CHECK-ERROR: operands must be register and register
98+
# CHECK-ERROR: :[[@LINE-1]]:12: error: operands must be register and register
9999

100100
cv.lhu 0, (t1), 0
101-
# CHECK-ERROR: invalid operand for instruction
101+
# CHECK-ERROR: :[[@LINE-1]]:8: error: invalid operand for instruction
102102

103103
cv.lhu 0, 0(t1)
104-
# CHECK-ERROR: invalid operand for instruction
104+
# CHECK-ERROR: :[[@LINE-1]]:8: error: invalid operand for instruction
105105

106106
cv.lhu t0, (t1), -2049
107-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
107+
# CHECK-ERROR: :[[@LINE-1]]:18: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
108108

109109
cv.lhu t0, (t1), 2048
110-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
110+
# CHECK-ERROR: :[[@LINE-1]]:18: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
111111

112112
cv.lhu t0, (0), t1
113-
# CHECK-ERROR: operands must be register and register
113+
# CHECK-ERROR: :[[@LINE-1]]:12: error: operands must be register and register
114114

115115
cv.lhu t0, t1(0)
116-
# CHECK-ERROR: expected register
116+
# CHECK-ERROR: :[[@LINE-1]]:15: error: expected register
117117

118118
cv.lhu 0, t0, t1
119-
# CHECK-ERROR: expected '(' or invalid operand
119+
# CHECK-ERROR: :[[@LINE-1]]:13: error: expected '(' or invalid operand
120120

121121
cv.lhu t0
122-
# CHECK-ERROR: too few operands for instruction
122+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
123123

124124
cv.lhu t0, (t1)
125-
# CHECK-ERROR: too few operands for instruction
125+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
126126

127127
cv.lhu t0, (t1), t2, t3
128-
# CHECK-ERROR: invalid operand for instruction
128+
# CHECK-ERROR: :[[@LINE-1]]:22: error: invalid operand for instruction
129129

130130
cv.lw t0, (0), 0
131-
# CHECK-ERROR: operands must be register and register
131+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
132132

133133
cv.lw 0, (t1), 0
134-
# CHECK-ERROR: invalid operand for instruction
134+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
135135

136136
cv.lw 0, (0), t2
137-
# CHECK-ERROR: invalid operand for instruction
137+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
138138

139139
cv.lw t0, (t1), -2049
140-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
140+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
141141

142142
cv.lw t0, (t1), 2048
143-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
143+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
144144

145145
cv.lw t0, (0), t1
146-
# CHECK-ERROR: operands must be register and register
146+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
147147

148148
cv.lw t0, t1(0)
149-
# CHECK-ERROR: expected register
149+
# CHECK-ERROR: :[[@LINE-1]]:14: error: expected register
150150

151151
cv.lw 0, (t0), t1
152-
# CHECK-ERROR: invalid operand for instruction
152+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
153153

154154
cv.lw t0
155-
# CHECK-ERROR: too few operands for instruction
155+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
156156

157157
cv.lw t0, (t1)
158-
# CHECK-ERROR: too few operands for instruction
158+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
159159

160160
cv.lw t0, (t1), t2, t3
161-
# CHECK-ERROR: invalid operand for instruction
161+
# CHECK-ERROR: :[[@LINE-1]]:21: error: invalid operand for instruction
162162

163163
cv.sb t0, (0), 0
164-
# CHECK-ERROR: operands must be register and register
164+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
165165

166166
cv.sb 0, (t0), 0
167-
# CHECK-ERROR: invalid operand for instruction
167+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
168168

169169
cv.sb t0, 0(t1)
170-
# CHECK-ERROR: operands must be register and register
170+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
171171

172172
cv.sb t0, (t1), 2048
173-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
173+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
174174

175175
cv.sb t0, (0), t1
176-
# CHECK-ERROR: operands must be register and register
176+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
177177

178178
cv.sb 0, (t1), t1
179-
# CHECK-ERROR: invalid operand for instruction
179+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
180180

181181
cv.sb t0
182-
# CHECK-ERROR: too few operands for instruction
182+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
183183

184184
cv.sh t0, (0), 0
185-
# CHECK-ERROR: operands must be register and register
185+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
186186

187187
cv.sh 0, (t1), 0
188-
# CHECK-ERROR: invalid operand for instruction
188+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
189189

190190
cv.sh t0, 0(t1)
191-
# CHECK-ERROR: operands must be register and register
191+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
192192

193193
cv.sh t0, (t1), 2048
194-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
194+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
195195

196196
cv.sh t0, (0), t1
197-
# CHECK-ERROR: operands must be register and register
197+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
198198

199199
cv.sh 0, (t1), t1
200-
# CHECK-ERROR: invalid operand for instruction
200+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
201201

202202
cv.sh t0
203-
# CHECK-ERROR: too few operands for instruction
203+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction
204204

205205
cv.sw t0, (0), 0
206-
# CHECK-ERROR: operands must be register and register
206+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
207207

208208
cv.sw 0, (t1), 0
209-
# CHECK-ERROR: invalid operand for instruction
209+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
210210

211211
cv.sw t0, 0(t1)
212-
# CHECK-ERROR: operands must be register and register
212+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
213213

214214
cv.sw t0, (t1), 2048
215-
# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
215+
# CHECK-ERROR: :[[@LINE-1]]:17: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo modifier or an integer in the range [-2048, 2047]
216216

217217
cv.sw t0, (0), t1
218-
# CHECK-ERROR: operands must be register and register
218+
# CHECK-ERROR: :[[@LINE-1]]:11: error: operands must be register and register
219219

220220
cv.sw 0, (t1), t1
221-
# CHECK-ERROR: invalid operand for instruction
221+
# CHECK-ERROR: :[[@LINE-1]]:7: error: invalid operand for instruction
222222

223223
cv.sw t0
224-
# CHECK-ERROR: too few operands for instruction
224+
# CHECK-ERROR: :[[@LINE-1]]:1: error: too few operands for instruction

0 commit comments

Comments
 (0)