This is an archive of the discontinued LLVM Phabricator instance.

Differential D109893

[llvm-profgen] Use context-sensitive byte size cost for preinliner decisions by default
ClosedPublic

Authored by wenlei on Sep 16 2021, 8:36 AM.

Details

Reviewers
hoy
wmi
wlei
Commits
rG446e21623c28: [llvm-profgen] Use context-sensitive byte size cost for preinliner decisions by…
Summary

Turn on use-context-cost-for-preinliner to use context-sensitive byte size cost for preinliner decisions by default.

This is a more accurate proxy of inline cost than profile size. We tested on our large workload that it delivers measureable CPU improvement.

Diff Detail

Event Timeline

wenlei created this revision.Sep 16 2021, 8:36 AM
Herald added subscribers: modimo, lxfind, eraman. · View Herald TranscriptSep 16 2021, 8:36 AM
wenlei requested review of this revision.Sep 16 2021, 8:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 16 2021, 8:36 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B124207: Diff 372962.Sep 16 2021, 9:20 AM
hoy accepted this revision.Sep 16 2021, 9:28 AM

One test is failing, might be related. Otherwise, lgtm.

This revision is now accepted and ready to land.Sep 16 2021, 9:28 AM
wenlei updated this revision to Diff 372991.Sep 16 2021, 10:36 AM

update test

This revision was landed with ongoing or failed builds.Sep 16 2021, 10:37 AM
Closed by commit rG446e21623c28: [llvm-profgen] Use context-sensitive byte size cost for preinliner decisions by… (authored by wenlei). · Explain Why
This revision was automatically updated to reflect the committed changes.
wenlei added a commit: rG446e21623c28: [llvm-profgen] Use context-sensitive byte size cost for preinliner decisions by….
Harbormaster completed remote builds in B124229: Diff 372991.Sep 16 2021, 11:04 AM

Revision Contents

PathSize
llvm/
test/
tools/
llvm-profgen/
2 lines
tools/
llvm-profgen/
2 lines

Diff 372993

llvm/test/tools/llvm-profgen/cs-preinline-cost.test

; REQUIRES: asserts ; REQUIRES: asserts
; Test default using size of profile as a proxy ; Test default using size of profile as a proxy
; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-preinline-cost.perfscript --binary=%S/Inputs/cs-preinline-cost.perfbin --csspgo-preinliner --debug-only=cs-preinliner --output=/dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-preinline-cost.perfscript --binary=%S/Inputs/cs-preinline-cost.perfbin --csspgo-preinliner --debug-only=cs-preinliner --use-context-cost-for-preinliner=0 --output=/dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT
; Test use-context-cost-for-preinliner using inlinee's byte size as context-sensitive inline cost ; Test use-context-cost-for-preinliner using inlinee's byte size as context-sensitive inline cost
; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-preinline-cost.perfscript --binary=%S/Inputs/cs-preinline-cost.perfbin --csspgo-preinliner --debug-only=cs-preinliner --use-context-cost-for-preinliner --output=/dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-CSCOST ; RUN: llvm-profgen --format=text --perfscript=%S/Inputs/cs-preinline-cost.perfscript --binary=%S/Inputs/cs-preinline-cost.perfbin --csspgo-preinliner --debug-only=cs-preinliner --use-context-cost-for-preinliner --output=/dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-CSCOST
CHECK-DEFAULT: Process main for context-sensitive pre-inlining (pre-inline size: 9, size limit: 108) CHECK-DEFAULT: Process main for context-sensitive pre-inlining (pre-inline size: 9, size limit: 108)
CHECK-DEFAULT-NEXT: Inlined context profile for: main:9 @ _Z3fooi (callee size: 2, call count:545) CHECK-DEFAULT-NEXT: Inlined context profile for: main:9 @ _Z3fooi (callee size: 2, call count:545)
CHECK-DEFAULT-NEXT: Inlined context profile for: main:7 @ _Z3fooi (callee size: 14, call count:545) CHECK-DEFAULT-NEXT: Inlined context profile for: main:7 @ _Z3fooi (callee size: 14, call count:545)
CHECK-DEFAULT-NEXT: Inlined context profile for: main:8 @ _Z3fooi (callee size: 4, call count:544) CHECK-DEFAULT-NEXT: Inlined context profile for: main:8 @ _Z3fooi (callee size: 4, call count:544)
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

llvm/tools/llvm-profgen/CSPreInliner.cpp

Show All 39 Lines
extern cl::opt<int> ProfileInlineLimitMax; extern cl::opt<int> ProfileInlineLimitMax;
cl::opt<bool> EnableCSPreInliner( cl::opt<bool> EnableCSPreInliner(
"csspgo-preinliner", cl::Hidden, cl::init(false), "csspgo-preinliner", cl::Hidden, cl::init(false),
cl::desc("Run a global pre-inliner to merge context profile based on " cl::desc("Run a global pre-inliner to merge context profile based on "
"estimated global top-down inline decisions")); "estimated global top-down inline decisions"));
cl::opt<bool> UseContextCostForPreInliner( cl::opt<bool> UseContextCostForPreInliner(
"use-context-cost-for-preinliner", cl::Hidden, cl::init(false), "use-context-cost-for-preinliner", cl::Hidden, cl::init(true),
cl::desc("Use context-sensitive byte size cost for preinliner decisions")); cl::desc("Use context-sensitive byte size cost for preinliner decisions"));
static cl::opt<bool> SamplePreInlineReplay( static cl::opt<bool> SamplePreInlineReplay(
"csspgo-replay-preinline", cl::Hidden, cl::init(false), "csspgo-replay-preinline", cl::Hidden, cl::init(false),
cl::desc( cl::desc(
"Replay previous inlining and adjust context profile accordingly")); "Replay previous inlining and adjust context profile accordingly"));
CSPreInliner::CSPreInliner(SampleProfileMap &Profiles, ProfiledBinary &Binary, CSPreInliner::CSPreInliner(SampleProfileMap &Profiles, ProfiledBinary &Binary,
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines