Skip to content

wasm: order funclets in RPO by funclet index - #130013

Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:wasm-r2r-funclet-rpo-order
Jun 30, 2026
Merged

wasm: order funclets in RPO by funclet index#130013
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:wasm-r2r-funclet-rpo-order

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Jun 30, 2026

Copy link
Copy Markdown
Member

Ensure the RPO/preorder matches the funclet emission order.

@AndyAyersMS
wasm: order funclets in RPO by funclet index
adc0722
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>
CopilotAI review requested due to automatic review settings June 30, 2026 01:25
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jun 30, 2026
@AndyAyersMS

AndyAyersMS commented Jun 30, 2026

Copy link
Copy Markdown
MemberAuthor

@adamperlin PTAL
fyi @dotnet/wasm-contrib

Fixes some JIT asserts in Pri1 tests where EH clauses require sorting.

CopilotAI reviewed Jun 30, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 assigned bbPreorderNum after the wasm block reordering.

Comment threadsrc/coreclr/jit/fgwasm.cpp
This was referenced Jun 30, 2026
Open
Open
@AndyAyersMSAndyAyersMS mentioned this pull request Jun 30, 2026
Closed
@AndyAyersMS

AndyAyersMS commented Jun 30, 2026

Copy link
Copy Markdown
MemberAuthor

@adamperlin ping

@am11am11 added the arch-wasm WebAssembly architecture label Jun 30, 2026
@dotnet-policy-service

dotnet-policy-serviceBot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Tagging subscribers to 'arch-wasm': @lewing, @pavelsavara
See info in area-owners.md if you want to be subscribed.

@adamperlin

adamperlin commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

The test failures here appear to be unrelated it looks like

@AndyAyersMS

AndyAyersMS commented Jun 30, 2026

Copy link
Copy Markdown
MemberAuthor

The test failures here appear to be unrelated it looks like

Most certainly, none of the code touched here gets much testing in CI yet.

@AndyAyersMS
AndyAyersMS merged commit d11e89c into dotnet:mainJun 30, 2026
143 of 147 checks passed
@dotnet-maestrodotnet-maestroBot mentioned this pull request Jul 1, 2026
Merged
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview7 milestone Jul 1, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
@AndyAyersMS@eiriktsarpalis
wasm: order funclets in RPO by funclet index (#130013)
df0d0aa
Ensure the RPO/preorder matches the funclet emission order.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 1, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@adamperlinadamperlinadamperlin approved these changes

Assignees

@AndyAyersMSAndyAyersMS

Labels

arch-wasmWebAssembly architecturearea-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Milestone

11.0-preview7

Development

Successfully merging this pull request may close these issues.

4 participants

@AndyAyersMS@adamperlin@am11