Skip to content

cherry pick patches to disable deferred inlining #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 19, 2021
Merged

cherry pick patches to disable deferred inlining #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42df433
[InlineAdvisor] Add option to control deferred inlining (NFC)
nikic Dec 14, 2021
05ca55b
[Inline] Add test for exponential deferred inlining (NFC)
nikic Dec 10, 2021
cb1b241
[Inline] Disable deferred inlining
nikic Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/include/llvm/Analysis/InlineCost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ struct InlineParams {
Optional<bool> ComputeFullInlineCost;

/// Indicate whether we should allow inline deferral.
Optional<bool> EnableDeferral = true;
Optional<bool> EnableDeferral;
};

/// Generate the parameters to tune the inline cost analysis based only on the
Expand Down
9 changes: 7 additions & 2 deletions llvm/lib/Analysis/InlineAdvisor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ static cl::opt<bool>
" callsites processed by inliner but decided"
" to be not inlined"));

static cl::opt<bool> EnableInlineDeferral("inline-deferral", cl::init(false),
cl::Hidden,
cl::desc("Enable deferred inlining"));

// An integer used to limit the cost of inline deferral. The default negative
// number tells shouldBeDeferred to only take the secondary cost into account.
static cl::opt<int>
Expand Down Expand Up @@ -100,8 +104,9 @@ llvm::Optional<llvm::InlineCost> static getDefaultInlineAdvice(
return getInlineCost(CB, Params, CalleeTTI, GetAssumptionCache, GetTLI,
GetBFI, PSI, RemarksEnabled ? &ORE : nullptr);
};
return llvm::shouldInline(CB, GetInlineCost, ORE,
Params.EnableDeferral.getValueOr(false));
return llvm::shouldInline(
CB, GetInlineCost, ORE,
Params.EnableDeferral.getValueOr(EnableInlineDeferral));
}

std::unique_ptr<InlineAdvice>
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Test for a subtle bug when computing analyses during inlining and mutating
; the SCC structure. Without care, this can fail to invalidate analyses.
;
; RUN: opt < %s -aa-pipeline= -passes='cgscc(inline,function(verify<domtree>))' -debug-pass-manager -S 2>&1 | FileCheck %s
; RUN: opt < %s -aa-pipeline= -passes='cgscc(inline,function(verify<domtree>))' -debug-pass-manager -inline-deferral -S 2>&1 | FileCheck %s

; First we check that the passes run in the way we expect. Otherwise this test
; may stop testing anything.
Expand Down
120 changes: 120 additions & 0 deletions llvm/test/Transforms/Inline/exponential-deferred-inlining.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -inline < %s | FileCheck %s

declare void @foo()

define internal void @f1() {
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
call void @foo()
ret void
}

define internal void @f2() {
; CHECK-LABEL: @f2(
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: call void @foo()
; CHECK-NEXT: ret void
;
call void @f1()
call void @f1()
call void @f1()
ret void
}

define internal void @f3() {
call void @f2()
call void @f2()
ret void
}

define internal void @f4() {
call void @f3()
call void @f3()
ret void
}

define internal void @f5() {
call void @f4()
call void @f4()
ret void
}

define internal void @f6() {
; CHECK-LABEL: @f6(
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: call void @f2()
; CHECK-NEXT: ret void
;
call void @f5()
call void @f5()
ret void
}

define void @f7() {
; CHECK-LABEL: @f7(
; CHECK-NEXT: call void @f6()
; CHECK-NEXT: call void @f6()
; CHECK-NEXT: ret void
;
call void @f6()
call void @f6()
ret void
}