Skip to content

Commit 58d735c

Browse files
committed
Re-format test to limit changes required
Test cases re-formatted to provide assertions about behavior, while still permitting a simpler way to update test cases when layout changes intentionally.
1 parent ea13019 commit 58d735c

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

lld/test/ELF/hexagon-thunk-range-b22rel.s

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,50 +66,50 @@ target_beyond_range_min:
6666
jumpr r31
6767

6868
## Verify thunk generation for targets beyond B22_PCREL range
69-
# CHECK: 000200b4 <__hexagon_thunk_target_within_range_min_from_.text.thunk>:
69+
# CHECK: <__hexagon_thunk_target_within_range_min_from_.text.thunk>:
7070
# CHECK-NEXT: 200b4: { immext(#0x900000)
71-
# CHECK-NEXT: 200b8: jump 0x9200cc }
71+
# CHECK-NEXT: jump 0x9200cc }
7272

73-
# CHECK: 000200bc <__hexagon_thunk_target_beyond_range_min_from_.text.thunk>:
73+
# CHECK: <__hexagon_thunk_target_beyond_range_min_from_.text.thunk>:
7474
# CHECK-NEXT: 200bc: { immext(#0x1100000)
75-
# CHECK-NEXT: 200c0: jump 0x11200c8 }
75+
# CHECK-NEXT: jump 0x11200c8 }
7676

77-
# CHECK: 000200c4 <__hexagon_thunk_target_multiple_calls_from_.text.thunk>:
77+
# CHECK: <__hexagon_thunk_target_multiple_calls_from_.text.thunk>:
7878
# CHECK-NEXT: 200c4: { immext(#0x8fffc0)
79-
# CHECK-NEXT: 200c8: jump 0x9200c0 }
79+
# CHECK-NEXT: jump 0x9200c0 }
8080

8181
## Verify _start calls - some direct, some via thunks
82-
# CHECK: 000200cc <_start>:
82+
# CHECK: <_start>:
8383
# CHECK-NEXT: 200cc: { call 0x8200ac }
84-
# CHECK-NEXT: 200d0: { call 0x8200b8 }
85-
# CHECK-NEXT: 200d4: { call 0x200b4 }
86-
# CHECK-NEXT: 200d8: { call 0x200bc }
87-
# CHECK-NEXT: 200dc: { call 0x200c4 }
88-
# CHECK-NEXT: 200e0: { call 0x200c4 }
89-
# CHECK-NEXT: 200e4: { call 0x200ec }
90-
91-
# CHECK: 000200ec <target_close>:
84+
# CHECK-NEXT: { call 0x8200b8 }
85+
# CHECK-NEXT: { call 0x200b4 }
86+
# CHECK-NEXT: { call 0x200bc }
87+
# CHECK-NEXT: { call 0x200c4 }
88+
# CHECK-NEXT: { call 0x200c4 }
89+
# CHECK-NEXT: { call 0x200ec }
90+
91+
# CHECK: <target_close>:
9292
# CHECK-NEXT: 200ec: { jumpr r31 }
9393

9494
## Verify targets at maximum positive range (direct calls, no thunks needed)
95-
# CHECK: 008200ac <target_within_range_max>:
95+
# CHECK: <target_within_range_max>:
9696
# CHECK-NEXT: 8200ac: { jumpr r31 }
9797

98-
# CHECK: 008200b8 <target_beyond_range>:
98+
# CHECK: <target_beyond_range>:
9999
# CHECK-NEXT: 8200b8: { call 0x8200ac }
100-
# CHECK-NEXT: 8200bc: { jumpr r31 }
100+
# CHECK-NEXT: { jumpr r31 }
101101

102-
# CHECK: 009200c0 <target_multiple_calls>:
102+
# CHECK: <target_multiple_calls>:
103103
# CHECK-NEXT: 9200c0: { jumpr r31 }
104104

105105
## Verify targets in negative section and thunk for calling back to main section
106-
# CHECK: 009200c4 <__hexagon_thunk__from_.text.thunk>:
106+
# CHECK: <__hexagon_thunk__from_.text.thunk>:
107107
# CHECK-NEXT: 9200c4: { immext(#0xff700000)
108-
# CHECK-NEXT: 9200c8: jump 0x200cc }
108+
# CHECK-NEXT: jump 0x200cc }
109109

110-
# CHECK: 009200cc <target_within_range_min>:
110+
# CHECK: <target_within_range_min>:
111111
# CHECK-NEXT: 9200cc: { call 0x9200c4 }
112-
# CHECK-NEXT: 9200d0: { jumpr r31 }
112+
# CHECK-NEXT: { jumpr r31 }
113113

114-
# CHECK: 011200c8 <target_beyond_range_min>:
114+
# CHECK: <target_beyond_range_min>:
115115
# CHECK-NEXT: 11200c8: { jumpr r31 }

lld/test/ELF/hexagon-thunk-range-gdplt.s

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ tls_var_distant:
4747
.word 0x9abc
4848

4949
# CHECK: Disassembly of section .text:
50-
# CHECK: 000102d4 <_start>:
51-
# CHECK-NEXT: { immext(#0x420100)
50+
# CHECK: <_start>:
51+
# CHECK-NEXT: 102d4: { immext(#0x420100)
5252
# CHECK-NEXT: r2 = add(pc,##0x420130) }
5353
# CHECK-NEXT: { immext(#0xfffeffc0)
5454
# CHECK-NEXT: r0 = add(r2,##-0x10018) }
@@ -58,16 +58,16 @@ tls_var_distant:
5858
# CHECK-NEXT: { call 0x410360 }
5959
# CHECK-NEXT: { jumpr r31 }
6060

61-
# CHECK: 004102f8 <more_code>:
62-
# CHECK-NEXT: { immext(#0xfffeffc0)
61+
# CHECK: <more_code>:
62+
# CHECK-NEXT: 4102f8: { immext(#0xfffeffc0)
6363
# CHECK-NEXT: r0 = add(r2,##-0x10008) }
6464
# CHECK-NEXT: { call 0x410360 }
6565
# CHECK-NEXT: { jumpr r31 }
6666

6767
## Verify PLT entries are created for TLS
6868
# CHECK: Disassembly of section .plt:
69-
# CHECK: 00410310 <.plt>:
70-
# CHECK-NEXT: { immext(#0x200c0)
69+
# CHECK: <.plt>:
70+
# CHECK-NEXT: 410310: { immext(#0x200c0)
7171
# CHECK-NEXT: r28 = add(pc,##0x200f4) }
7272
# CHECK-NEXT: { r14 -= add(r28,#0x10)
7373
# CHECK-NEXT: r15 = memw(r28+#0x8)
@@ -76,20 +76,20 @@ tls_var_distant:
7676
# CHECK-NEXT: jumpr r28 }
7777
# CHECK-NEXT: { trap0(#0xdb) }
7878

79-
# CHECK: 00410340 <tls_var_far@plt>:
80-
# CHECK-NEXT: { immext(#0x200c0)
79+
# CHECK: <tls_var_far@plt>:
80+
# CHECK-NEXT: 410340: { immext(#0x200c0)
8181
# CHECK-NEXT: r14 = add(pc,##0x200d8) }
8282
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
8383
# CHECK-NEXT: { jumpr r28 }
8484

85-
# CHECK: 00410350 <tls_var_distant@plt>:
86-
# CHECK-NEXT: { immext(#0x200c0)
85+
# CHECK: <tls_var_distant@plt>:
86+
# CHECK-NEXT: 410350: { immext(#0x200c0)
8787
# CHECK-NEXT: r14 = add(pc,##0x200cc) }
8888
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
8989
# CHECK-NEXT: { jumpr r28 }
9090

91-
# CHECK: 00410360 <__tls_get_addr@plt>:
92-
# CHECK-NEXT: { immext(#0x200c0)
91+
# CHECK: <__tls_get_addr@plt>:
92+
# CHECK-NEXT: 410360: { immext(#0x200c0)
9393
# CHECK-NEXT: r14 = add(pc,##0x200c0) }
9494
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
9595
# CHECK-NEXT: { jumpr r28 }

lld/test/ELF/hexagon-thunk-range-plt.s

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ _start:
3838
.skip 0x200000
3939

4040
# CHECK: Disassembly of section .text:
41-
# CHECK: 0002021c <_start>:
42-
# CHECK-NEXT: { call 0x220250 }
41+
# CHECK: <_start>:
42+
# CHECK-NEXT: 2021c: { call 0x220250 }
4343
# CHECK-NEXT: { call 0x220260 }
4444
# CHECK-NEXT: { call 0x220270 }
4545
# CHECK-NEXT: { jumpr r31 }
4646

4747
## Verify PLT header and entries are created with exact addresses
4848
# CHECK: Disassembly of section .plt:
49-
# CHECK: 00220230 <.plt>:
50-
# CHECK-NEXT: { immext(#0x20080)
49+
# CHECK: <.plt>:
50+
# CHECK-NEXT: 220230: { immext(#0x20080)
5151
# CHECK-NEXT: r28 = add(pc,##0x200b8) }
5252
# CHECK-NEXT: { r14 -= add(r28,#0x10)
5353
# CHECK-NEXT: r15 = memw(r28+#0x8)
@@ -56,20 +56,20 @@ _start:
5656
# CHECK-NEXT: jumpr r28 }
5757
# CHECK-NEXT: { trap0(#0xdb) }
5858

59-
# CHECK: 00220250 <extern_within_range@plt>:
60-
# CHECK-NEXT: { immext(#0x20080)
59+
# CHECK: <extern_within_range@plt>:
60+
# CHECK-NEXT: 220250: { immext(#0x20080)
6161
# CHECK-NEXT: r14 = add(pc,##0x200a8) }
6262
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
6363
# CHECK-NEXT: { jumpr r28 }
6464

65-
# CHECK: 00220260 <extern_beyond_range@plt>:
66-
# CHECK-NEXT: { immext(#0x20080)
65+
# CHECK: <extern_beyond_range@plt>:
66+
# CHECK-NEXT: 220260: { immext(#0x20080)
6767
# CHECK-NEXT: r14 = add(pc,##0x2009c) }
6868
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
6969
# CHECK-NEXT: { jumpr r28 }
7070

71-
# CHECK: 00220270 <extern_close@plt>:
72-
# CHECK-NEXT: { immext(#0x20080)
71+
# CHECK: <extern_close@plt>:
72+
# CHECK-NEXT: 220270: { immext(#0x20080)
7373
# CHECK-NEXT: r14 = add(pc,##0x20090) }
7474
# CHECK-NEXT: { r28 = memw(r14+#0x0) }
7575
# CHECK-NEXT: { jumpr r28 }

0 commit comments

Comments
 (0)