Skip to content

Reset assignedInterval during verifyFinalAllocation #49286

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

Merged
kunalspathak merged 3 commits into from
Mar 9, 2021
Merged

Reset assignedInterval during verifyFinalAllocation #49286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c39be0e
Unassign register for RefTypeDef if it is not assigned register
kunalspathak Mar 5, 2021
92ac2fe
Fix more asserts for spillAfter/Def where assignedInterval was not reset
kunalspathak Mar 5, 2021
8cc10f6
jit format
kunalspathak Mar 8, 2021
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
26 changes: 26 additions & 0 deletions src/coreclr/jit/lsra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10955,6 +10955,22 @@ void LinearScan::verifyFinalAllocation()
}
if (regNum == REG_NA)
{
// If this interval is still assigned to a register
if (interval->physReg != REG_NA)
{
// then unassign it if no new register was assigned to the RefTypeDef
if (RefTypeIsDef(currentRefPosition->refType))
{
assert(interval->assignedReg != nullptr);
if (interval->assignedReg->assignedInterval == interval)
{
interval->assignedReg->assignedInterval = nullptr;
}
interval->physReg = REG_NA;
interval->assignedReg = nullptr;
}
}

dumpLsraAllocationEvent(LSRA_EVENT_NO_REG_ALLOCATED, interval);
}
else if (RefTypeIsDef(currentRefPosition->refType))
Expand Down Expand Up @@ -11093,6 +11109,16 @@ void LinearScan::verifyFinalAllocation()
{
assert(!currentRefPosition->spillAfter || currentRefPosition->IsActualRef());

if (RefTypeIsDef(currentRefPosition->refType))
{
// If an interval got assigned to a different register (while the different
// register got spilled), then clear the assigned interval of current register.
if (interval->physReg != REG_NA && interval->physReg != regNum)
{
interval->assignedReg->assignedInterval = nullptr;
}
}

interval->physReg = REG_NA;
interval->assignedReg = nullptr;

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/jit/lsra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,6 @@ class RegRecord : public Referenceable
void tinyDump();
#endif // DEBUG

// RefPosition * getNextRefPosition();
// LsraLocation getNextRefLocation();

// DATA

// interval to which this register is currently allocated.
Expand Down