[PATCH] D88324: [AlwaysInliner] Update BFI when inlining
Arthur Eubanks via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 25 11:04:01 PDT 2020
aeubanks created this revision.
aeubanks added a reviewer: davidxl.
Herald added subscribers: llvm-commits, wenlei, hiraditya, eraman.
Herald added a project: LLVM.
aeubanks requested review of this revision.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D88324
Files:
llvm/lib/Transforms/IPO/AlwaysInliner.cpp
llvm/test/Transforms/Inline/prof-update-sample.ll
Index: llvm/test/Transforms/Inline/prof-update-sample.ll
===================================================================
--- llvm/test/Transforms/Inline/prof-update-sample.ll
+++ llvm/test/Transforms/Inline/prof-update-sample.ll
@@ -1,12 +1,13 @@
; RUN: opt < %s -inline -S | FileCheck %s
+; RUN: opt < %s -passes=always-inline -S | FileCheck %s
; Checks if inliner updates branch_weights annotation for call instructions.
declare void @ext();
declare void @ext1();
@func = global void ()* null
-; CHECK: define void @callee(i32 %n) !prof ![[ENTRY_COUNT:[0-9]*]]
-define void @callee(i32 %n) !prof !15 {
+; CHECK: define void @callee(i32 %n) #0 !prof ![[ENTRY_COUNT:[0-9]*]]
+define void @callee(i32 %n) #0 !prof !15 {
%cond = icmp sle i32 %n, 10
br i1 %cond, label %cond_true, label %cond_false
cond_true:
Index: llvm/lib/Transforms/IPO/AlwaysInliner.cpp
===================================================================
--- llvm/lib/Transforms/IPO/AlwaysInliner.cpp
+++ llvm/lib/Transforms/IPO/AlwaysInliner.cpp
@@ -15,6 +15,7 @@
#include "llvm/ADT/SetVector.h"
#include "llvm/Analysis/AssumptionCache.h"
#include "llvm/Analysis/InlineCost.h"
+#include "llvm/Analysis/ProfileSummaryInfo.h"
#include "llvm/Analysis/TargetLibraryInfo.h"
#include "llvm/IR/CallingConv.h"
#include "llvm/IR/DataLayout.h"
@@ -39,7 +40,7 @@
auto GetAssumptionCache = [&](Function &F) -> AssumptionCache & {
return FAM.getResult<AssumptionAnalysis>(F);
};
- InlineFunctionInfo IFI(/*cg=*/nullptr, GetAssumptionCache);
+ auto &PSI = MAM.getResult<ProfileSummaryAnalysis>(M);
SmallSetVector<CallBase *, 16> Calls;
bool Changed = false;
@@ -67,6 +68,11 @@
emitInlinedInto(ORE, CB->getDebugLoc(), CB->getParent(), F, *Caller,
*OIC, false, DEBUG_TYPE);
+ InlineFunctionInfo IFI(
+ /*cg=*/nullptr, GetAssumptionCache, &PSI,
+ &FAM.getResult<BlockFrequencyAnalysis>(*(CB->getCaller())),
+ &FAM.getResult<BlockFrequencyAnalysis>(F));
+
InlineResult Res =
InlineFunction(*CB, IFI, /*CalleeAAR=*/nullptr, InsertLifetime);
assert(Res.isSuccess() && "unexpected failure to inline");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88324.294368.patch
Type: text/x-patch
Size: 2207 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200925/69b4594f/attachment.bin>
More information about the llvm-commits
mailing list