[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[Wasm RyuJit] Call Codegen Fixes for R2R - #126778

Merged
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen
Apr 30, 2026
Merged

[Wasm RyuJit] Call Codegen Fixes for R2R#126778
adamperlin merged 19 commits into
dotnet:mainfrom
adamperlin:adamperlin/wasm-fix-call-codegen

Conversation

@adamperlin

@adamperlinadamperlin commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

Initially cherry-picked commit from #126662;

This PR:

  • Adds explicit handling in lowering for managed calls using the PEP calling convention to pass the additional PEP parameter.
  • Removes some dead code around handling of WellKnownArg::R2RIndireictionCell from wasm code gen.
  • Adds fixes for helper call codegen to account for the extra level of indirection needed to load a helper call target from a PEP (Portable Entrypoint).

Lowering Transformation Details

The lowering transformation introduces a temp local (call it pep) to hold the PEP, which we then add to a managed call as a final parameter with associated ABI info. We then rewrite the control expr of the call to be *pep. This ensures that, conceptually, any call with an entrypoint of access type PVALUE will be lowered to something roughly like the following, in C notation:

void* pep = *(void**)(<value>);
(*(void**)pep)(arg0, arg1, ..., argN, pep)

davidwrightonand others added 3 commits April 9, 2026 13:44
CopilotAI review requested due to automatic review settings April 10, 2026 23:33
@github-actionsgithub-actionsBot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Apr 10, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@adamperlinadamperlin changed the title [Wasm RyuJit] Call Codegen Fixes[Wasm RyuJit] Call Codegen Fixes for R2RApr 10, 2026

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

This PR adjusts WebAssembly RyuJIT call lowering/emission for ReadyToRun (R2R) so call targets and PortableEntryPoints (PEPs) are loaded through the correct number of indirections when the host exposes symbols as indirection cells (indirection cell -> PEP -> target).

Changes:

  • Add an extra indirection when materializing the R2R indirection-cell argument on WASM so the value passed reflects the PEP rather than the cell itself.
  • Update WASM direct-call lowering for IAT_PVALUE to dereference through indirection cell -> PEP -> target.
  • Update WASM helper-call emission to load the PEP from the indirection cell (for managed helpers) and to load the final call target via an additional dereference.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

FileDescription
src/coreclr/jit/morph.cppAdds a WASM-specific extra indirection when preparing the R2R indirection-cell argument so the runtime sees the expected PEP pointer.
src/coreclr/jit/lower.cppEnsures WASM IAT_PVALUE direct call targets are lowered with an additional dereference to reach the actual dispatch target.
src/coreclr/jit/codegenwasm.cppFixes helper-call emission to load the PEP from the indirection cell and to load the indirect call target by dereferencing the PEP.

Comment threadsrc/coreclr/jit/codegenwasm.cpp
@AndyAyersMS

Copy link
Copy Markdown
Member

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
@adamperlin

adamperlin commented Apr 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Maybe a picture would be useful here?

I imagine it something like this: We have an indirection cell that refers to a PEP which refers to a function index, which we then call indirectly.

This is the right mental model! I am attaching a diagram that I created though of calling a function F from generated code:
1776127500818-892a2a89-e310-4dd1-b6d1-5d38bbee3929_1

@jkotas

Copy link
Copy Markdown
Member

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

@adamperlin

Copy link
Copy Markdown
ContributorAuthor

I am attaching a diagram that I created though of calling a function F from generated code

This picture is missing the part that passes portable entrypoint address (the value fetched from R2R import table) as the hidden argument that it somewhat important detail.

Ah I wasn't sure whether to include that bit, I've updated the diagram to include it!

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 24, 2026 21:48

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

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@adamperlin

adamperlin commented Apr 27, 2026

Copy link
Copy Markdown
ContributorAuthor

Could I get another review when you have a moment @jkotas@jakobbotsch? I've updated the PR based on your feedback to explicitly handle the PEP calling convention transformation in lower. Thinking about this further exposed some dead case handling in Wasm codegen around the handling of the indirection cell arg which will now not be materialized on wasm. This also exposed a bug in the stackifier that I'm currently working through here: #127412
Also cc'ing @kg due to wasm call codegen changes!

@adamperlin
adamperlinforce-pushed the adamperlin/wasm-fix-call-codegen branch from 5c9ee85 to 3981152CompareApril 27, 2026 17:46
Comment threadsrc/coreclr/jit/lower.cpp Outdated
Comment threadsrc/coreclr/jit/codegenwasm.cpp Outdated
Comment threadsrc/coreclr/jit/morph.cpp Outdated
CopilotAI review requested due to automatic review settings April 27, 2026 20:00

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

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Comment threadsrc/coreclr/jit/lowerwasm.cpp Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings April 27, 2026 20:46
Comment threadsrc/coreclr/jit/morph.cpp

@jakobbotschjakobbotsch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, feel free to address the ifdef nit in a follow up

adamperlin added a commit that referenced this pull request Apr 30, 2026
This is a fix for an issue that came up in #126778, and is probably
easiest to explain with a motivating example.
Consider the following case, where NOMOVE is a gentree operation we
aren't allowed to move.
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... NOMOVE OP
t1 = ... OP
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (target)
CALL
```
The stackifier will first introduce a store to put `t0` after `t1`:
```
t2 = ... NOMOVE OP
t3 = ... OP
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3 (arg1)
* t2 (arg2)
* t1 (arg3)
* t0 (call target)
CALL
```
And then recursively stackify the new STORE to tmp0, since it is a
dataflow root.
*The stackifier then marks tmp0 as free here, since it IS free in linear
data flow order*. Then, when the next operands to the call are
stackified, the stackifier introduces a temporary again, but reuses t0 because we freed it. ```
t2 = ... OP
+** STORE_LCL_VAR tmp0
t3 = ... OP
t2 = LCL_VAR tmp0
t0 = ... OP
+** STORE_LCL_VAR tmp0
t1 = ... OP
t0 = LCL_VAR tmp0
* t3
* t2
* t1
* t0 (target)
CALL
```
This produces invalid LIR; there is a store to tmp0 before one of its
reads (t2) is consumed.
The simplest fix is to not release temporaries for reuse until all
operands of a root tree have been processed. This PR adds a free list of
temps which is recycled after each root gen tree has been processed, so
we won't end up with any interference between temporaries while
processing gentree ops which share a parent node.
---------
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@adamperlin
adamperlin merged commit 8f854af into dotnet:mainApr 30, 2026
135 checks passed
@adamperlin
adamperlin deleted the adamperlin/wasm-fix-call-codegen branch April 30, 2026 01:18
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 30, 2026
@pavelsavarapavelsavara added the arch-wasm WebAssembly architecture label Jun 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@adamperlin@AndyAyersMS@jkotas@kg@jakobbotsch@SingleAccretion@pavelsavara@davidwrighton