Skip to content

Commit 36e8e19

Browse files
[NFC][BlockPlacement]Add an option to renumber blocks based on function layout order.
Use case: - When block layout is visualized after MBP pass, the basic blocks are labeled in layout order; meanwhile blocks could be numbered in a different order. - As a result, it's hard to map between the graph and pass output. With this option on, the basic blocks are renumbered in function layout order. This option is only useful when a function is to be visualized (i.e., when view options are on) to make it debugging only. Use https://godbolt.org/z/5WTW36bMr as an example: - As MBP pass output (shown in godbolt output window), `func2` is in a basic block numbered `2` (`bb.2`), and `func1` is in a basic block numbered `3` (`bb.3`); `bb.3` is a block with higher block frequency than `bb.2`, and `bb.3` is placed before `bb.2` in the functin layout. - Use [1] to get the dot graph (graph uploaded in [2]), the blocks are re-numbered. - `func1` is in 'if.end' block, and labeled `1` in visualized dot; `func2` is in 'if.then' blocks, and labeled `3` --> the labeled number and bb number won't map. - [[ https://github.com/llvm/llvm-project/blob/b5626ae9751f0d82aa04791a21689b289721738e/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp#L127 | DOTGraphTraits<MachineBlockFrequencyInfo *>::getNodeLabel ]] is where labeled numbers are based on function layout number, and [[ https://github.com/llvm/llvm-project/blob/a8d93783f37c042ace67069ae4ca6f8fd849c2d0/llvm/include/llvm/Support/GraphWriter.h#L209 | called by graph writer ]]. So call 'MachineFunction::RenumberBlocks' would make labeled number (in dot graph) and block number (in pass output) consistent with each other. [1] `./bin/clang++ -O3 -S -mllvm -view-block-layout-with-bfi=count -mllvm -view-bfi-func-name=_Z9func_loopv -mllvm -print-after=block-placement -mllvm -filter-print-funcs=_Z9func_loopv test.c` [2] {F25201785} Reviewed By: davidxl Differential Revision: https://reviews.llvm.org/D137467
1 parent a9d7b18 commit 36e8e19

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

llvm/lib/CodeGen/MachineBlockPlacement.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,18 @@ static cl::opt<unsigned> TriangleChainCount(
201201
cl::init(2),
202202
cl::Hidden);
203203

204+
// Use case: When block layout is visualized after MBP pass, the basic blocks
205+
// are labeled in layout order; meanwhile blocks could be numbered in a
206+
// different order. It's hard to map between the graph and pass output.
207+
// With this option on, the basic blocks are renumbered in function layout
208+
// order. For debugging only.
209+
static cl::opt<bool> RenumberBlocksBeforeView(
210+
"renumber-blocks-before-view",
211+
cl::desc(
212+
"If true, basic blocks are re-numbered before MBP layout is printed "
213+
"into a dot graph. Only used when a function is being printed."),
214+
cl::init(false), cl::Hidden);
215+
204216
extern cl::opt<bool> EnableExtTspBlockPlacement;
205217
extern cl::opt<bool> ApplyExtTspWithoutProfile;
206218

@@ -3466,6 +3478,8 @@ bool MachineBlockPlacement::runOnMachineFunction(MachineFunction &MF) {
34663478
if (ViewBlockLayoutWithBFI != GVDT_None &&
34673479
(ViewBlockFreqFuncName.empty() ||
34683480
F->getFunction().getName().equals(ViewBlockFreqFuncName))) {
3481+
if (RenumberBlocksBeforeView)
3482+
MF.RenumberBlocks();
34693483
MBFI->view("MBP." + MF.getName(), false);
34703484
}
34713485

0 commit comments

Comments
 (0)