Skip to content
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

JIT: Remove LSRA arm32 quirk #101791

Merged
merged 1 commit into from
May 2, 2024
Merged

JIT: Remove LSRA arm32 quirk #101791

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/coreclr/jit/lsra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5874,6 +5874,8 @@ void LinearScan::allocateRegisters()
continue;
}

assert(!currentRefPosition.isPhysRegRef);
Copy link
Member Author

Choose a reason for hiding this comment

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

Also added this to match allocateRegistersMinimal (forgot it in the previous PR)


// If this is an exposed use, do nothing - this is merely a placeholder to attempt to
// ensure that a register is allocated for the full lifetime. The resolution logic
// will take care of moving to the appropriate register if needed.
Expand Down Expand Up @@ -13307,8 +13309,7 @@ regMaskTP LinearScan::RegisterSelection::select(Interval* current

// If there is another fixed reference to this register before the use, change the candidates
// on this RefPosition to include that of nextRefPos.
// TODO-Quirk: Should pass right type here, but previously this didn't consider TYP_DOUBLE case for arm32.
unsigned nextFixedRegRefLocation = linearScan->getNextFixedRef(defReg, TYP_I_IMPL);
unsigned nextFixedRegRefLocation = linearScan->getNextFixedRef(defReg, currentInterval->registerType);
if (nextFixedRegRefLocation <= nextRefPos->getRefEndLocation())
{
candidates |= nextRefPos->registerAssignment;
Expand Down Expand Up @@ -13768,7 +13769,7 @@ regMaskTP LinearScan::RegisterSelection::selectMinimal(Interval*

// If there is another fixed reference to this register before the use, change the candidates
// on this RefPosition to include that of nextRefPos.
unsigned nextFixedRegRefLocation = linearScan->getNextFixedRef(defReg, TYP_I_IMPL);
unsigned nextFixedRegRefLocation = linearScan->getNextFixedRef(defReg, currentInterval->registerType);
if (nextFixedRegRefLocation <= nextRefPos->getRefEndLocation())
{
candidates |= nextRefPos->registerAssignment;
Expand Down
Loading