wasm: order funclets in RPO by funclet index#130013
Open
AndyAyersMS wants to merge 1 commit into
Open
Conversation
So the RPO/preorder matches the order funclets are emitted in, keeping the codegen control-flow cursor monotonic. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
github-actions
Bot
added
the
area-CodeGen-coreclr
Member
Author
|
@adamperlin PTAL Fixes some JIT asserts in Pri1 tests where EH clauses require sorting. |
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull request overview
Adjusts wasm JIT control-flow layout so funclet ordering in the computed RPO/preorder aligns with the order wasm codegen emits funclets, reducing the chance of mismatches between interval/cursor indexing and physical block traversal.
Changes:
- Sort wasm DFS funclet entry blocks by descending funclet index (so reverse-postorder yields increasing funclet index).
- Add a DEBUG-only verification that the physical
Blocks()order matches assignedbbPreorderNumafter the wasm block reordering.
Comment on lines
+139
to
+143
| // Sort handler entries by funclet index (descending), so | ||
| // that RPO and funclet emission order agree. | ||
| // | ||
| jitstd::sort(entryBlocks.begin(), entryBlocks.end(), [comp](BasicBlock* a, BasicBlock* b) { | ||
| return comp->funGetFuncIdx(a) > comp->funGetFuncIdx(b); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ensure the RPO/preorder matches the funclet emission order.