Skip to content

Commit 49b61ea

Browse files
MaskRayMaskRay
committed
[XRay][test] Make tests less sensitive to .Ltmp/Ltmp label changes
1 parent 59723e4 commit 49b61ea

12 files changed

+141
-231
lines changed

‎llvm/test/CodeGen/AArch64/xray-attribute-instrumentation.ll

Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,13 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
55
; CHECK-LABEL: foo:
66
; CHECK-LABEL: Lxray_sled_0:
77
; CHECK-NEXT: b #32
8-
; CHECK-NEXT: nop
9-
; CHECK-NEXT: nop
10-
; CHECK-NEXT: nop
11-
; CHECK-NEXT: nop
12-
; CHECK-NEXT: nop
13-
; CHECK-NEXT: nop
14-
; CHECK-NEXT: nop
15-
; CHECK-LABEL: Ltmp0:
8+
; CHECK-COUNT-7: nop
9+
; CHECK-NEXT: Ltmp[[#]]:
1610
ret i32 0
1711
; CHECK-LABEL: Lxray_sled_1:
1812
; CHECK-NEXT: b #32
19-
; CHECK-NEXT: nop
20-
; CHECK-NEXT: nop
21-
; CHECK-NEXT: nop
22-
; CHECK-NEXT: nop
23-
; CHECK-NEXT: nop
24-
; CHECK-NEXT: nop
25-
; CHECK-NEXT: nop
26-
; CHECK-LABEL: Ltmp1:
13+
; CHECK-COUNT-7: nop
14+
; CHECK-NEXT: Ltmp[[#]]:
2715
; CHECK-NEXT: ret
2816
}
2917

@@ -43,25 +31,13 @@ define i32 @bar() nounwind noinline uwtable "function-instrument"="xray-never" "
4331
; CHECK-LABEL: bar:
4432
; CHECK-LABEL: Lxray_sled_2:
4533
; CHECK-NEXT: b #32
46-
; CHECK-NEXT: nop
47-
; CHECK-NEXT: nop
48-
; CHECK-NEXT: nop
49-
; CHECK-NEXT: nop
50-
; CHECK-NEXT: nop
51-
; CHECK-NEXT: nop
52-
; CHECK-NEXT: nop
53-
; CHECK-LABEL: Ltmp4:
34+
; CHECK-COUNT-7: nop
35+
; CHECK-NEXT: Ltmp[[#]]:
5436
ret i32 0
5537
; CHECK-LABEL: Lxray_sled_3:
5638
; CHECK-NEXT: b #32
57-
; CHECK-NEXT: nop
58-
; CHECK-NEXT: nop
59-
; CHECK-NEXT: nop
60-
; CHECK-NEXT: nop
61-
; CHECK-NEXT: nop
62-
; CHECK-NEXT: nop
63-
; CHECK-NEXT: nop
64-
; CHECK-LABEL: Ltmp5:
39+
; CHECK-COUNT-7: nop
40+
; CHECK-NEXT: Ltmp[[#]]:
6541
; CHECK-NEXT: ret
6642
}
6743

@@ -81,25 +57,13 @@ define i32 @instrumented() nounwind noinline uwtable "xray-instruction-threshold
8157
; CHECK-LABEL: instrumented:
8258
; CHECK-LABEL: Lxray_sled_4:
8359
; CHECK-NEXT: b #32
84-
; CHECK-NEXT: nop
85-
; CHECK-NEXT: nop
86-
; CHECK-NEXT: nop
87-
; CHECK-NEXT: nop
88-
; CHECK-NEXT: nop
89-
; CHECK-NEXT: nop
90-
; CHECK-NEXT: nop
91-
; CHECK-LABEL: Ltmp8:
60+
; CHECK-COUNT-7: nop
61+
; CHECK-NEXT: Ltmp[[#]]:
9262
ret i32 0
9363
; CHECK-LABEL: Lxray_sled_5:
9464
; CHECK-NEXT: b #32
95-
; CHECK-NEXT: nop
96-
; CHECK-NEXT: nop
97-
; CHECK-NEXT: nop
98-
; CHECK-NEXT: nop
99-
; CHECK-NEXT: nop
100-
; CHECK-NEXT: nop
101-
; CHECK-NEXT: nop
102-
; CHECK-LABEL: Ltmp9:
65+
; CHECK-COUNT-7: nop
66+
; CHECK-NEXT: Ltmp[[#]]:
10367
; CHECK-NEXT: ret
10468
}
10569

‎llvm/test/CodeGen/AArch64/xray-tail-call-sled.ll

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,35 @@ define i32 @callee() nounwind noinline uwtable "function-instrument"="xray-alway
55
; CHECK: .p2align 2
66
; CHECK-LABEL: Lxray_sled_0:
77
; CHECK-NEXT: b #32
8-
; CHECK-NEXT: nop
9-
; CHECK-NEXT: nop
10-
; CHECK-NEXT: nop
11-
; CHECK-NEXT: nop
12-
; CHECK-NEXT: nop
13-
; CHECK-NEXT: nop
14-
; CHECK-NEXT: nop
15-
; CHECK-LABEL: Ltmp0:
8+
; CHECK-COUNT-7: nop
9+
; CHECK-NEXT: Ltmp[[#]]:
1610
ret i32 0
1711
; CHECK-NEXT: mov w0, wzr
1812
; CHECK-NEXT: .p2align 2
1913
; CHECK-LABEL: Lxray_sled_1:
2014
; CHECK-NEXT: b #32
21-
; CHECK-NEXT: nop
22-
; CHECK-NEXT: nop
23-
; CHECK-NEXT: nop
24-
; CHECK-NEXT: nop
25-
; CHECK-NEXT: nop
26-
; CHECK-NEXT: nop
27-
; CHECK-NEXT: nop
28-
; CHECK-LABEL: Ltmp1:
15+
; CHECK-COUNT-7: nop
16+
; CHECK-NEXT: Ltmp[[#]]:
2917
; CHECK-NEXT: ret
3018
}
3119

3220
; CHECK-LINUX-LABEL: .section xray_instr_map,"ao",@progbits,callee{{$}}
3321
; CHECK-LINUX-LABEL: .Lxray_sleds_start0:
34-
; CHECK-LINUX-NEXT: .Ltmp2:
35-
; CHECK-LINUX: .xword .Lxray_sled_0-.Ltmp2
36-
; CHECK-LINUX: .Ltmp3:
37-
; CHECK-LINUX-NEXT: .xword .Lxray_sled_1-.Ltmp3
22+
; CHECK-LINUX-NEXT: [[TMP:.Ltmp[0-9]+]]:
23+
; CHECK-LINUX: .xword .Lxray_sled_0-[[TMP]]
24+
; CHECK-LINUX: [[TMP:.Ltmp[0-9]+]]:
25+
; CHECK-LINUX-NEXT: .xword .Lxray_sled_1-[[TMP]]
3826
; CHECK-LINUX-LABEL: Lxray_sleds_end0:
3927
; CHECK-LINUX-LABEL: .section xray_fn_idx,"awo",@progbits,callee{{$}}
4028
; CHECK-LINUX: .xword .Lxray_sleds_start0
4129
; CHECK-LINUX-NEXT: .xword .Lxray_sleds_end0
4230

4331
; CHECK-MACOS-LABEL: .section __DATA,xray_instr_map{{$}}
4432
; CHECK-MACOS-LABEL: Lxray_sleds_start0:
45-
; CHECK-MACOS-NEXT: Ltmp2:
46-
; CHECK-MACOS: .quad Lxray_sled_0-Ltmp2
47-
; CHECK-MACOS: Ltmp3:
48-
; CHECK-MACOS-NEXT: .quad Lxray_sled_1-Ltmp3
33+
; CHECK-MACOS-NEXT: [[TMP:Ltmp[0-9]+]]:
34+
; CHECK-MACOS: .quad Lxray_sled_0-[[TMP]]
35+
; CHECK-MACOS: [[TMP:Ltmp[0-9]+]]:
36+
; CHECK-MACOS-NEXT: .quad Lxray_sled_1-[[TMP]]
4937
; CHECK-MACOS-LABEL: Lxray_sleds_end0:
5038
; CHECK-MACOS-LABEL: .section __DATA,xray_fn_idx{{$}}
5139
; CHECK-MACOS: .quad Lxray_sleds_start0
@@ -55,25 +43,13 @@ define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-alway
5543
; CHECK: .p2align 2
5644
; CHECK-LABEL: Lxray_sled_2:
5745
; CHECK-NEXT: b #32
58-
; CHECK-NEXT: nop
59-
; CHECK-NEXT: nop
60-
; CHECK-NEXT: nop
61-
; CHECK-NEXT: nop
62-
; CHECK-NEXT: nop
63-
; CHECK-NEXT: nop
64-
; CHECK-NEXT: nop
65-
; CHECK-LABEL: Ltmp4:
46+
; CHECK-COUNT-7: nop
47+
; CHECK-NEXT: Ltmp[[#]]:
6648
; CHECK: .p2align 2
6749
; CHECK-LABEL: Lxray_sled_3:
6850
; CHECK-NEXT: b #32
69-
; CHECK-NEXT: nop
70-
; CHECK-NEXT: nop
71-
; CHECK-NEXT: nop
72-
; CHECK-NEXT: nop
73-
; CHECK-NEXT: nop
74-
; CHECK-NEXT: nop
75-
; CHECK-NEXT: nop
76-
; CHECK-LABEL: Ltmp5:
51+
; CHECK-COUNT-7: nop
52+
; CHECK-NEXT: Ltmp[[#]]:
7753
%retval = tail call i32 @callee()
7854
; CHECK-LINUX: b callee
7955
; CHECK-MACOS: b _callee

‎llvm/test/CodeGen/ARM/xray-armv6-attribute-instrumentation.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
1010
; CHECK-NEXT: mov r0, r0
1111
; CHECK-NEXT: mov r0, r0
1212
; CHECK-NEXT: mov r0, r0
13-
; CHECK-LABEL: Ltmp0:
13+
; CHECK-NEXT: Ltmp[[#]]:
1414
ret i32 0
1515
; CHECK-LABEL: Lxray_sled_1:
1616
; CHECK-NEXT: b #20
@@ -20,7 +20,7 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
2020
; CHECK-NEXT: mov r0, r0
2121
; CHECK-NEXT: mov r0, r0
2222
; CHECK-NEXT: mov r0, r0
23-
; CHECK-LABEL: Ltmp1:
23+
; CHECK-NEXT: Ltmp[[#]]:
2424
; CHECK-NEXT: bx lr
2525
}
2626

‎llvm/test/CodeGen/ARM/xray-armv7-attribute-instrumentation.ll

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,13 @@
44
define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" {
55
; CHECK-LABEL: Lxray_sled_0:
66
; CHECK-NEXT: b #20
7-
; CHECK-NEXT: nop
8-
; CHECK-NEXT: nop
9-
; CHECK-NEXT: nop
10-
; CHECK-NEXT: nop
11-
; CHECK-NEXT: nop
12-
; CHECK-NEXT: nop
13-
; CHECK-LABEL: Ltmp0:
7+
; CHECK-COUNT-6: nop
8+
; CHECK-NEXT: Ltmp[[#]]:
149
ret i32 0
1510
; CHECK-LABEL: Lxray_sled_1:
1611
; CHECK-NEXT: b #20
17-
; CHECK-NEXT: nop
18-
; CHECK-NEXT: nop
19-
; CHECK-NEXT: nop
20-
; CHECK-NEXT: nop
21-
; CHECK-NEXT: nop
22-
; CHECK-NEXT: nop
23-
; CHECK-LABEL: Ltmp1:
12+
; CHECK-COUNT-6: nop
13+
; CHECK-NEXT: Ltmp[[#]]:
2414
; CHECK-NEXT: bx lr
2515
}
2616

‎llvm/test/CodeGen/ARM/xray-tail-call-sled.ll

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,29 @@ define i32 @callee() nounwind noinline uwtable "function-instrument"="xray-alway
55
; CHECK: .p2align 2
66
; CHECK-LABEL: Lxray_sled_0:
77
; CHECK-NEXT: b #20
8-
; CHECK-NEXT: nop
9-
; CHECK-NEXT: nop
10-
; CHECK-NEXT: nop
11-
; CHECK-NEXT: nop
12-
; CHECK-NEXT: nop
13-
; CHECK-NEXT: nop
14-
; CHECK-LABEL: Ltmp0:
8+
; CHECK-COUNT-6: nop
9+
; CHECK-NEXT: Ltmp[[#]]:
1510
ret i32 0
1611
; CHECK-NEXT: mov r0, #0
1712
; CHECK-NEXT: .p2align 2
1813
; CHECK-LABEL: Lxray_sled_1:
1914
; CHECK-NEXT: b #20
20-
; CHECK-NEXT: nop
21-
; CHECK-NEXT: nop
22-
; CHECK-NEXT: nop
23-
; CHECK-NEXT: nop
24-
; CHECK-NEXT: nop
25-
; CHECK-NEXT: nop
26-
; CHECK-LABEL: Ltmp1:
15+
; CHECK-COUNT-6: nop
16+
; CHECK-NEXT: Ltmp[[#]]:
2717
; CHECK-NEXT: bx lr
2818
}
2919

3020
define i32 @caller() nounwind noinline uwtable "function-instrument"="xray-always" {
3121
; CHECK: .p2align 2
3222
; CHECK-LABEL: Lxray_sled_2:
3323
; CHECK-NEXT: b #20
34-
; CHECK-NEXT: nop
35-
; CHECK-NEXT: nop
36-
; CHECK-NEXT: nop
37-
; CHECK-NEXT: nop
38-
; CHECK-NEXT: nop
39-
; CHECK-NEXT: nop
40-
; CHECK-LABEL: Ltmp4:
24+
; CHECK-COUNT-6: nop
25+
; CHECK-NEXT: Ltmp[[#]]:
4126
; CHECK: .p2align 2
4227
; CHECK-LABEL: Lxray_sled_3:
4328
; CHECK-NEXT: b #20
44-
; CHECK-NEXT: nop
45-
; CHECK-NEXT: nop
46-
; CHECK-NEXT: nop
47-
; CHECK-NEXT: nop
48-
; CHECK-NEXT: nop
49-
; CHECK-NEXT: nop
50-
; CHECK-LABEL: Ltmp5:
29+
; CHECK-COUNT-6: nop
30+
; CHECK-NEXT: Ltmp[[#]]:
5131
%retval = tail call i32 @callee()
5232
; CHECK: b {{.*}}callee
5333
ret i32 %retval

‎llvm/test/CodeGen/Hexagon/xray.ll

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,29 @@
33

44
define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always" {
55
; CHECK-LABEL: .Lxray_sled_0:
6-
; CHECK: jump .Ltmp0
6+
; CHECK: jump .Ltmp[[#l:]]
77
; CHECK: nop
88
; CHECK: nop
99
; CHECK: nop
1010
; CHECK: nop
11-
; CHECK-LABEL: .Ltmp0:
11+
; CHECK: .Ltmp
12+
; CHECK-SAME: [[#l]]:
1213
ret i32 0
1314
; CHECK-LABEL: .Lxray_sled_1:
14-
; CHECK: jump .Ltmp1
15+
; CHECK: jump .Ltmp[[#l:]]
1516
; CHECK: nop
1617
; CHECK: nop
1718
; CHECK: nop
1819
; CHECK: nop
19-
; CHECK-LABEL: .Ltmp1:
20+
; CHECK: .Ltmp
21+
; CHECK-SAME: [[#l]]:
2022
; CHECK: jumpr r31
2123
}
2224
; CHECK: .section xray_instr_map,"ao",@progbits,foo
2325
; CHECK-NEXT: .Lxray_sleds_start0:
24-
; CHECK-NEXT: .Ltmp2:
25-
; CHECK-NEXT: .word .Lxray_sled_0-.Ltmp2
26-
; CHECK-NEXT: .word .Lfunc_begin0-(.Ltmp2+4)
26+
; CHECK-NEXT: [[TMP:.Ltmp[0-9]+]]:
27+
; CHECK-NEXT: .word .Lxray_sled_0-[[TMP]]
28+
; CHECK-NEXT: .word .Lfunc_begin0-([[TMP]]+4)
2729
; CHECK-NEXT: .byte 0x00
2830
; CHECK-NEXT: .byte 0x01
2931
; CHECK-NEXT: .byte 0x02

0 commit comments

Comments
 (0)