Repository navigation
[JIT] Remove BBF_NONE_QUIRK #95998
Description
In the process of removing BBJ_NONE from the JIT's flowgraph code, #94239 introduced BBF_NONE_QUIRK to indicate a BBJ_ALWAYS block was previously a BBJ_NONE, and that if the block's jump target is the next block (thus mimicking fall-through behavior), the JIT should behave as if this block were still a BBJ_NONE. This decision was motivated by a desire to minimize diffs in the initial PR, and avoid tricky refactors in a few cases -- in particular, removing BBJ_NONE initially caused several small behavioral changes in Compiler::fgFindInsertPoint that cascaded into larger codegen diffs due to differences in block ordering. Introducing BBF_NONE_QUIRK somewhat alleviated these diffs.
As part of our broader effort of modernizing the JIT's flowgraph code (see #93020), we should prioritize removing BBF_NONE_QUIRK as we reduce our reliance on implicit fall-through behavior. As of writing, we set this flag in dozens of places, but we only check if it is set in four instances. I will outline these places below, in order of what I perceive to be increasing difficulty of removal:
- We assert
BBF_NONE_QUIRKis set in importer.cpp. Removing this is trivial, and since this is during importation, I think assertingblock->JumpsToNext()would be equivalent. - In
Compiler::placeLoopAlignInstructions, we check that the flag isn't present before considering placing align instructions after the block. Removing this check doesn't produce any diffs locally, so perhaps this is safe to remove? Perhaps it would make sense to not consider aBBJ_ALWAYSto the next block to better emulate the previous behavior withBBJ_NONE, but the jump target is subject to move, so maybe we don't need any additional check here. On the other hand, we currently don't try to remove jumps to the next block if the block with the jump has alignment padding at the end, so allowing moreBBJ_ALWAYSblocks to have alignment might slightly reduce the possible applications of that optimization. - In
Compiler::fgUpdateFlowGraph, if a block's jump target is aBBJ_ALWAYSto the next block withBBF_NONE_QUIRKset, we don't attemptfgOptimizeBranchToEmptyUnconditional, as we might be able to compact theBBJ_ALWAYSlater (which is what we initially did forBBJ_NONEblocks). Removing this restriction unlocks some dramatic code size improvements, though some of these improvements are due to the JIT deciding not to clone a loop. We will have to investigate why this affects decisions around loop cloning, and whether the reduced cloning is desirable or should be fixed. - In
Compiler::fgFindInsertPoint, we checkBBF_NONE_QUIRKas a proxy for fall-through behavior when deciding whether to insert after a specific block. I think it makes sense to try to keepBBJ_ALWAYSblocks and their jump targets contiguous if they are already, though later decisions could move the two apart and render our initial decision here useless. Now that there are far fewer moving pieces to contend with than in JIT: Remove BBJ_NONE #94239, I'll try experimenting with this locally to see how sporadic the diffs are.
Thank you to everyone who's made an effort to remove BBF_NONE_QUIRK so far in otherwise unrelated changes (@jakobbotsch, I noticed you've removed a few instances in some of your recent work).
Metadata
Metadata
Assignees
Labels
Type
Projects
- StatusShow more project fieldsDone
Activity
amanasifkhalid commentedon Dec 14, 2023
cc @BruceForstall @AndyAyersMS
BruceForstall commentedon Dec 14, 2023
It seems that at some point in compilation, we've fixed the layout block order and after that a BBJ_ALWAYS to the next block will "fall through" and not generate a branch (except, say, for between hot/cold region boundaries). Do callers just "know" when this is true, or will we introduce something like BBF_NONE_QUIRK (say, BBF_ALWAYS_FALLTHROUGH?) to indicate that?
E.g., should
bbFallsThroughreturntruefor someBBJ_ALWAYScases?amanasifkhalid commentedon Dec 14, 2023
We currently just manually check if the block jumps to the next block, and base our decision-making around that; post-block layout, that's a reliable check for fall-through behavior, but before we've finished creating/moving blocks, the result of that check is subject to change (though I don't think there's much we can do about that until we start removing our broader dependence on fall-through behavior when making decisions around block layout).
We could introduce some extra state into the
Compilerobject that tracks whether block layout is finalized or not (maybe we can try to setfgSafeBasicBlockCreationto false in a phase earlier than codegen, and use that instead?), and then check this state to determine if aBBJ_ALWAYSto the next block will still "fall through" by the time we get to codegen. I'm hesitant to introduce a new flag likeBBF_ALWAYS_FALLTHROUGHsince I think we can use existing state to determine if aBBJ_ALWAYSwill fall through. We could modifybbFallsThroughto check this state and returntrueforBBJ_ALWAYSin some cases, though it looks like the majority of our calls tobbFallsThroughare done before block layout is finalized, and theBBJ_NONEremoval introduced an additional check to many of these call sites to cover theBBJ_ALWAYSjump-to-next case -- e.g.if (blk->bbFallsThrough() || (blk->KindIs(BBJ_ALWAYS) && blk->JumpsToNext())).JIT: Remove fallthrough quirk in fgFindInsertPoint (#99783)