Skip to content

Commit fd302e2

Browse files
edwin-wangedwin-wang
committed
[NFC] [XCOFF] Update PowerPC readobj test case with expression
This patch is to replace the fixed value with expression. Keep .file section as fixed values as it might be changed. The remaining sections will hardly be modified. So the Index values are sequential. By using expression, we can avoid the fixed value changes in coming patches. This is a follow-up of patch D97117. Reviewed By: hubert.reinterpretcast, shchenz Differential Revision: https://reviews.llvm.org/D98620
1 parent 5bd6b0a commit fd302e2

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
; OBJ: Sections [
164164
; OBJ: Section {
165-
; OBJ-NEXT: Index: 1
165+
; OBJ-NEXT: Index: [[#OBJ_INDX:]]
166166
; OBJ-NEXT: Name: .text
167167
; OBJ-NEXT: PhysicalAddress: 0x0
168168
; OBJ-NEXT: VirtualAddress: 0x0
@@ -176,7 +176,7 @@
176176
; OBJ-NEXT: }
177177

178178
; OBJ: Section {
179-
; OBJ-NEXT: Index: 2
179+
; OBJ-NEXT: Index: [[#OBJ_INDX+1]]
180180
; OBJ-NEXT: Name: .data
181181
; OBJ-NEXT: PhysicalAddress: 0x0
182182
; OBJ-NEXT: VirtualAddress: 0x0
@@ -190,7 +190,7 @@
190190
; OBJ-NEXT: }
191191

192192
; OBJ: Section {
193-
; OBJ-NEXT: Index: 3
193+
; OBJ-NEXT: Index: [[#OBJ_INDX+2]]
194194
; OBJ-NEXT: Name: .bss
195195
; OBJ-NEXT: PhysicalAddress: 0x80
196196
; OBJ-NEXT: VirtualAddress: 0x80

‎llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@ declare i32 @bar(i32)
158158
; SYM-NEXT: NumberOfAuxEntries: 0
159159
; SYM-NEXT: }
160160
; SYM-NEXT: Symbol {
161-
; SYM-NEXT: Index: 1
161+
; SYM-NEXT: Index: [[#INDX:]]
162162
; SYM-NEXT: Name: .bar
163163
; SYM-NEXT: Value (RelocatableAddress): 0x0
164164
; SYM-NEXT: Section: N_UNDEF
165165
; SYM-NEXT: Type: 0x0
166166
; SYM-NEXT: StorageClass: C_EXT (0x2)
167167
; SYM-NEXT: NumberOfAuxEntries: 1
168168
; SYM-NEXT: CSECT Auxiliary Entry {
169-
; SYM-NEXT: Index: 2
169+
; SYM-NEXT: Index: [[#INDX+1]]
170170
; SYM-NEXT: SectionLen: 0
171171
; SYM-NEXT: ParameterHashIndex: 0x0
172172
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -178,15 +178,15 @@ declare i32 @bar(i32)
178178
; SYM-NEXT: }
179179
; SYM-NEXT: }
180180
; SYM-NEXT: Symbol {
181-
; SYM-NEXT: Index: 3
181+
; SYM-NEXT: Index: [[#INDX+2]]
182182
; SYM-NEXT: Name: bar
183183
; SYM-NEXT: Value (RelocatableAddress): 0x0
184184
; SYM-NEXT: Section: N_UNDEF
185185
; SYM-NEXT: Type: 0x0
186186
; SYM-NEXT: StorageClass: C_EXT (0x2)
187187
; SYM-NEXT: NumberOfAuxEntries: 1
188188
; SYM-NEXT: CSECT Auxiliary Entry {
189-
; SYM-NEXT: Index: 4
189+
; SYM-NEXT: Index: [[#INDX+3]]
190190
; SYM-NEXT: SectionLen: 0
191191
; SYM-NEXT: ParameterHashIndex: 0x0
192192
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -198,15 +198,15 @@ declare i32 @bar(i32)
198198
; SYM-NEXT: }
199199
; SYM-NEXT: }
200200
; SYM-NEXT: Symbol {
201-
; SYM-NEXT: Index: 5
201+
; SYM-NEXT: Index: [[#INDX+4]]
202202
; SYM-NEXT: Name: .text
203203
; SYM-NEXT: Value (RelocatableAddress): 0x0
204204
; SYM-NEXT: Section: .text
205205
; SYM-NEXT: Type: 0x0
206206
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
207207
; SYM-NEXT: NumberOfAuxEntries: 1
208208
; SYM-NEXT: CSECT Auxiliary Entry {
209-
; SYM-NEXT: Index: 6
209+
; SYM-NEXT: Index: [[#INDX+5]]
210210
; SYM-NEXT: SectionLen: 64
211211
; SYM-NEXT: ParameterHashIndex: 0x0
212212
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -218,16 +218,16 @@ declare i32 @bar(i32)
218218
; SYM-NEXT: }
219219
; SYM-NEXT: }
220220
; SYM-NEXT: Symbol {
221-
; SYM-NEXT: Index: 7
221+
; SYM-NEXT: Index: [[#INDX+6]]
222222
; SYM-NEXT: Name: .foo
223223
; SYM-NEXT: Value (RelocatableAddress): 0x0
224224
; SYM-NEXT: Section: .text
225225
; SYM-NEXT: Type: 0x0
226226
; SYM-NEXT: StorageClass: C_EXT (0x2)
227227
; SYM-NEXT: NumberOfAuxEntries: 1
228228
; SYM-NEXT: CSECT Auxiliary Entry {
229-
; SYM-NEXT: Index: 8
230-
; SYM-NEXT: ContainingCsectSymbolIndex: 5
229+
; SYM-NEXT: Index: [[#INDX+7]]
230+
; SYM-NEXT: ContainingCsectSymbolIndex: [[#INDX+4]]
231231
; SYM-NEXT: ParameterHashIndex: 0x0
232232
; SYM-NEXT: TypeChkSectNum: 0x0
233233
; SYM-NEXT: SymbolAlignmentLog2: 0
@@ -238,15 +238,15 @@ declare i32 @bar(i32)
238238
; SYM-NEXT: }
239239
; SYM-NEXT: }
240240
; SYM-NEXT: Symbol {
241-
; SYM-NEXT: Index: 9
241+
; SYM-NEXT: Index: [[#INDX+8]]
242242
; SYM-NEXT: Name: .data
243243
; SYM-NEXT: Value (RelocatableAddress): 0x40
244244
; SYM-NEXT: Section: .data
245245
; SYM-NEXT: Type: 0x0
246246
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
247247
; SYM-NEXT: NumberOfAuxEntries: 1
248248
; SYM-NEXT: CSECT Auxiliary Entry {
249-
; SYM-NEXT: Index: 10
249+
; SYM-NEXT: Index: [[#INDX+9]]
250250
; SYM-NEXT: SectionLen: 52
251251
; SYM-NEXT: ParameterHashIndex: 0x0
252252
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -258,16 +258,16 @@ declare i32 @bar(i32)
258258
; SYM-NEXT: }
259259
; SYM-NEXT: }
260260
; SYM-NEXT: Symbol {
261-
; SYM-NEXT: Index: 11
261+
; SYM-NEXT: Index: [[#INDX+10]]
262262
; SYM-NEXT: Name: globalA
263263
; SYM-NEXT: Value (RelocatableAddress): 0x40
264264
; SYM-NEXT: Section: .data
265265
; SYM-NEXT: Type: 0x0
266266
; SYM-NEXT: StorageClass: C_EXT (0x2)
267267
; SYM-NEXT: NumberOfAuxEntries: 1
268268
; SYM-NEXT: CSECT Auxiliary Entry {
269-
; SYM-NEXT: Index: 12
270-
; SYM-NEXT: ContainingCsectSymbolIndex: 9
269+
; SYM-NEXT: Index: [[#INDX+11]]
270+
; SYM-NEXT: ContainingCsectSymbolIndex: [[#INDX+8]]
271271
; SYM-NEXT: ParameterHashIndex: 0x0
272272
; SYM-NEXT: TypeChkSectNum: 0x0
273273
; SYM-NEXT: SymbolAlignmentLog2: 0
@@ -278,16 +278,16 @@ declare i32 @bar(i32)
278278
; SYM-NEXT: }
279279
; SYM-NEXT: }
280280
; SYM-NEXT: Symbol {
281-
; SYM-NEXT: Index: 13
281+
; SYM-NEXT: Index: [[#INDX+12]]
282282
; SYM-NEXT: Name: globalB
283283
; SYM-NEXT: Value (RelocatableAddress): 0x44
284284
; SYM-NEXT: Section: .data
285285
; SYM-NEXT: Type: 0x0
286286
; SYM-NEXT: StorageClass: C_EXT (0x2)
287287
; SYM-NEXT: NumberOfAuxEntries: 1
288288
; SYM-NEXT: CSECT Auxiliary Entry {
289-
; SYM-NEXT: Index: 14
290-
; SYM-NEXT: ContainingCsectSymbolIndex: 9
289+
; SYM-NEXT: Index: [[#INDX+13]]
290+
; SYM-NEXT: ContainingCsectSymbolIndex: [[#INDX+8]]
291291
; SYM-NEXT: ParameterHashIndex: 0x0
292292
; SYM-NEXT: TypeChkSectNum: 0x0
293293
; SYM-NEXT: SymbolAlignmentLog2: 0
@@ -298,16 +298,16 @@ declare i32 @bar(i32)
298298
; SYM-NEXT: }
299299
; SYM-NEXT: }
300300
; SYM-NEXT: Symbol {
301-
; SYM-NEXT: Index: 15
301+
; SYM-NEXT: Index: [[#INDX+14]]
302302
; SYM-NEXT: Name: arr
303303
; SYM-NEXT: Value (RelocatableAddress): 0x48
304304
; SYM-NEXT: Section: .data
305305
; SYM-NEXT: Type: 0x0
306306
; SYM-NEXT: StorageClass: C_EXT (0x2)
307307
; SYM-NEXT: NumberOfAuxEntries: 1
308308
; SYM-NEXT: CSECT Auxiliary Entry {
309-
; SYM-NEXT: Index: 16
310-
; SYM-NEXT: ContainingCsectSymbolIndex: 9
309+
; SYM-NEXT: Index: [[#INDX+15]]
310+
; SYM-NEXT: ContainingCsectSymbolIndex: [[#INDX+8]]
311311
; SYM-NEXT: ParameterHashIndex: 0x0
312312
; SYM-NEXT: TypeChkSectNum: 0x0
313313
; SYM-NEXT: SymbolAlignmentLog2: 0
@@ -318,16 +318,16 @@ declare i32 @bar(i32)
318318
; SYM-NEXT: }
319319
; SYM-NEXT: }
320320
; SYM-NEXT: Symbol {
321-
; SYM-NEXT: Index: 17
321+
; SYM-NEXT: Index: [[#INDX+16]]
322322
; SYM-NEXT: Name: p
323323
; SYM-NEXT: Value (RelocatableAddress): 0x70
324324
; SYM-NEXT: Section: .data
325325
; SYM-NEXT: Type: 0x0
326326
; SYM-NEXT: StorageClass: C_EXT (0x2)
327327
; SYM-NEXT: NumberOfAuxEntries: 1
328328
; SYM-NEXT: CSECT Auxiliary Entry {
329-
; SYM-NEXT: Index: 18
330-
; SYM-NEXT: ContainingCsectSymbolIndex: 9
329+
; SYM-NEXT: Index: [[#INDX+17]]
330+
; SYM-NEXT: ContainingCsectSymbolIndex: [[#INDX+8]]
331331
; SYM-NEXT: ParameterHashIndex: 0x0
332332
; SYM-NEXT: TypeChkSectNum: 0x0
333333
; SYM-NEXT: SymbolAlignmentLog2: 0
@@ -338,15 +338,15 @@ declare i32 @bar(i32)
338338
; SYM-NEXT: }
339339
; SYM-NEXT: }
340340
; SYM-NEXT: Symbol {
341-
; SYM-NEXT: Index: 19
341+
; SYM-NEXT: Index: [[#INDX+18]]
342342
; SYM-NEXT: Name: foo
343343
; SYM-NEXT: Value (RelocatableAddress): 0x74
344344
; SYM-NEXT: Section: .data
345345
; SYM-NEXT: Type: 0x0
346346
; SYM-NEXT: StorageClass: C_EXT (0x2)
347347
; SYM-NEXT: NumberOfAuxEntries: 1
348348
; SYM-NEXT: CSECT Auxiliary Entry {
349-
; SYM-NEXT: Index: 20
349+
; SYM-NEXT: Index: [[#INDX+19]]
350350
; SYM-NEXT: SectionLen: 12
351351
; SYM-NEXT: ParameterHashIndex: 0x0
352352
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -358,15 +358,15 @@ declare i32 @bar(i32)
358358
; SYM-NEXT: }
359359
; SYM-NEXT: }
360360
; SYM-NEXT: Symbol {
361-
; SYM-NEXT: Index: 21
361+
; SYM-NEXT: Index: [[#INDX+20]]
362362
; SYM-NEXT: Name: TOC
363363
; SYM-NEXT: Value (RelocatableAddress): 0x80
364364
; SYM-NEXT: Section: .data
365365
; SYM-NEXT: Type: 0x0
366366
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
367367
; SYM-NEXT: NumberOfAuxEntries: 1
368368
; SYM-NEXT: CSECT Auxiliary Entry {
369-
; SYM-NEXT: Index: 22
369+
; SYM-NEXT: Index: [[#INDX+21]]
370370
; SYM-NEXT: SectionLen: 0
371371
; SYM-NEXT: ParameterHashIndex: 0x0
372372
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -378,15 +378,15 @@ declare i32 @bar(i32)
378378
; SYM-NEXT: }
379379
; SYM-NEXT: }
380380
; SYM-NEXT: Symbol {
381-
; SYM-NEXT: Index: 23
381+
; SYM-NEXT: Index: [[#INDX+22]]
382382
; SYM-NEXT: Name: globalA
383383
; SYM-NEXT: Value (RelocatableAddress): 0x80
384384
; SYM-NEXT: Section: .data
385385
; SYM-NEXT: Type: 0x0
386386
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
387387
; SYM-NEXT: NumberOfAuxEntries: 1
388388
; SYM-NEXT: CSECT Auxiliary Entry {
389-
; SYM-NEXT: Index: 24
389+
; SYM-NEXT: Index: [[#INDX+23]]
390390
; SYM-NEXT: SectionLen: 4
391391
; SYM-NEXT: ParameterHashIndex: 0x0
392392
; SYM-NEXT: TypeChkSectNum: 0x0
@@ -398,15 +398,15 @@ declare i32 @bar(i32)
398398
; SYM-NEXT: }
399399
; SYM-NEXT: }
400400
; SYM-NEXT: Symbol {
401-
; SYM-NEXT: Index: 25
401+
; SYM-NEXT: Index: [[#INDX+24]]
402402
; SYM-NEXT: Name: globalB
403403
; SYM-NEXT: Value (RelocatableAddress): 0x84
404404
; SYM-NEXT: Section: .data
405405
; SYM-NEXT: Type: 0x0
406406
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
407407
; SYM-NEXT: NumberOfAuxEntries: 1
408408
; SYM-NEXT: CSECT Auxiliary Entry {
409-
; SYM-NEXT: Index: 26
409+
; SYM-NEXT: Index: [[#INDX+25]]
410410
; SYM-NEXT: SectionLen: 4
411411
; SYM-NEXT: ParameterHashIndex: 0x0
412412
; SYM-NEXT: TypeChkSectNum: 0x0

‎llvm/test/CodeGen/PowerPC/aix-xcoff-rodata.ll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
; SYMS-NEXT: NumberOfAuxEntries: 1
139139
; SYMS-NEXT: CSECT Auxiliary Entry {
140140
; SYMS-NEXT: Index: [[#INDX+3]]
141-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
141+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
142142
; SYMS-NEXT: ParameterHashIndex: 0x0
143143
; SYMS-NEXT: TypeChkSectNum: 0x0
144144
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -159,7 +159,7 @@
159159
; SYMS-NEXT: NumberOfAuxEntries: 1
160160
; SYMS-NEXT: CSECT Auxiliary Entry {
161161
; SYMS-NEXT: Index: [[#INDX+5]]
162-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
162+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
163163
; SYMS-NEXT: ParameterHashIndex: 0x0
164164
; SYMS-NEXT: TypeChkSectNum: 0x0
165165
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -180,7 +180,7 @@
180180
; SYMS-NEXT: NumberOfAuxEntries: 1
181181
; SYMS-NEXT: CSECT Auxiliary Entry {
182182
; SYMS-NEXT: Index: [[#INDX+7]]
183-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
183+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
184184
; SYMS-NEXT: ParameterHashIndex: 0x0
185185
; SYMS-NEXT: TypeChkSectNum: 0x0
186186
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -201,7 +201,7 @@
201201
; SYMS-NEXT: NumberOfAuxEntries: 1
202202
; SYMS-NEXT: CSECT Auxiliary Entry {
203203
; SYMS-NEXT: Index: [[#INDX+9]]
204-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
204+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
205205
; SYMS-NEXT: ParameterHashIndex: 0x0
206206
; SYMS-NEXT: TypeChkSectNum: 0x0
207207
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -222,7 +222,7 @@
222222
; SYMS-NEXT: NumberOfAuxEntries: 1
223223
; SYMS-NEXT: CSECT Auxiliary Entry {
224224
; SYMS-NEXT: Index: [[#INDX+11]]
225-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
225+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
226226
; SYMS-NEXT: ParameterHashIndex: 0x0
227227
; SYMS-NEXT: TypeChkSectNum: 0x0
228228
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -243,7 +243,7 @@
243243
; SYMS-NEXT: NumberOfAuxEntries: 1
244244
; SYMS-NEXT: CSECT Auxiliary Entry {
245245
; SYMS-NEXT: Index: [[#INDX+13]]
246-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
246+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
247247
; SYMS-NEXT: ParameterHashIndex: 0x0
248248
; SYMS-NEXT: TypeChkSectNum: 0x0
249249
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -264,7 +264,7 @@
264264
; SYMS-NEXT: NumberOfAuxEntries: 1
265265
; SYMS-NEXT: CSECT Auxiliary Entry {
266266
; SYMS-NEXT: Index: [[#INDX+15]]
267-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
267+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
268268
; SYMS-NEXT: ParameterHashIndex: 0x0
269269
; SYMS-NEXT: TypeChkSectNum: 0x0
270270
; SYMS-NEXT: SymbolAlignmentLog2: 0
@@ -285,7 +285,7 @@
285285
; SYMS-NEXT: NumberOfAuxEntries: 1
286286
; SYMS-NEXT: CSECT Auxiliary Entry {
287287
; SYMS-NEXT: Index: [[#INDX+17]]
288-
; SYMS-NEXT: ContainingCsectSymbolIndex: 3
288+
; SYMS-NEXT: ContainingCsectSymbolIndex: [[#INDX]]
289289
; SYMS-NEXT: ParameterHashIndex: 0x0
290290
; SYMS-NEXT: TypeChkSectNum: 0x0
291291
; SYMS-NEXT: SymbolAlignmentLog2: 0

0 commit comments

Comments
 (0)