Skip to content

Commit 97418bb

Browse files
RKSimonRKSimon
committed
[X86] patchable functions - cleanup check prefixes identified in #92248
Avoid using numbers as check prefix - replace with actual triple config names
1 parent d06270e commit 97418bb

File tree

3 files changed

+120
-120
lines changed

3 files changed

+120
-120
lines changed

‎llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
; RUN: llc -mtriple=i686 %s -o - | FileCheck --check-prefixes=CHECK,32 %s
2-
; RUN: llc -mtriple=x86_64 %s -o - | FileCheck --check-prefixes=CHECK,64 %s
1+
; RUN: llc -mtriple=i686 %s -o - | FileCheck --check-prefixes=CHECK,X86 %s
2+
; RUN: llc -mtriple=x86_64 %s -o - | FileCheck --check-prefixes=CHECK,X64 %s
33

44
;; -fpatchable-function-entry=0 -fcf-protection=branch
55
define void @f0() "patchable-function-entry"="0" {
66
; CHECK-LABEL: f0:
77
; CHECK-NEXT: .Lfunc_begin0:
88
; CHECK-NEXT: .cfi_startproc
99
; CHECK-NEXT: # %bb.0:
10-
; 32-NEXT: endbr32
11-
; 64-NEXT: endbr64
10+
; X86-NEXT: endbr32
11+
; X64-NEXT: endbr64
1212
; CHECK-NEXT: ret
1313
; CHECK-NOT: .section __patchable_function_entries
1414
ret void
@@ -22,16 +22,16 @@ define void @f1() "patchable-function-entry"="1" {
2222
; CHECK-NEXT: .Lfunc_begin1:
2323
; CHECK-NEXT: .cfi_startproc
2424
; CHECK-NEXT: # %bb.0:
25-
; 32-NEXT: endbr32
26-
; 64-NEXT: endbr64
25+
; X86-NEXT: endbr32
26+
; X64-NEXT: endbr64
2727
; CHECK-NEXT: .Lpatch0:
2828
; CHECK-NEXT: nop
2929
; CHECK-NEXT: ret
3030
; CHECK: .section __patchable_function_entries,"awo",@progbits,f1{{$}}
31-
; 32-NEXT: .p2align 2
32-
; 32-NEXT: .long .Lpatch0
33-
; 64-NEXT: .p2align 3
34-
; 64-NEXT: .quad .Lpatch0
31+
; X86-NEXT: .p2align 2
32+
; X86-NEXT: .long .Lpatch0
33+
; X64-NEXT: .p2align 3
34+
; X64-NEXT: .quad .Lpatch0
3535
ret void
3636
}
3737

@@ -44,17 +44,17 @@ define void @f2_1() "patchable-function-entry"="1" "patchable-function-prefix"="
4444
; CHECK-NEXT: .Lfunc_begin2:
4545
; CHECK-NEXT: .cfi_startproc
4646
; CHECK-NEXT: # %bb.0:
47-
; 32-NEXT: endbr32
48-
; 64-NEXT: endbr64
47+
; X86-NEXT: endbr32
48+
; X64-NEXT: endbr64
4949
; CHECK-NEXT: nop
5050
; CHECK-NEXT: ret
5151
; CHECK: .Lfunc_end2:
5252
; CHECK-NEXT: .size f2_1, .Lfunc_end2-f2_1
5353
; CHECK: .section __patchable_function_entries,"awo",@progbits,f2_1{{$}}
54-
; 32-NEXT: .p2align 2
55-
; 32-NEXT: .long .Ltmp0
56-
; 64-NEXT: .p2align 3
57-
; 64-NEXT: .quad .Ltmp0
54+
; X86-NEXT: .p2align 2
55+
; X86-NEXT: .long .Ltmp0
56+
; X64-NEXT: .p2align 3
57+
; X64-NEXT: .quad .Ltmp0
5858
ret void
5959
}
6060

@@ -74,10 +74,10 @@ define internal void @f1i() "patchable-function-entry"="1" {
7474
;; Another basic block has ENDBR, but it doesn't affect our decision to not create .Lpatch0
7575
; CHECK: endbr
7676
; CHECK: .section __patchable_function_entries,"awo",@progbits,f1i{{$}}
77-
; 32-NEXT: .p2align 2
78-
; 32-NEXT: .long .Lfunc_begin3
79-
; 64-NEXT: .p2align 3
80-
; 64-NEXT: .quad .Lfunc_begin3
77+
; X86-NEXT: .p2align 2
78+
; X86-NEXT: .long .Lfunc_begin3
79+
; X64-NEXT: .p2align 3
80+
; X64-NEXT: .quad .Lfunc_begin3
8181
entry:
8282
tail call i32 @llvm.eh.sjlj.setjmp(ptr @buf)
8383
ret void
@@ -93,8 +93,8 @@ entry:
9393
; CHECK-NEXT: .Lfunc_begin{{.*}}:
9494
; CHECK-NEXT: .cfi_startproc
9595
; CHECK-NEXT: # %bb.0:
96-
; 32-NEXT: endbr32
97-
; 64-NEXT: endbr64
96+
; X86-NEXT: endbr32
97+
; X64-NEXT: endbr64
9898
; CHECK-NEXT: nop
9999
; CHECK-NEXT: ret
100100
define void @sanitize_function(ptr noundef %x) "patchable-function-prefix"="1" "patchable-function-entry"="1" !func_sanitize !1 {

‎llvm/test/CodeGen/X86/patchable-function-entry.ll

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
; RUN: llc -mtriple=i386 %s -o - | FileCheck --check-prefixes=CHECK,32 %s
2-
; RUN: llc -mtriple=x86_64 %s -o - | FileCheck --check-prefixes=CHECK,64 %s
3-
; RUN: llc -mtriple=x86_64 -function-sections %s -o - | FileCheck --check-prefixes=CHECK,64 %s
1+
; RUN: llc -mtriple=i386 %s -o - | FileCheck --check-prefixes=CHECK,X86 %s
2+
; RUN: llc -mtriple=x86_64 %s -o - | FileCheck --check-prefixes=CHECK,X64 %s
3+
; RUN: llc -mtriple=x86_64 -function-sections %s -o - | FileCheck --check-prefixes=CHECK,X64 %s
44

55
define void @f0() "patchable-function-entry"="0" {
66
; CHECK-LABEL: f0:
@@ -17,10 +17,10 @@ define void @f1() "patchable-function-entry"="1" {
1717
; CHECK: nop
1818
; CHECK-NEXT: ret
1919
; CHECK: .section __patchable_function_entries,"awo",@progbits,f1{{$}}
20-
; 32: .p2align 2
21-
; 32-NEXT: .long .Lfunc_begin1
22-
; 64: .p2align 3
23-
; 64-NEXT: .quad .Lfunc_begin1
20+
; X86: .p2align 2
21+
; X86-NEXT: .long .Lfunc_begin1
22+
; X64: .p2align 3
23+
; X64-NEXT: .quad .Lfunc_begin1
2424
ret void
2525
}
2626

@@ -31,46 +31,46 @@ define void @f1() "patchable-function-entry"="1" {
3131
define void @f2() "patchable-function-entry"="2" {
3232
; CHECK-LABEL: f2:
3333
; CHECK-NEXT: .Lfunc_begin2:
34-
; 32: xchgw %ax, %ax
35-
; 64: xchgw %ax, %ax
34+
; X86: xchgw %ax, %ax
35+
; X64: xchgw %ax, %ax
3636
; CHECK-NEXT: ret
3737
; CHECK: .section __patchable_function_entries,"awo",@progbits,f2{{$}}
38-
; 32: .p2align 2
39-
; 32-NEXT: .long .Lfunc_begin2
40-
; 64: .p2align 3
41-
; 64-NEXT: .quad .Lfunc_begin2
38+
; X86: .p2align 2
39+
; X86-NEXT: .long .Lfunc_begin2
40+
; X64: .p2align 3
41+
; X64-NEXT: .quad .Lfunc_begin2
4242
ret void
4343
}
4444

4545
$f3 = comdat any
4646
define void @f3() "patchable-function-entry"="3" comdat {
4747
; CHECK-LABEL: f3:
4848
; CHECK-NEXT: .Lfunc_begin3:
49-
; 32: xchgw %ax, %ax
50-
; 32-NEXT: nop
51-
; 64: nopl (%rax)
49+
; X86: xchgw %ax, %ax
50+
; X86-NEXT: nop
51+
; X64: nopl (%rax)
5252
; CHECK: ret
5353
; CHECK: .section __patchable_function_entries,"awoG",@progbits,f3,f3,comdat{{$}}
54-
; 32: .p2align 2
55-
; 32-NEXT: .long .Lfunc_begin3
56-
; 64: .p2align 3
57-
; 64-NEXT: .quad .Lfunc_begin3
54+
; X86: .p2align 2
55+
; X86-NEXT: .long .Lfunc_begin3
56+
; X64: .p2align 3
57+
; X64-NEXT: .quad .Lfunc_begin3
5858
ret void
5959
}
6060

6161
$f5 = comdat any
6262
define void @f5() "patchable-function-entry"="5" comdat {
6363
; CHECK-LABEL: f5:
6464
; CHECK-NEXT: .Lfunc_begin4:
65-
; 32-COUNT-2: xchgw %ax, %ax
66-
; 32-NEXT: nop
67-
; 64: nopl 8(%rax,%rax)
65+
; X86-COUNT-2: xchgw %ax, %ax
66+
; X86-NEXT: nop
67+
; X64: nopl 8(%rax,%rax)
6868
; CHECK-NEXT: ret
6969
; CHECK: .section __patchable_function_entries,"awoG",@progbits,f5,f5,comdat{{$}}
70-
; 32: .p2align 2
71-
; 32-NEXT: .long .Lfunc_begin4
72-
; 64: .p2align 3
73-
; 64-NEXT: .quad .Lfunc_begin4
70+
; X86: .p2align 2
71+
; X86-NEXT: .long .Lfunc_begin4
72+
; X64: .p2align 3
73+
; X64-NEXT: .quad .Lfunc_begin4
7474
ret void
7575
}
7676

@@ -91,10 +91,10 @@ define void @f3_2() "patchable-function-entry"="1" "patchable-function-prefix"="
9191
; CHECK: .Lfunc_end5:
9292
; CHECK-NEXT: .size f3_2, .Lfunc_end5-f3_2
9393
; CHECK: .section __patchable_function_entries,"awo",@progbits,f3_2{{$}}
94-
; 32: .p2align 2
95-
; 32-NEXT: .long .Ltmp0
96-
; 64: .p2align 3
97-
; 64-NEXT: .quad .Ltmp0
94+
; X86: .p2align 2
95+
; X86-NEXT: .long .Ltmp0
96+
; X64: .p2align 3
97+
; X64-NEXT: .quad .Ltmp0
9898
%frame = alloca i8, i32 16
9999
ret void
100100
}

0 commit comments

Comments
 (0)