From: Arthur Eubanks Date: Sat, 17 Oct 2020 00:21:12 +0000 (-0700) Subject: [AlwaysInliner] Pass callee AAResults to InlineFunction() X-Git-Tag: llvmorg-13-init~8068 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=504fbec7a61cdfbb5f6e1b25cf14afe5195ccaf6;p=platform%2Fupstream%2Fllvm.git [AlwaysInliner] Pass callee AAResults to InlineFunction() Test copied from noalias-calls.ll with small changes. Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D89609 --- diff --git a/llvm/lib/Transforms/IPO/AlwaysInliner.cpp b/llvm/lib/Transforms/IPO/AlwaysInliner.cpp index f3b23ea..2d68de7 100644 --- a/llvm/lib/Transforms/IPO/AlwaysInliner.cpp +++ b/llvm/lib/Transforms/IPO/AlwaysInliner.cpp @@ -13,6 +13,7 @@ #include "llvm/Transforms/IPO/AlwaysInliner.h" #include "llvm/ADT/SetVector.h" +#include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/AssumptionCache.h" #include "llvm/Analysis/InlineCost.h" #include "llvm/Analysis/ProfileSummaryInfo.h" @@ -73,8 +74,8 @@ PreservedAnalyses AlwaysInlinerPass::run(Module &M, &FAM.getResult(*(CB->getCaller())), &FAM.getResult(F)); - InlineResult Res = - InlineFunction(*CB, IFI, /*CalleeAAR=*/nullptr, InsertLifetime); + InlineResult Res = InlineFunction( + *CB, IFI, &FAM.getResult(F), InsertLifetime); assert(Res.isSuccess() && "unexpected failure to inline"); (void)Res; Changed = true; diff --git a/llvm/test/Transforms/Inline/noalias-calls-always.ll b/llvm/test/Transforms/Inline/noalias-calls-always.ll new file mode 100644 index 0000000..d632c28 --- /dev/null +++ b/llvm/test/Transforms/Inline/noalias-calls-always.ll @@ -0,0 +1,79 @@ +; RUN: opt -aa-pipeline=basic-aa -passes=always-inline -enable-noalias-to-md-conversion -S < %s | FileCheck %s +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i1) #0 +declare void @hey() #0 + +define void @hello(i8* noalias nocapture %a, i8* noalias nocapture readonly %c, i8* nocapture %b) #1 { +entry: + %l = alloca i8, i32 512, align 1 + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %b, i64 16, i1 0) + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %b, i8* align 16 %c, i64 16, i1 0) + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %c, i64 16, i1 0) + call void @hey() + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %l, i8* align 16 %c, i64 16, i1 0) + ret void +} + +define void @foo(i8* nocapture %a, i8* nocapture readonly %c, i8* nocapture %b) #2 { +entry: + tail call void @hello(i8* %a, i8* %c, i8* %b) + ret void +} + +define void @hello_cs(i8* nocapture %a, i8* nocapture readonly %c, i8* nocapture %b) #1 { +entry: + %l = alloca i8, i32 512, align 1 + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %b, i64 16, i1 0) + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %b, i8* align 16 %c, i64 16, i1 0) + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %c, i64 16, i1 0) + call void @hey() + call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %l, i8* align 16 %c, i64 16, i1 0) + ret void +} + +define void @foo_cs(i8* nocapture %a, i8* nocapture readonly %c, i8* nocapture %b) #2 { +entry: + tail call void @hello_cs(i8* noalias %a, i8* noalias %c, i8* %b) + ret void +} + +; CHECK: define void @foo(i8* nocapture %a, i8* nocapture readonly %c, i8* nocapture %b) +; CHECK: entry: +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %b, i64 16, i1 false) #3, !noalias !0 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %b, i8* align 16 %c, i64 16, i1 false) #3, !noalias !3 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %c, i64 16, i1 false) #3, !alias.scope !5 +; CHECK: call void @hey() #3, !noalias !5 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %{{.*}}, i8* align 16 %c, i64 16, i1 false) #3, !noalias !3 +; CHECK: ret void +; CHECK: } + +; CHECK: define void @foo_cs(i8* nocapture %a, i8* nocapture readonly %c, i8* nocapture %b) +; CHECK: entry: +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %b, i64 16, i1 false) #3, !noalias !6 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %b, i8* align 16 %c, i64 16, i1 false) #3, !noalias !9 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %a, i8* align 16 %c, i64 16, i1 false) #3, !alias.scope !11 +; CHECK: call void @hey() #3, !noalias !11 +; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 16 %{{.*}}, i8* align 16 %c, i64 16, i1 false) #3, !noalias !9 +; CHECK: ret void +; CHECK: } + +attributes #0 = { nounwind argmemonly willreturn } +attributes #1 = { nounwind alwaysinline } +attributes #2 = { nounwind uwtable } + +; CHECK: !0 = !{!1} +; CHECK: !1 = distinct !{!1, !2, !"hello: %c"} +; CHECK: !2 = distinct !{!2, !"hello"} +; CHECK: !3 = !{!4} +; CHECK: !4 = distinct !{!4, !2, !"hello: %a"} +; CHECK: !5 = !{!4, !1} + +; CHECK: !6 = !{!7} +; CHECK: !7 = distinct !{!7, !8, !"hello_cs: %c"} +; CHECK: !8 = distinct !{!8, !"hello_cs"} +; CHECK: !9 = !{!10} +; CHECK: !10 = distinct !{!10, !8, !"hello_cs: %a"} +; CHECK: !11 = !{!10, !7} +