Skip to content

Commit 10860a0

Browse files
kovdan01kovdan01
committed
Address review comments
1 parent 658e26d commit 10860a0

File tree

5 files changed

+82
-84
lines changed

5 files changed

+82
-84
lines changed

‎llvm/test/CodeGen/AArch64/basic-pic-auth.ll

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=0 -fast-isel=0 -verify-machineinstrs \
1+
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=0 -fast-isel=0 -verify-machineinstrs \
22
; RUN: -relocation-model=pic -mattr=+pauth %s -o - | FileCheck %s
3-
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=0 -fast-isel=1 -verify-machineinstrs \
3+
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=0 -fast-isel=1 -verify-machineinstrs \
44
; RUN: -relocation-model=pic -mattr=+pauth %s -o - | FileCheck %s
5-
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=1 -verify-machineinstrs \
5+
; RUN: llc -mtriple=aarch64-linux-gnu -global-isel=1 -global-isel-abort=1 -verify-machineinstrs \
66
; RUN: -relocation-model=pic -mattr=+pauth %s -o - | FileCheck %s
77

88
;; Note: for FastISel, we fall back to SelectionDAG
@@ -11,26 +11,24 @@
1111

1212
define i32 @get_globalvar() {
1313
; CHECK-LABEL: get_globalvar:
14+
; CHECK: adrp x[[GOT:[0-9]+]], :got_auth:var
15+
; CHECK-NEXT: add x[[GOT]], x[[GOT]], :got_auth_lo12:var
16+
; CHECK-NEXT: ldr x[[SYM:[0-9]+]], [x[[GOT]]]
17+
; CHECK-NEXT: autda x[[SYM]], x[[GOT]]
18+
; CHECK-NEXT: ldr w0, [x[[SYM]]]
1419

1520
%val = load i32, ptr @var
16-
17-
; CHECK: adrp x[[GOT:[0-9]+]], :got_auth:var
18-
; CHECK: add x[[GOT]], x[[GOT]], :got_auth_lo12:var
19-
; CHECK: ldr x[[SYM:[0-9]+]], [x[[GOT]]]
20-
; CHECK: autda x[[SYM]], x[[GOT]]
21-
; CHECK: ldr w0, [x[[SYM]]]
2221
ret i32 %val
2322
}
2423

2524
define ptr @get_globalvaraddr() {
2625
; CHECK-LABEL: get_globalvaraddr:
26+
; CHECK: adrp x[[GOT:[0-9]+]], :got_auth:var
27+
; CHECK-NEXT: add x[[GOT]], x[[GOT]], :got_auth_lo12:var
28+
; CHECK-NEXT: ldr x0, [x[[GOT]]]
29+
; CHECK-NEXT: autda x0, x[[GOT]]
2730

2831
%val = load i32, ptr @var
29-
30-
; CHECK: adrp x[[GOT:[0-9]+]], :got_auth:var
31-
; CHECK: add x[[GOT]], x[[GOT]], :got_auth_lo12:var
32-
; CHECK: ldr x0, [x[[GOT]]]
33-
; CHECK: autda x0, x[[GOT]]
3432
ret ptr @var
3533
}
3634

‎llvm/test/CodeGen/AArch64/elf-globals-pic-auth.ll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
; RUN: llc -mtriple=arm64 -global-isel=0 -fast-isel=0 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
2-
; RUN: llc -mtriple=arm64 -global-isel=0 -fast-isel=1 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
3-
; RUN: llc -mtriple=arm64 -global-isel=1 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
1+
; RUN: llc -mtriple=arm64 -global-isel=0 -fast-isel=0 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
2+
; RUN: llc -mtriple=arm64 -global-isel=0 -fast-isel=1 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
3+
; RUN: llc -mtriple=arm64 -global-isel=1 -global-isel-abort=1 -relocation-model=pic -o - %s -mcpu=cyclone -mattr=+pauth | FileCheck %s
44

55
;; Note: for FastISel, we fall back to SelectionDAG
66

@@ -11,11 +11,11 @@ define i8 @test_i8(i8 %new) {
1111
store i8 %new, ptr @var8
1212
ret i8 %val
1313

14-
; CHECK: adrp x[[HIREG:[0-9]+]], :got_auth:var8
15-
; CHECK: add x[[HIREG]], x[[HIREG]], :got_auth_lo12:var8
16-
; CHECK: ldr x[[VAR_ADDR:[0-9]+]], [x[[HIREG]]]
17-
; CHECK: autda x[[VAR_ADDR]], x[[HIREG]]
18-
; CHECK: ldrb {{w[0-9]+}}, [x[[VAR_ADDR]]]
14+
; CHECK: adrp x[[HIREG:[0-9]+]], :got_auth:var8
15+
; CHECK-NEXT: add x[[HIREG]], x[[HIREG]], :got_auth_lo12:var8
16+
; CHECK-NEXT: ldr x[[VAR_ADDR:[0-9]+]], [x[[HIREG]]]
17+
; CHECK-NEXT: autda x[[VAR_ADDR]], x[[HIREG]]
18+
; CHECK-NEXT: ldrb {{w[0-9]+}}, [x[[VAR_ADDR]]]
1919
}
2020

2121
!llvm.module.flags = !{!0, !1}

‎llvm/test/CodeGen/AArch64/extern-weak-auth.ll

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=0 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
2-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
3-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
1+
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=0 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
2+
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
3+
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=1 -global-isel-abort=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
44

55
;; Note: for FastISel, we fall back to SelectionDAG
66

@@ -12,22 +12,22 @@ define ptr @foo() {
1212
; otherwise a litpool entry.
1313
ret ptr @var
1414

15-
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:var
16-
; CHECK: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:var
17-
; CHECK: ldr x0, [x[[ADDRHI]]]
18-
; CHECK: autia x0, x[[ADDRHI]]
15+
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:var
16+
; CHECK-NEXT: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:var
17+
; CHECK-NEXT: ldr x0, [x[[ADDRHI]]]
18+
; CHECK-NEXT: autia x0, x[[ADDRHI]]
1919
}
2020

2121
@arr_var = extern_weak global [10 x i32]
2222

2323
define ptr @bar() {
2424
%addr = getelementptr [10 x i32], ptr @arr_var, i32 0, i32 5
2525

26-
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:arr_var
27-
; CHECK: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:arr_var
28-
; CHECK: ldr [[BASE:x[0-9]+]], [x[[ADDRHI]]]
29-
; CHECK: autda [[BASE]], x[[ADDRHI]]
30-
; CHECK: add x0, [[BASE]], #20
26+
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:arr_var
27+
; CHECK-NEXT: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:arr_var
28+
; CHECK-NEXT: ldr [[BASE:x[0-9]+]], [x[[ADDRHI]]]
29+
; CHECK-NEXT: autda [[BASE]], x[[ADDRHI]]
30+
; CHECK-NEXT: add x0, [[BASE]], #20
3131
ret ptr %addr
3232
}
3333

‎llvm/test/CodeGen/AArch64/got-abuse-auth.ll

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=0 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
2-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
3-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
4-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=0 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
5-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=0 -fast-isel=1 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
6-
; RUN: llc -mtriple=aarch64-none-linux-gnu -global-isel=1 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
1+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=0 -fast-isel=0 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
2+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=0 -fast-isel=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
3+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=1 -global-isel-abort=1 -relocation-model=pic -mattr=+pauth -o - %s | FileCheck %s
4+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=0 -fast-isel=0 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
5+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=0 -fast-isel=1 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
6+
; RUN: llc -mtriple=aarch64-none-linux-gnu -asm-verbose=false -global-isel=1 -global-isel-abort=1 -relocation-model=pic -filetype=obj -mattr=+pauth -o /dev/null %s
77

88
;; Note: for FastISel, we fall back to SelectionDAG
99

@@ -22,20 +22,20 @@ define void @foo() nounwind {
2222
; CHECK-LABEL: foo:
2323
entry:
2424
call void @consume(i32 ptrtoint (ptr @func to i32))
25-
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:func
26-
; CHECK: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:func
27-
; CHECK: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
28-
; CHECK: autia x[[SYM:[0-9]+]], x[[ADDRHI]]
25+
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:func
26+
; CHECK-NEXT: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:func
27+
; CHECK-NEXT: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
28+
; CHECK-NEXT: autia x[[SYM:[0-9]+]], x[[ADDRHI]]
2929
call void @consume(i32 ptrtoint (ptr @alias_func to i32))
30-
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:alias_func
31-
; CHECK: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:alias_func
32-
; CHECK: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
33-
; CHECK: autia x[[SYM:[0-9]+]], x[[ADDRHI]]
30+
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:alias_func
31+
; CHECK-NEXT: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:alias_func
32+
; CHECK-NEXT: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
33+
; CHECK-NEXT: autia x[[SYM:[0-9]+]], x[[ADDRHI]]
3434
call void @consume(i32 ptrtoint (ptr @alias_global to i32))
35-
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:alias_global
36-
; CHECK: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:alias_global
37-
; CHECK: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
38-
; CHECK: autda x[[SYM:[0-9]+]], x[[ADDRHI]]
35+
; CHECK: adrp x[[ADDRHI:[0-9]+]], :got_auth:alias_global
36+
; CHECK-NEXT: add x[[ADDRHI]], x[[ADDRHI]], :got_auth_lo12:alias_global
37+
; CHECK-NEXT: ldr x[[SYM:[0-9]+]], [x[[ADDRHI]]]
38+
; CHECK-NEXT: autda x[[SYM:[0-9]+]], x[[ADDRHI]]
3939
ret void
4040
}
4141

‎llvm/test/CodeGen/AArch64/tagged-globals-pic-auth.ll

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
; RUN: llc --relocation-model=pic -mattr=+pauth < %s | FileCheck %s
1+
; RUN: llc --relocation-model=pic -mattr=+pauth < %s | FileCheck %s --check-prefixes=CHECK,GISEL
22

3-
; RUN: llc -global-isel=0 -fast-isel=0 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,DAGISEL
4-
; RUN: llc -global-isel=0 -fast-isel=1 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,DAGISEL
5-
; RUN: llc -global-isel=1 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,GISEL
3+
; RUN: llc -global-isel=0 -fast-isel=0 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,DAGISEL
4+
; RUN: llc -global-isel=0 -fast-isel=1 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,DAGISEL
5+
; RUN: llc -global-isel=1 -global-isel-abort=1 -O0 --relocation-model=pic < %s -mattr=+pauth | FileCheck %s --check-prefixes=CHECK,GISEL
66

77
;; Note: for FastISel, we fall back to SelectionDAG
88

@@ -13,49 +13,49 @@ target triple = "aarch64-unknown-linux-android"
1313
declare void @func()
1414

1515
define ptr @global_addr() #0 {
16-
; CHECK: global_addr:
17-
; CHECK: adrp [[REG:x[0-9]+]], :got_auth:global
18-
; CHECK: add [[REG]], [[REG]], :got_auth_lo12:global
19-
; CHECK: ldr x0, [[[REG]]]
20-
; CHECK: autda x0, [[REG]]
21-
; CHECK: ret
16+
; CHECK-LABEL: global_addr:
17+
; CHECK: adrp [[REG:x[0-9]+]], :got_auth:global
18+
; CHECK-NEXT: add [[REG]], [[REG]], :got_auth_lo12:global
19+
; CHECK-NEXT: ldr x0, [[[REG]]]
20+
; CHECK-NEXT: autda x0, [[REG]]
21+
; CHECK-NEXT: ret
2222

2323
ret ptr @global
2424
}
2525

2626
define i32 @global_load() #0 {
27-
; CHECK: global_load:
28-
; CHECK: adrp [[REG0:x[0-9]+]], :got_auth:global
29-
; CHECK: add [[REG0]], [[REG0]], :got_auth_lo12:global
30-
; CHECK: ldr [[REG1:x[0-9]+]], [[[REG0]]]
31-
; CHECK: autda [[REG1]], [[REG0]]
32-
; CHECK: ldr w0, [[[REG1]]]
33-
; CHECK: ret
27+
; CHECK-LABEL: global_load:
28+
; CHECK: adrp [[REG0:x[0-9]+]], :got_auth:global
29+
; CHECK-NEXT: add [[REG0]], [[REG0]], :got_auth_lo12:global
30+
; CHECK-NEXT: ldr [[REG1:x[0-9]+]], [[[REG0]]]
31+
; CHECK-NEXT: autda [[REG1]], [[REG0]]
32+
; CHECK-NEXT: ldr w0, [[[REG1]]]
33+
; CHECK-NEXT: ret
3434
%load = load i32, ptr @global
3535
ret i32 %load
3636
}
3737

3838
define void @global_store() #0 {
39-
; CHECK: global_store:
40-
; CHECK: adrp [[REG0:x[0-9]+]], :got_auth:global
41-
; CHECK: add [[REG0]], [[REG0]], :got_auth_lo12:global
42-
; CHECK: ldr [[REG1:x[0-9]+]], [[[REG0]]]
43-
; CHECK: autda [[REG1]], [[REG0]]
44-
; GISEL: str wzr, [[[REG1]]]
45-
; DAGISEL: mov w8, wzr
46-
; DAGISEL: str w8, [[[REG1]]]
47-
; CHECK: ret
39+
; CHECK-LABEL: global_store:
40+
; CHECK: adrp [[REG0:x[0-9]+]], :got_auth:global
41+
; CHECK-NEXT: add [[REG0]], [[REG0]], :got_auth_lo12:global
42+
; CHECK-NEXT: ldr [[REG1:x[0-9]+]], [[[REG0]]]
43+
; CHECK-NEXT: autda [[REG1]], [[REG0]]
44+
; GISEL-NEXT: str wzr, [[[REG1]]]
45+
; DAGISEL-NEXT: mov w8, wzr
46+
; DAGISEL-NEXT: str w8, [[[REG1]]]
47+
; CHECK-NEXT: ret
4848
store i32 0, ptr @global
4949
ret void
5050
}
5151

5252
define ptr @func_addr() #0 {
53-
; CHECK: func_addr:
54-
; CHECK: adrp [[REG:x[0-9]+]], :got_auth:func
55-
; CHECK: add [[REG]], [[REG]], :got_auth_lo12:func
56-
; CHECK: ldr x0, [[[REG]]]
57-
; CHECK: autia x0, [[REG]]
58-
; CHECK: ret
53+
; CHECK-LABEL: func_addr:
54+
; CHECK: adrp [[REG:x[0-9]+]], :got_auth:func
55+
; CHECK-NEXT: add [[REG]], [[REG]], :got_auth_lo12:func
56+
; CHECK-NEXT: ldr x0, [[[REG]]]
57+
; CHECK-NEXT: autia x0, [[REG]]
58+
; CHECK-NEXT: ret
5959
ret ptr @func
6060
}
6161

0 commit comments

Comments
 (0)