[llvm] 507b0f6 - [AArch64] Clean up ptrauth-call test a bit. NFC.

Ahmed Bougacha via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 3 19:41:32 PDT 2024


Author: Ahmed Bougacha
Date: 2024-07-03T19:40:14-07:00
New Revision: 507b0f6714ec94e286d8c1ef16f871e1b1564426

URL: https://github.com/llvm/llvm-project/commit/507b0f6714ec94e286d8c1ef16f871e1b1564426
DIFF: https://github.com/llvm/llvm-project/commit/507b0f6714ec94e286d8c1ef16f871e1b1564426.diff

LOG: [AArch64] Clean up ptrauth-call test a bit. NFC.

The test was recently committed, but was written so long ago that it
still had typed pointers.  Switch them to opaque ptrs.  While there,
tidy up some formatting, and turn a couple CHECKs into CHECK-NEXT.

Added: 
    

Modified: 
    llvm/test/CodeGen/AArch64/ptrauth-call.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/AArch64/ptrauth-call.ll b/llvm/test/CodeGen/AArch64/ptrauth-call.ll
index b1249891b04b4..72e158fdf9916 100644
--- a/llvm/test/CodeGen/AArch64/ptrauth-call.ll
+++ b/llvm/test/CodeGen/AArch64/ptrauth-call.ll
@@ -6,14 +6,14 @@
 
 ; RUN: llc -mtriple arm64e-apple-darwin   -o - %s -asm-verbose=0 \
 ; RUN:   -global-isel -global-isel-abort=1 -verify-machineinstrs \
-; RUN:  | FileCheck %s --check-prefixes=CHECK,DARWIN
+; RUN:   | FileCheck %s --check-prefixes=CHECK,DARWIN
 
 ; RUN: llc -mtriple aarch64 -mattr=+pauth -o - %s -asm-verbose=0 \
 ; RUN:   -global-isel -global-isel-abort=1 -verify-machineinstrs \
-; RUN:  | FileCheck %s --check-prefixes=CHECK,ELF
+; RUN:   | FileCheck %s --check-prefixes=CHECK,ELF
 
 
-define i32 @test_call_ia_0(i32 ()* %arg0) #0 {
+define i32 @test_call_ia_0(ptr %arg0) #0 {
 ; DARWIN-LABEL: test_call_ia_0:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    blraaz x0
@@ -29,7 +29,7 @@ define i32 @test_call_ia_0(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_call_ib_0(i32 ()* %arg0) #0 {
+define i32 @test_call_ib_0(ptr %arg0) #0 {
 ; DARWIN-LABEL: test_call_ib_0:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    blrabz x0
@@ -45,21 +45,21 @@ define i32 @test_call_ib_0(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ia_0(i32 ()* %arg0) #0 {
+define i32 @test_tailcall_ia_0(ptr %arg0) #0 {
 ; CHECK-LABEL: test_tailcall_ia_0:
-; CHECK:    braaz x0
+; CHECK-NEXT:    braaz x0
   %tmp0 = tail call i32 %arg0() [ "ptrauth"(i32 0, i64 0) ]
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ib_0(i32 ()* %arg0) #0 {
+define i32 @test_tailcall_ib_0(ptr %arg0) #0 {
 ; CHECK-LABEL: test_tailcall_ib_0:
-; CHECK:    brabz x0
+; CHECK-NEXT:   brabz x0
   %tmp0 = tail call i32 %arg0() [ "ptrauth"(i32 1, i64 0) ]
   ret i32 %tmp0
 }
 
-define i32 @test_call_ia_imm(i32 ()* %arg0) #0 {
+define i32 @test_call_ia_imm(ptr %arg0) #0 {
 ; DARWIN-LABEL: test_call_ia_imm:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    mov x17, #42
@@ -77,7 +77,7 @@ define i32 @test_call_ia_imm(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_call_ib_imm(i32 ()* %arg0) #0 {
+define i32 @test_call_ib_imm(ptr %arg0) #0 {
 ; DARWIN-LABEL: test_call_ib_imm:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    mov x17, #42
@@ -95,7 +95,7 @@ define i32 @test_call_ib_imm(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ia_imm(i32 ()* %arg0) #0 {
+define i32 @test_tailcall_ia_imm(ptr %arg0) #0 {
 ; CHECK-LABEL: test_tailcall_ia_imm:
 ; CHECK-NEXT:    mov x16, #42
 ; CHECK-NEXT:    braa x0, x16
@@ -103,7 +103,7 @@ define i32 @test_tailcall_ia_imm(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ib_imm(i32 ()* %arg0) #0 {
+define i32 @test_tailcall_ib_imm(ptr %arg0) #0 {
 ; CHECK-LABEL: test_tailcall_ib_imm:
 ; CHECK-NEXT:    mov x16, #42
 ; CHECK-NEXT:    brab x0, x16
@@ -111,7 +111,7 @@ define i32 @test_tailcall_ib_imm(i32 ()* %arg0) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_call_ia_var(i32 ()* %arg0, i64* %arg1) #0 {
+define i32 @test_call_ia_var(ptr %arg0, ptr %arg1) #0 {
 ; DARWIN-LABEL: test_call_ia_var:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    ldr x8, [x1]
@@ -125,12 +125,12 @@ define i32 @test_call_ia_var(i32 ()* %arg0, i64* %arg1) #0 {
 ; ELF-NEXT:    blraa x0, x8
 ; ELF-NEXT:    ldr x30, [sp], #16
 ; ELF-NEXT:    ret
-  %tmp0 = load i64, i64* %arg1
+  %tmp0 = load i64, ptr %arg1
   %tmp1 = call i32 %arg0() [ "ptrauth"(i32 0, i64 %tmp0) ]
   ret i32 %tmp1
 }
 
-define i32 @test_call_ib_var(i32 ()* %arg0, i64* %arg1) #0 {
+define i32 @test_call_ib_var(ptr %arg0, ptr %arg1) #0 {
 ; DARWIN-LABEL: test_call_ib_var:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    ldr x8, [x1]
@@ -144,30 +144,30 @@ define i32 @test_call_ib_var(i32 ()* %arg0, i64* %arg1) #0 {
 ; ELF-NEXT:    blrab x0, x8
 ; ELF-NEXT:    ldr x30, [sp], #16
 ; ELF-NEXT:    ret
-  %tmp0 = load i64, i64* %arg1
+  %tmp0 = load i64, ptr %arg1
   %tmp1 = call i32 %arg0() [ "ptrauth"(i32 1, i64 %tmp0) ]
   ret i32 %tmp1
 }
 
-define i32 @test_tailcall_ia_var(i32 ()* %arg0, i64* %arg1) #0 {
+define i32 @test_tailcall_ia_var(ptr %arg0, ptr %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ia_var:
 ; CHECK:    ldr x1, [x1]
 ; CHECK:    braa x0, x1
-  %tmp0 = load i64, i64* %arg1
+  %tmp0 = load i64, ptr %arg1
   %tmp1 = tail call i32 %arg0() [ "ptrauth"(i32 0, i64 %tmp0) ]
   ret i32 %tmp1
 }
 
-define i32 @test_tailcall_ib_var(i32 ()* %arg0, i64* %arg1) #0 {
+define i32 @test_tailcall_ib_var(ptr %arg0, ptr %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ib_var:
 ; CHECK:    ldr x1, [x1]
 ; CHECK:    brab x0, x1
-  %tmp0 = load i64, i64* %arg1
+  %tmp0 = load i64, ptr %arg1
   %tmp1 = tail call i32 %arg0() [ "ptrauth"(i32 1, i64 %tmp0) ]
   ret i32 %tmp1
 }
 
-define i32 @test_call_ia_arg(i32 ()* %arg0, i64 %arg1) #0 {
+define i32 @test_call_ia_arg(ptr %arg0, i64 %arg1) #0 {
 ; DARWIN-LABEL: test_call_ia_arg:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    blraa x0, x1
@@ -183,7 +183,7 @@ define i32 @test_call_ia_arg(i32 ()* %arg0, i64 %arg1) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_call_ib_arg(i32 ()* %arg0, i64 %arg1) #0 {
+define i32 @test_call_ib_arg(ptr %arg0, i64 %arg1) #0 {
 ; DARWIN-LABEL: test_call_ib_arg:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    blrab x0, x1
@@ -199,21 +199,21 @@ define i32 @test_call_ib_arg(i32 ()* %arg0, i64 %arg1) #0 {
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ia_arg(i32 ()* %arg0, i64 %arg1) #0 {
+define i32 @test_tailcall_ia_arg(ptr %arg0, i64 %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ia_arg:
 ; CHECK:    braa x0, x1
   %tmp0 = tail call i32 %arg0() [ "ptrauth"(i32 0, i64 %arg1) ]
   ret i32 %tmp0
 }
 
-define i32 @test_tailcall_ib_arg(i32 ()* %arg0, i64 %arg1) #0 {
+define i32 @test_tailcall_ib_arg(ptr %arg0, i64 %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ib_arg:
 ; CHECK:    brab x0, x1
   %tmp0 = tail call i32 %arg0() [ "ptrauth"(i32 1, i64 %arg1) ]
   ret i32 %tmp0
 }
 
-define i32 @test_call_ia_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
+define i32 @test_call_ia_arg_ind(ptr %arg0, i64 %arg1) #0 {
 ; DARWIN-LABEL: test_call_ia_arg_ind:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    ldr x8, [x0]
@@ -227,12 +227,12 @@ define i32 @test_call_ia_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
 ; ELF-NEXT:    blraa x8, x1
 ; ELF-NEXT:    ldr x30, [sp], #16
 ; ELF-NEXT:    ret
-  %tmp0 = load i32 ()*, i32 ()** %arg0
+  %tmp0 = load ptr, ptr %arg0
   %tmp1 = call i32 %tmp0() [ "ptrauth"(i32 0, i64 %arg1) ]
   ret i32 %tmp1
 }
 
-define i32 @test_call_ib_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
+define i32 @test_call_ib_arg_ind(ptr %arg0, i64 %arg1) #0 {
 ; DARWIN-LABEL: test_call_ib_arg_ind:
 ; DARWIN-NEXT:    stp x29, x30, [sp, #-16]!
 ; DARWIN-NEXT:    ldr x8, [x0]
@@ -246,25 +246,25 @@ define i32 @test_call_ib_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
 ; ELF-NEXT:    blrab x8, x1
 ; ELF-NEXT:    ldr x30, [sp], #16
 ; ELF-NEXT:    ret
-  %tmp0 = load i32 ()*, i32 ()** %arg0
+  %tmp0 = load ptr, ptr %arg0
   %tmp1 = call i32 %tmp0() [ "ptrauth"(i32 1, i64 %arg1) ]
   ret i32 %tmp1
 }
 
-define i32 @test_tailcall_ia_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
+define i32 @test_tailcall_ia_arg_ind(ptr %arg0, i64 %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ia_arg_ind:
 ; CHECK:    ldr x0, [x0]
 ; CHECK:    braa x0, x1
-  %tmp0 = load i32 ()*, i32 ()** %arg0
+  %tmp0 = load ptr, ptr %arg0
   %tmp1 = tail call i32 %tmp0() [ "ptrauth"(i32 0, i64 %arg1) ]
   ret i32 %tmp1
 }
 
-define i32 @test_tailcall_ib_arg_ind(i32 ()** %arg0, i64 %arg1) #0 {
+define i32 @test_tailcall_ib_arg_ind(ptr %arg0, i64 %arg1) #0 {
 ; CHECK-LABEL: test_tailcall_ib_arg_ind:
 ; CHECK:    ldr x0, [x0]
 ; CHECK:    brab x0, x1
-  %tmp0 = load i32 ()*, i32 ()** %arg0
+  %tmp0 = load ptr, ptr %arg0
   %tmp1 = tail call i32 %tmp0() [ "ptrauth"(i32 1, i64 %arg1) ]
   ret i32 %tmp1
 }


        


More information about the llvm-commits mailing list