[llvm] 840ecce - [Mips] Convert some tests to opaque pointers (NFC)
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Thu Jan 12 03:40:44 PST 2023
Author: Nikita Popov
Date: 2023-01-12T12:40:04+01:00
New Revision: 840ecce6be9344fd0815c8e38ade9557a3e88901
URL: https://github.com/llvm/llvm-project/commit/840ecce6be9344fd0815c8e38ade9557a3e88901
DIFF: https://github.com/llvm/llvm-project/commit/840ecce6be9344fd0815c8e38ade9557a3e88901.diff
LOG: [Mips] Convert some tests to opaque pointers (NFC)
Dropped bitcasts result in dropped COPYs in MIR.
Added:
Modified:
llvm/test/CodeGen/Mips/GlobalISel/irtranslator/global_address.ll
llvm/test/CodeGen/Mips/GlobalISel/irtranslator/var_arg.ll
Removed:
################################################################################
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/global_address.ll b/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/global_address.ll
index 48ce32791cbf..c48514e91f1c 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/global_address.ll
+++ b/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/global_address.ll
@@ -7,20 +7,19 @@ define i32 @main() {
; MIPS32-LABEL: name: main
; MIPS32: bb.1.entry:
; MIPS32-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @.str
- ; MIPS32-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY [[GV]](p0)
; MIPS32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1234567890
; MIPS32-NEXT: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
; MIPS32-NEXT: ADJCALLSTACKDOWN 16, 0, implicit-def $sp, implicit $sp
- ; MIPS32-NEXT: $a0 = COPY [[COPY]](p0)
+ ; MIPS32-NEXT: $a0 = COPY [[GV]](p0)
; MIPS32-NEXT: $a1 = COPY [[C]](s32)
; MIPS32-NEXT: JAL @printf, csr_o32, implicit-def $ra, implicit-def $sp, implicit $a0, implicit $a1, implicit-def $v0
- ; MIPS32-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $v0
+ ; MIPS32-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $v0
; MIPS32-NEXT: ADJCALLSTACKUP 16, 0, implicit-def $sp, implicit $sp
; MIPS32-NEXT: $v0 = COPY [[C1]](s32)
; MIPS32-NEXT: RetRA implicit $v0
entry:
- %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i32 signext 1234567890)
+ %call = call i32 (ptr, ...) @printf(ptr @.str, i32 signext 1234567890)
ret i32 0
}
-declare i32 @printf(i8*, ...)
+declare i32 @printf(ptr, ...)
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/var_arg.ll b/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/var_arg.ll
index a776e6ef3300..ed7de9fdbe97 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/var_arg.ll
+++ b/llvm/test/CodeGen/Mips/GlobalISel/irtranslator/var_arg.ll
@@ -2,11 +2,11 @@
; RUN: llc -O0 -mtriple=mipsel-linux-gnu -global-isel -stop-after=irtranslator -verify-machineinstrs %s -o - | FileCheck %s -check-prefixes=MIPS32
@.str = private unnamed_addr constant [11 x i8] c"string %s\0A\00", align 1
-declare void @llvm.va_start(i8*)
-declare void @llvm.va_copy(i8*, i8*)
-declare i32 @printf(i8*, ...)
+declare void @llvm.va_start(ptr)
+declare void @llvm.va_copy(ptr, ptr)
+declare i32 @printf(ptr, ...)
-define void @testVaCopyArg(i8* %fmt, ...) {
+define void @testVaCopyArg(ptr %fmt, ...) {
; MIPS32-LABEL: name: testVaCopyArg
; MIPS32: bb.1.entry:
; MIPS32-NEXT: liveins: $a0, $a1, $a2, $a3
@@ -22,46 +22,41 @@ define void @testVaCopyArg(i8* %fmt, ...) {
; MIPS32-NEXT: [[FRAME_INDEX2:%[0-9]+]]:_(p0) = G_FRAME_INDEX %fixed-stack.0
; MIPS32-NEXT: G_STORE [[COPY3]](s32), [[FRAME_INDEX2]](p0) :: (store (s32) into %fixed-stack.0)
; MIPS32-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @.str
- ; MIPS32-NEXT: [[COPY4:%[0-9]+]]:_(p0) = COPY [[GV]](p0)
; MIPS32-NEXT: [[FRAME_INDEX3:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.0.fmt.addr
; MIPS32-NEXT: [[FRAME_INDEX4:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.1.ap
; MIPS32-NEXT: [[FRAME_INDEX5:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.2.aq
; MIPS32-NEXT: [[FRAME_INDEX6:%[0-9]+]]:_(p0) = G_FRAME_INDEX %stack.3.s
; MIPS32-NEXT: G_STORE [[COPY]](p0), [[FRAME_INDEX3]](p0) :: (store (p0) into %ir.fmt.addr)
- ; MIPS32-NEXT: G_VASTART [[FRAME_INDEX4]](p0) :: (store (s32) into %ir.ap1, align 1)
+ ; MIPS32-NEXT: G_VASTART [[FRAME_INDEX4]](p0) :: (store (s32) into %ir.ap, align 1)
; MIPS32-NEXT: G_INTRINSIC_W_SIDE_EFFECTS intrinsic(@llvm.va_copy), [[FRAME_INDEX5]](p0), [[FRAME_INDEX4]](p0)
; MIPS32-NEXT: [[LOAD:%[0-9]+]]:_(p0) = G_LOAD [[FRAME_INDEX5]](p0) :: (dereferenceable load (p0) from %ir.aq)
; MIPS32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 4
; MIPS32-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = G_PTR_ADD [[LOAD]], [[C]](s32)
; MIPS32-NEXT: G_STORE [[PTR_ADD]](p0), [[FRAME_INDEX5]](p0) :: (store (p0) into %ir.aq)
- ; MIPS32-NEXT: [[LOAD1:%[0-9]+]]:_(p0) = G_LOAD [[LOAD]](p0) :: (load (p0) from %ir.2)
+ ; MIPS32-NEXT: [[LOAD1:%[0-9]+]]:_(p0) = G_LOAD [[LOAD]](p0) :: (load (p0) from %ir.argp.cur)
; MIPS32-NEXT: G_STORE [[LOAD1]](p0), [[FRAME_INDEX6]](p0) :: (store (p0) into %ir.s)
; MIPS32-NEXT: [[LOAD2:%[0-9]+]]:_(p0) = G_LOAD [[FRAME_INDEX6]](p0) :: (dereferenceable load (p0) from %ir.s)
; MIPS32-NEXT: ADJCALLSTACKDOWN 16, 0, implicit-def $sp, implicit $sp
- ; MIPS32-NEXT: $a0 = COPY [[COPY4]](p0)
+ ; MIPS32-NEXT: $a0 = COPY [[GV]](p0)
; MIPS32-NEXT: $a1 = COPY [[LOAD2]](p0)
; MIPS32-NEXT: JAL @printf, csr_o32, implicit-def $ra, implicit-def $sp, implicit $a0, implicit $a1, implicit-def $v0
- ; MIPS32-NEXT: [[COPY5:%[0-9]+]]:_(s32) = COPY $v0
+ ; MIPS32-NEXT: [[COPY4:%[0-9]+]]:_(s32) = COPY $v0
; MIPS32-NEXT: ADJCALLSTACKUP 16, 0, implicit-def $sp, implicit $sp
; MIPS32-NEXT: RetRA
entry:
- %fmt.addr = alloca i8*, align 4
- %ap = alloca i8*, align 4
- %aq = alloca i8*, align 4
- %s = alloca i8*, align 4
- store i8* %fmt, i8** %fmt.addr, align 4
- %ap1 = bitcast i8** %ap to i8*
- call void @llvm.va_start(i8* %ap1)
- %0 = bitcast i8** %aq to i8*
- %1 = bitcast i8** %ap to i8*
- call void @llvm.va_copy(i8* %0, i8* %1)
- %argp.cur = load i8*, i8** %aq, align 4
- %argp.next = getelementptr inbounds i8, i8* %argp.cur, i32 4
- store i8* %argp.next, i8** %aq, align 4
- %2 = bitcast i8* %argp.cur to i8**
- %3 = load i8*, i8** %2, align 4
- store i8* %3, i8** %s, align 4
- %4 = load i8*, i8** %s, align 4
- %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0), i8* %4)
+ %fmt.addr = alloca ptr, align 4
+ %ap = alloca ptr, align 4
+ %aq = alloca ptr, align 4
+ %s = alloca ptr, align 4
+ store ptr %fmt, ptr %fmt.addr, align 4
+ call void @llvm.va_start(ptr %ap)
+ call void @llvm.va_copy(ptr %aq, ptr %ap)
+ %argp.cur = load ptr, ptr %aq, align 4
+ %argp.next = getelementptr inbounds i8, ptr %argp.cur, i32 4
+ store ptr %argp.next, ptr %aq, align 4
+ %0 = load ptr, ptr %argp.cur, align 4
+ store ptr %0, ptr %s, align 4
+ %1 = load ptr, ptr %s, align 4
+ %call = call i32 (ptr, ...) @printf(ptr @.str, ptr %1)
ret void
}
More information about the llvm-commits
mailing list