Skip to content

SuperPMI: re-apply JitWasmNyiToR2RUnsupported when ignoring stored config#129026

Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:superpmi-wasm-ignorestoredconfig
Jun 5, 2026
Merged

SuperPMI: re-apply JitWasmNyiToR2RUnsupported when ignoring stored config#129026
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:superpmi-wasm-ignorestoredconfig

Conversation

@AndyAyersMS
Copy link
Copy Markdown
Member

@AndyAyersMS AndyAyersMS commented Jun 5, 2026 •
edited
Loading

The asmdiffs-checked-release leg uses -ignoreStoredConfig, which drops the JitWasmNyiToR2RUnsupported=1 recorded into the MCH stored config at collection time. The wasm JIT then asserts on unimplemented opcodes (e.g. GT_ASYNC_CONTINUATION) instead of cleanly skipping them as R2R-unsupported.

So add back the option externally for wasm whenever we pass -ignoreStoredConfig.

Fixes #129014

@AndyAyersMS
SuperPMI: re-apply JitWasmNyiToR2RUnsupported when ignoring stored co…
296853b 
…nfig

The asmdiffs-checked-release leg uses -ignoreStoredConfig, which drops
the JitWasmNyiToR2RUnsupported=1 setting that crossgen-corelib.proj
recorded into the MCH stored config at collection time. The wasm JIT
then asserts on unimplemented opcodes (e.g. GT_ASYNC_CONTINUATION)
instead of cleanly skipping them as R2R-unsupported. Re-supply the
option externally for wasm whenever we pass -ignoreStoredConfig.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings June 5, 2026 01:03
@github-actions github-actions Bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jun 5, 2026
@dotnet-policy-service
Copy link
Copy Markdown
Contributor

dotnet-policy-service Bot commented Jun 5, 2026

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

@AndyAyersMS
Copy link
Copy Markdown
Member Author

AndyAyersMS commented Jun 5, 2026

@dotnet/wasm-contrib PTAL
fyi @dotnet/jit-contrib

I also had to manually update the coredistools stored in our azure blob; for some reason these jobs fetch coredistools from the blob rather than copying the proper version from a build and/or fetching it via nuget.

This should "really" be the last piece of Wasm SPMI infrastructure for now.

Copilot AI reviewed Jun 5, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the SuperPMI asm-diffs replay path to preserve a wasm-specific JIT behavior when -ignoreStoredConfig is used, by explicitly re-applying JitWasmNyiToR2RUnsupported=1 for wasm targets.

Changes:

  • When --diff_with_release causes -ignoreStoredConfig to be passed, add -jitoption force JitWasmNyiToR2RUnsupported=1 and -jit2option force JitWasmNyiToR2RUnsupported=1 for target_arch == "wasm".

This was referenced Jun 5, 2026
Open
Open
@AndyAyersMS
Copy link
Copy Markdown
Member Author

AndyAyersMS commented Jun 5, 2026

Failures were #129037.

@AndyAyersMS
Copy link
Copy Markdown
Member Author

AndyAyersMS commented Jun 5, 2026

@adamperlin can you review? It should be quick.

@AndyAyersMS AndyAyersMS requested a review from adamperlin June 5, 2026 19:03
@AndyAyersMS AndyAyersMS mentioned this pull request Jun 5, 2026
Closed
@AndyAyersMS
Copy link
Copy Markdown
Member Author

AndyAyersMS commented Jun 5, 2026

/ba-g known test failures

@AndyAyersMS AndyAyersMS merged commit 1358624 into dotnet:main Jun 5, 2026
107 of 116 checks passed
@dotnet-maestro dotnet-maestro Bot mentioned this pull request Jun 6, 2026
Merged
@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 11.0-preview6 milestone Jun 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@adamperlin adamperlin adamperlin approved these changes

Assignees

@AndyAyersMS AndyAyersMS

Labels

area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Milestone

11.0-preview6

Development

Successfully merging this pull request may close these issues.

[ci-scan] Test failure: superpmi-asmdiffs browser-wasm no MCH files to replay

3 participants

@AndyAyersMS @adamperlin