-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JIT: DNER multiregs with SIMD12s #91674
Conversation
Locals with SIMD12 fields will never match the ABI when they end up as multireg returns, so these should always be DNER'd. Fix dotnet#91214
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch Issue DetailsLocals with SIMD12 fields will never match the ABI when they end up as multireg returns, so these should always be DNER'd. Fix #91214
|
cc @dotnet/jit-contrib PTAL @EgorBo No diffs (except large TP diffs, see #91563 (comment)) |
hm... I thought that the fix is more complicated per our discussion in discord with you and @SingleAccretion : that's why I closed mine that touches the same path |
After thinking about it some more (and checking diffs) I don't think we need anything more complicated here. I believe that all cases where we call It might still be nice to do the |
The change looks good to me. Though I it would be nice to "formally prove" mismatches can only arise from SIMD12 on local side, I agree it is convincing that it is indeed the case.
One will never see this for multi-reg locals, due to (as you said) block morphing. |
/backport to release/8.0 |
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6145265483 |
@jakobbotsch backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: JIT: DNER multiregs with SIMD12s
Using index info to reconstruct a base tree...
M src/coreclr/jit/lower.cpp
A src/tests/JIT/Regression/JitBlue/Runtime_91174/Runtime_91174.cs
A src/tests/JIT/Regression/JitBlue/Runtime_91335/Runtime_91335.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/tests/JIT/Regression/JitBlue/Runtime_91335/Runtime_91335.cs deleted in HEAD and modified in JIT: DNER multiregs with SIMD12s. Version JIT: DNER multiregs with SIMD12s of src/tests/JIT/Regression/JitBlue/Runtime_91335/Runtime_91335.cs left in tree.
CONFLICT (modify/delete): src/tests/JIT/Regression/JitBlue/Runtime_91174/Runtime_91174.cs deleted in HEAD and modified in JIT: DNER multiregs with SIMD12s. Version JIT: DNER multiregs with SIMD12s of src/tests/JIT/Regression/JitBlue/Runtime_91174/Runtime_91174.cs left in tree.
Auto-merging src/coreclr/jit/lower.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 JIT: DNER multiregs with SIMD12s
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@jakobbotsch an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Locals with SIMD12 fields will span multiple registers when they end up as multireg returns, so these should always be DNER'd.
Fix #91214