-
Notifications
You must be signed in to change notification settings - Fork 5k
JIT: Escape analysis cleanup #114716
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
Merged
Merged
JIT: Escape analysis cleanup #114716
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -960,12 +960,6 @@ bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNum, | |||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| if (comp->info.compCompHnd->getTypeForBoxOnStack(clsHnd) == NO_CLASS_HANDLE) | ||||||
| { | ||||||
| *reason = "[no boxed type available]"; | ||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| classSize = comp->info.compCompHnd->getClassSize(clsHnd); | ||||||
| } | ||||||
| else | ||||||
|
|
@@ -1061,6 +1055,7 @@ ObjectAllocator::ObjectAllocationType ObjectAllocator::AllocationKind(GenTree* t | |||||
| return allocType; | ||||||
| } | ||||||
|
|
||||||
| //------------------------------------------------------------------------ | ||||||
| // MorphAllocObjNodes: Morph each GT_ALLOCOBJ node either into an | ||||||
| // allocation helper call or stack allocation. | ||||||
| // | ||||||
|
|
@@ -1203,13 +1198,11 @@ bool ObjectAllocator::MorphAllocObjNodes() | |||||
| //------------------------------------------------------------------------ | ||||||
|
|
||||||
| CORINFO_CLASS_HANDLE clsHnd = data->AsAllocObj()->gtAllocObjClsHnd; | ||||||
| CORINFO_CLASS_HANDLE stackClsHnd = clsHnd; | ||||||
| const bool isValueClass = comp->info.compCompHnd->isValueClass(clsHnd); | ||||||
|
|
||||||
| if (isValueClass) | ||||||
| { | ||||||
| comp->Metrics.NewBoxedValueClassHelperCalls++; | ||||||
| stackClsHnd = comp->info.compCompHnd->getTypeForBoxOnStack(clsHnd); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
|
|
@@ -1221,29 +1214,31 @@ bool ObjectAllocator::MorphAllocObjNodes() | |||||
| // reason set by the call | ||||||
| canStack = false; | ||||||
| } | ||||||
| else if (stackClsHnd == NO_CLASS_HANDLE) | ||||||
| { | ||||||
| assert(isValueClass); | ||||||
| onHeapReason = "[no class handle for this boxed value class]"; | ||||||
| canStack = false; | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| JITDUMP("Allocating V%02u on the stack\n", lclNum); | ||||||
| canStack = true; | ||||||
| const unsigned int stackLclNum = | ||||||
| MorphAllocObjNodeIntoStackAlloc(data->AsAllocObj(), stackClsHnd, isValueClass, block, stmt); | ||||||
| m_HeapLocalToStackLocalMap.AddOrUpdate(lclNum, stackLclNum); | ||||||
|
|
||||||
| ClassLayout* layout = nullptr; | ||||||
|
|
||||||
| if (isValueClass) | ||||||
| { | ||||||
| CORINFO_CLASS_HANDLE boxedClsHnd = comp->info.compCompHnd->getTypeForBox(clsHnd); | ||||||
| assert(boxedClsHnd != NO_CLASS_HANDLE); | ||||||
| ClassLayout* structLayout = comp->typGetObjLayout(boxedClsHnd); | ||||||
| layout = GetBoxedLayout(structLayout); | ||||||
| comp->Metrics.StackAllocatedBoxedValueClasses++; | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| layout = comp->typGetObjLayout(clsHnd); | ||||||
| comp->Metrics.StackAllocatedRefClasses++; | ||||||
| } | ||||||
|
|
||||||
| const unsigned int stackLclNum = | ||||||
| MorphAllocObjNodeIntoStackAlloc(data->AsAllocObj(), layout, block, stmt); | ||||||
| m_HeapLocalToStackLocalMap.AddOrUpdate(lclNum, stackLclNum); | ||||||
|
|
||||||
| bashCall = true; | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -1449,8 +1444,7 @@ unsigned int ObjectAllocator::MorphNewArrNodeIntoStackAlloc(GenTreeCall* | |||||
| // allocation. | ||||||
| // Arguments: | ||||||
| // allocObj - GT_ALLOCOBJ that will be replaced by a stack allocation | ||||||
| // clsHnd - class representing the stack allocated object | ||||||
| // isValueClass - we are stack allocating a boxed value class | ||||||
| // layout - layout for the stack allocated objectd | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Typo in the comment: 'objectd' should be corrected to 'object'.
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| // block - a basic block where allocObj is | ||||||
| // stmt - a statement where allocObj is | ||||||
| // | ||||||
|
|
@@ -1460,24 +1454,29 @@ unsigned int ObjectAllocator::MorphNewArrNodeIntoStackAlloc(GenTreeCall* | |||||
| // Notes: | ||||||
| // This function can insert additional statements before stmt. | ||||||
| // | ||||||
| unsigned int ObjectAllocator::MorphAllocObjNodeIntoStackAlloc( | ||||||
| GenTreeAllocObj* allocObj, CORINFO_CLASS_HANDLE clsHnd, bool isValueClass, BasicBlock* block, Statement* stmt) | ||||||
| unsigned int ObjectAllocator::MorphAllocObjNodeIntoStackAlloc(GenTreeAllocObj* allocObj, | ||||||
| ClassLayout* layout, | ||||||
| BasicBlock* block, | ||||||
| Statement* stmt) | ||||||
| { | ||||||
| assert(allocObj != nullptr); | ||||||
| assert(m_AnalysisDone); | ||||||
| assert(clsHnd != NO_CLASS_HANDLE); | ||||||
|
|
||||||
| const bool shortLifetime = false; | ||||||
| const unsigned int lclNum = comp->lvaGrabTemp(shortLifetime DEBUGARG( | ||||||
| isValueClass ? "stack allocated boxed value class temp" : "stack allocated ref class temp")); | ||||||
| #ifdef DEBUG | ||||||
| const char* lclName = comp->printfAlloc("stack allocated %.110s", layout->GetShortClassName()); | ||||||
| #endif | ||||||
|
|
||||||
| comp->lvaSetStruct(lclNum, clsHnd, /* unsafeValueClsCheck */ false); | ||||||
| const bool shortLifetime = false; | ||||||
| const unsigned int lclNum = comp->lvaGrabTemp(shortLifetime DEBUGARG(lclName)); | ||||||
| comp->lvaSetStruct(lclNum, layout, /* unsafeValueClsCheck */ false); | ||||||
|
|
||||||
| // Initialize the object memory if necessary. | ||||||
| bool bbInALoop = block->HasFlag(BBF_BACKWARD_JUMP); | ||||||
| bool bbIsReturn = block->KindIs(BBJ_RETURN); | ||||||
| LclVarDsc* const lclDsc = comp->lvaGetDesc(lclNum); | ||||||
| lclDsc->lvStackAllocatedObject = true; | ||||||
|
|
||||||
| // Initialize the object memory if necessary. | ||||||
| bool bbInALoop = block->HasFlag(BBF_BACKWARD_JUMP); | ||||||
| bool bbIsReturn = block->KindIs(BBJ_RETURN); | ||||||
|
|
||||||
| if (comp->fgVarNeedsExplicitZeroInit(lclNum, bbInALoop, bbIsReturn)) | ||||||
| { | ||||||
| //------------------------------------------------------------------------ | ||||||
|
|
@@ -2317,15 +2316,15 @@ void ObjectAllocator::RewriteUses() | |||||
| if (newType == TYP_I_IMPL) | ||||||
| { | ||||||
| // New layout with no gc refs + padding | ||||||
| newLayout = comp->typGetNonGCLayout(layout); | ||||||
| newLayout = GetNonGCLayout(layout); | ||||||
| JITDUMP("Changing layout of struct V%02u to block\n", lclNum); | ||||||
| lclVarDsc->ChangeLayout(newLayout); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| // New layout with all gc refs as byrefs + padding | ||||||
| // (todo, perhaps: see if old layout was already all byrefs) | ||||||
| newLayout = comp->typGetByrefLayout(layout); | ||||||
| newLayout = GetByrefLayout(layout); | ||||||
| JITDUMP("Changing layout of struct V%02u to byref\n", lclNum); | ||||||
| lclVarDsc->ChangeLayout(newLayout); | ||||||
| } | ||||||
|
|
@@ -4077,3 +4076,80 @@ void ObjectAllocator::CloneAndSpecialize() | |||||
|
|
||||||
| assert(numberOfClonedRegions == m_regionsToClone); | ||||||
| } | ||||||
|
|
||||||
| //------------------------------------------------------------------------------ | ||||||
| // GetBoxedLayout: get a layout for a boxed version of a struct | ||||||
| // | ||||||
| // Arguments: | ||||||
| // layout - layout of the struct | ||||||
| // | ||||||
| // Notes: | ||||||
| // For Nullable<T>, layout class should be T | ||||||
| // | ||||||
| ClassLayout* ObjectAllocator::GetBoxedLayout(ClassLayout* layout) | ||||||
| { | ||||||
| assert(layout->IsValueClass()); | ||||||
|
|
||||||
| ClassLayoutBuilder b(comp, TARGET_POINTER_SIZE + layout->GetSize()); | ||||||
| b.CopyPaddingFrom(TARGET_POINTER_SIZE, layout); | ||||||
| b.CopyGCInfoFrom(TARGET_POINTER_SIZE, layout); | ||||||
|
|
||||||
| #ifdef DEBUG | ||||||
| b.CopyNameFrom(layout, "[boxed] "); | ||||||
| #endif | ||||||
|
|
||||||
| return comp->typGetCustomLayout(b); | ||||||
| } | ||||||
|
|
||||||
| //------------------------------------------------------------------------------ | ||||||
| // GetNonGCLayout: get a layout with the same size and padding as an existing | ||||||
| // layout, but with no GC fields. | ||||||
| // | ||||||
| // Arguments: | ||||||
| // layout - existing layout to use as template | ||||||
| // | ||||||
| ClassLayout* ObjectAllocator::GetNonGCLayout(ClassLayout* layout) | ||||||
| { | ||||||
| assert(layout->HasGCPtr()); | ||||||
| ClassLayoutBuilder b(comp, layout->GetSize()); | ||||||
| b.CopyPaddingFrom(0, layout); | ||||||
|
|
||||||
| #ifdef DEBUG | ||||||
| b.CopyNameFrom(layout, "[nongc] "); | ||||||
| #endif | ||||||
|
|
||||||
| return comp->typGetCustomLayout(b); | ||||||
| } | ||||||
|
|
||||||
| //------------------------------------------------------------------------------ | ||||||
| // GetByrefLayout: get a layout with the same size and padding as an existing | ||||||
| // layout, but with all GC fields retyped to byref. | ||||||
| // | ||||||
| // Arguments: | ||||||
| // layout - existing layout to use as template | ||||||
| // | ||||||
| ClassLayout* ObjectAllocator::GetByrefLayout(ClassLayout* layout) | ||||||
| { | ||||||
| assert(layout->HasGCPtr()); | ||||||
| ClassLayoutBuilder b(comp, layout->GetSize()); | ||||||
| b.CopyPaddingFrom(0, layout); | ||||||
|
|
||||||
| if (layout->GetGCPtrCount() > 0) | ||||||
| { | ||||||
| for (unsigned slot = 0; slot < layout->GetSlotCount(); slot++) | ||||||
| { | ||||||
| var_types gcType = layout->GetGCPtrType(slot); | ||||||
| if (gcType == TYP_REF) | ||||||
| { | ||||||
| gcType = TYP_BYREF; | ||||||
| } | ||||||
| b.SetGCPtrType(slot, gcType); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| #ifdef DEBUG | ||||||
| b.CopyNameFrom(layout, "[byref] "); | ||||||
| #endif | ||||||
|
|
||||||
| return comp->typGetCustomLayout(b); | ||||||
| } | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this purely for correct handling of nullables?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes