Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix the unwind opcode for new APX registers #112799

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 22, 2025
Merged

Fix the unwind opcode for new APX registers #112799

merged 2 commits into from
Feb 22, 2025

Conversation

kunalspathak
Copy link
Member

APX added 8 new GPR registers and that shifted the base of floating point registers. However the shift was not getting accounted for properly while embedding the unwind code.

Also, while I was there, I realized that we didn't add the mapping of new registers for DWARF CFI unwind.

Fixes:

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 21, 2025
@kunalspathak kunalspathak changed the title Fix the unwind opcode for new registers Fix the unwind opcode for new APX registers Feb 21, 2025
@dotnet-policy-service Dotnet Policy Service
Copy link
Contributor

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

@DeepakRajendrakumaran DeepakRajendrakumaran mentioned this pull request Feb 21, 2025
Closed
@amanasifkhalid
Copy link
Member

This might also fix #112286

@saucecontrol
Copy link
Member

And #112755 😄

@jakobbotsch
Copy link
Member

jakobbotsch commented Feb 21, 2025 •
edited
Loading

Any idea why this didn't show up as 0-size diffs in the original PR? We should be diffing unwind codes in SPMI.

Edit: It looks like we don't:

runtime/src/coreclr/tools/superpmi/superpmi/neardiffer.cpp

Lines 1349 to 1381 in 57ed254

cr2->applyRelocs(&rc, hotCodeBlock_2, hotCodeSize_2, orig_hotCodeBlock_2);
cr2->applyRelocs(&rc, coldCodeBlock_2, coldCodeSize_2, orig_coldCodeBlock_2);
cr2->applyRelocs(&rc, roDataBlock_2, roDataSize_2, orig_roDataBlock_2);
if (!compareCodeSection(mc, cr1, cr2, hotCodeBlock_1, hotCodeSize_1, roDataBlock_1, roDataSize_1,
orig_hotCodeBlock_1, orig_roDataBlock_1, orig_coldCodeBlock_1, coldCodeSize_1,
hotCodeBlock_2, hotCodeSize_2, roDataBlock_2, roDataSize_2, orig_hotCodeBlock_2,
orig_roDataBlock_2, orig_coldCodeBlock_2, coldCodeSize_2))
return false;
if (!compareCodeSection(mc, cr1, cr2, coldCodeBlock_1, coldCodeSize_1, roDataBlock_1, roDataSize_1,
orig_coldCodeBlock_1, orig_roDataBlock_1, orig_hotCodeBlock_1, hotCodeSize_1,
coldCodeBlock_2, coldCodeSize_2, roDataBlock_2, roDataSize_2, orig_coldCodeBlock_2,
orig_roDataBlock_2, orig_hotCodeBlock_2, hotCodeSize_2))
return false;
if (!compareReadOnlyDataBlock(mc, cr1, cr2, roDataBlock_1, roDataSize_1, orig_roDataBlock_1, roDataBlock_2,
roDataSize_2, orig_roDataBlock_2))
return false;
if (!compareEHInfo(mc, cr1, cr2))
return false;
if (!compareGCInfo(mc, cr1, cr2))
return false;
if (!compareVars(mc, cr1, cr2))
return false;
if (!compareBoundaries(mc, cr1, cr2))
return false;
return true;
. I opened #112807 for it.

@jakobbotsch jakobbotsch mentioned this pull request Feb 21, 2025
Open
@kunalspathak
Copy link
Member Author

/azp run runtime-coreclr libraries-jitstress2-jitstressregs, runtime-coreclr r2r-extra

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

This was referenced Feb 22, 2025
Open
Open
@kunalspathak
Copy link
Member Author

kunalspathak commented Feb 22, 2025 •
edited
Loading

It seems there are few failures that needs investigation but are unrelated to the change from this PR. I will investigate to make sure and open GH issues, if needed. But this should be ready for review.

r2rextra failures: https://dev.azure.com/dnceng-public/public/_build/results?buildId=959524&view=ms.vss-test-web.build-test-results-tab&runId=25542994&resultId=123196&paneView=debug

@kunalspathak kunalspathak marked this pull request as ready for review February 22, 2025 03:23
@kunalspathak
Copy link
Member Author

@dotnet/jit-contrib

tannergooding
tannergooding reviewed Feb 22, 2025
View reviewed changes
src/coreclr/jit/unwindamd64.cpp
@@ -399,7 +423,7 @@ void Compiler::unwindSaveRegWindows(regNumber reg, unsigned offset)
code = (UNWIND_CODE*)&func->unwindCodes[func->unwindCodeSlot -= sizeof(UNWIND_CODE)];
code->UnwindOp = (genIsValidFloatReg(reg)) ? UWOP_SAVE_XMM128_FAR : UWOP_SAVE_NONVOL_FAR;
}
code->OpInfo = (BYTE)reg;
code->OpInfo = (BYTE)(genIsValidFloatReg(reg) ? reg - XMMBASE : reg);
Copy link
Member

Choose a reason for hiding this comment

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

Can we add an assert that genIsValidIntReg(reg) for the else case, to help catch any future bugs or expansions in this space?

Copy link
Member

Choose a reason for hiding this comment

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

We could even assert on the actual range of the computed value, since the unwind codes are well-defined and if they change, we want the assert to hit.

Copy link
Member Author

Choose a reason for hiding this comment

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

let me do it as a follow up PR and merge this as is to unblock weekend runs.

@kunalspathak
Copy link
Member Author

/ba-g osx/arm64 seems to be timeout errors.

@kunalspathak kunalspathak merged commit 7060c62 into dotnet:main Feb 22, 2025
109 of 112 checks passed
@kunalspathak kunalspathak deleted the unwind-apx branch February 22, 2025 14:51
This was referenced Feb 22, 2025
Closed
Closed
Merged
This was referenced Feb 24, 2025
Closed
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Mar 25, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tannergooding tannergooding tannergooding left review comments

@BruceForstall BruceForstall BruceForstall approved these changes

Assignees

@kunalspathak kunalspathak

Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@kunalspathak @amanasifkhalid @saucecontrol @jakobbotsch @tannergooding @BruceForstall