Skip to content

JIT: Handle primitive remainder stores to regularly promoted fields in physical promotion #87217

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
merged 2 commits into from
Jun 8, 2023
Merged

JIT: Handle primitive remainder stores to regularly promoted fields in physical promotion #87217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1d3607
JIT: Handle primitive remainder stores to regularly promoted fields i…
jakobbotsch Jun 7, 2023
5b2b768
CSE
jakobbotsch Jun 7, 2023
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
65 changes: 55 additions & 10 deletions src/coreclr/jit/promotiondecomposition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,13 +781,32 @@ class DecompositionPlan

if (remainderStrategy.Type == RemainderStrategy::Primitive)
{
GenTree* src;
GenTree* src = nullptr;
if (m_src->OperIs(GT_LCL_VAR, GT_LCL_FLD))
{
GenTreeLclVarCommon* srcLcl = m_src->AsLclVarCommon();
src = m_compiler->gtNewLclFldNode(srcLcl->GetLclNum(), remainderStrategy.PrimitiveType,
srcLcl->GetLclOffs() + remainderStrategy.PrimitiveOffset);
m_compiler->lvaSetVarDoNotEnregister(srcLcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::LocalField));

// Check if the source has a regularly promoted field at this offset.
LclVarDsc* srcLclDsc = m_compiler->lvaGetDesc(srcLcl);
unsigned srcLclOffs = srcLcl->GetLclOffs() + remainderStrategy.PrimitiveOffset;

unsigned int fieldLcl =
srcLclDsc->lvPromoted ? m_compiler->lvaGetFieldLocal(srcLclDsc, srcLclOffs) : BAD_VAR_NUM;
if (fieldLcl != BAD_VAR_NUM)
{
LclVarDsc* dsc = m_compiler->lvaGetDesc(fieldLcl);
if (genTypeSize(dsc->lvType) == genTypeSize(remainderStrategy.PrimitiveType))
{
src = m_compiler->gtNewLclvNode(fieldLcl, dsc->lvType);
}
}

if (src == nullptr)
{
src = m_compiler->gtNewLclFldNode(srcLcl->GetLclNum(), remainderStrategy.PrimitiveType, srcLclOffs);
m_compiler->lvaSetVarDoNotEnregister(srcLcl->GetLclNum()
DEBUGARG(DoNotEnregisterReason::LocalField));
}
}
else
{
Expand All @@ -796,18 +815,44 @@ class DecompositionPlan
PropagateIndirFlags(src, indirFlags);
}

GenTree* store;
GenTree* store = nullptr;
if (m_store->OperIsLocalStore())
{
GenTreeLclVarCommon* dstLcl = m_store->AsLclVarCommon();
store = m_compiler->gtNewStoreLclFldNode(dstLcl->GetLclNum(), remainderStrategy.PrimitiveType,
dstLcl->GetLclOffs() + remainderStrategy.PrimitiveOffset, src);
m_compiler->lvaSetVarDoNotEnregister(dstLcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::LocalField));

// Check if the destination has a regularly promoted field at this offset.
LclVarDsc* dstLclDsc = m_compiler->lvaGetDesc(dstLcl);
unsigned dstLclOffs = dstLcl->GetLclOffs() + remainderStrategy.PrimitiveOffset;

unsigned int fieldLcl =
dstLclDsc->lvPromoted ? m_compiler->lvaGetFieldLocal(dstLclDsc, dstLclOffs) : BAD_VAR_NUM;
if (fieldLcl != BAD_VAR_NUM)
{
LclVarDsc* dsc = m_compiler->lvaGetDesc(fieldLcl);
if (genTypeSize(dsc->lvType) == genTypeSize(remainderStrategy.PrimitiveType))
{
// Since the destination is regularly promoted the
// source must be physically promoted to get here. That
// means we always expect to see a LCL_FLD for the
// source here that we can retype to what matches the
// promoted field.
assert(src->OperIs(GT_LCL_FLD));
src->gtType = dsc->lvType;

store = m_compiler->gtNewStoreLclVarNode(fieldLcl, src);
}
}

if (store == nullptr)
{
store = m_compiler->gtNewStoreLclFldNode(dstLcl->GetLclNum(), src->TypeGet(), dstLclOffs, src);
m_compiler->lvaSetVarDoNotEnregister(dstLcl->GetLclNum()
DEBUGARG(DoNotEnregisterReason::LocalField));
}
}
else
{
store = m_compiler->gtNewStoreIndNode(remainderStrategy.PrimitiveType,
grabAddr(remainderStrategy.PrimitiveOffset), src);
store = m_compiler->gtNewStoreIndNode(src->TypeGet(), grabAddr(remainderStrategy.PrimitiveOffset), src);
PropagateIndirFlags(store, indirFlags);
}

Expand Down