[PATCH] D88324: [AlwaysInliner] Update BFI when inlining

[Arthur Eubanks via Phabricator via llvm-commits]

aeubanks updated this revision to Diff 295722.
aeubanks added a comment.

copy test with alwaysinline callee


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D88324/new/

https://reviews.llvm.org/D88324

Files:
  llvm/lib/Transforms/IPO/AlwaysInliner.cpp
  llvm/test/Transforms/Inline/prof-update-sample-alwaysinline.ll
  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
@@ -51,7 +51,6 @@
 !16 = !{!"branch_weights", i64 2000}
 !17 = !{!"branch_weights", i64 400}
 !18 = !{!"VP", i32 0, i64 140, i64 111, i64 80, i64 222, i64 40, i64 333, i64 20}
-attributes #0 = { alwaysinline }
 ; CHECK: ![[ENTRY_COUNT]] = !{!"function_entry_count", i64 600}
 ; CHECK: ![[COUNT_CALLEE1]] = !{!"branch_weights", i64 2000}
 ; CHECK: ![[COUNT_CALLEE]] = !{!"branch_weights", i64 1200}
Index: llvm/test/Transforms/Inline/prof-update-sample-alwaysinline.ll
===================================================================
--- llvm/test/Transforms/Inline/prof-update-sample-alwaysinline.ll
+++ llvm/test/Transforms/Inline/prof-update-sample-alwaysinline.ll
@@ -1,12 +1,12 @@
-; RUN: opt < %s -inline -S | FileCheck %s
-; Checks if inliner updates branch_weights annotation for call instructions.
+; RUN: opt < %s -passes=always-inline -S | FileCheck %s
+; Checks if always-inline 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.295722.patch
Type: text/x-patch
Size: 2961 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201002/36265b84/attachment.bin>