Support Write-Thru of EH variables in LSRA #543
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -239,15 +239,18 @@ void CodeGen::genCodeForBBlist() | |
| { | ||
| newRegByrefSet |= varDsc->lvRegMask(); | ||
| } | ||
| if (!varDsc->lvLiveInOutOfHndlr) | ||
| { | ||
| #ifdef DEBUG | ||
| if (verbose && VarSetOps::IsMember(compiler, gcInfo.gcVarPtrSetCur, varIndex)) | ||
| { | ||
| VarSetOps::AddElemD(compiler, removedGCVars, varIndex); | ||
| } | ||
| #endif // DEBUG | ||
| VarSetOps::RemoveElemD(compiler, gcInfo.gcVarPtrSetCur, varIndex); | ||
| } | ||
| } | ||
| if ((!varDsc->lvIsInReg() || varDsc->lvLiveInOutOfHndlr) && compiler->lvaIsGCTracked(varDsc)) | ||
| { | ||
| #ifdef DEBUG | ||
| if (verbose && !VarSetOps::IsMember(compiler, gcInfo.gcVarPtrSetCur, varIndex)) | ||
|
|
@@ -823,10 +826,20 @@ void CodeGen::genSpillVar(GenTree* tree) | |
| var_types lclTyp = genActualType(varDsc->TypeGet()); | ||
| emitAttr size = emitTypeSize(lclTyp); | ||
|
|
||
| // If this is a write-thru variable, we don't actually spill at a use, but we will kill the var in the reg | ||
| // (below). | ||
| if (!varDsc->lvLiveInOutOfHndlr) | ||
| { | ||
| instruction storeIns = ins_Store(lclTyp, compiler->isSIMDTypeLocalAligned(varNum)); | ||
| assert(varDsc->GetRegNum() == tree->GetRegNum()); | ||
| inst_TT_RV(storeIns, size, tree, tree->GetRegNum()); | ||
| } | ||
|
|
||
| // We should only have both GTF_SPILL (i.e. the flag causing this method to be called) and | ||
| // GTF_SPILLED on a write-thru def, for which we should not be calling this method. | ||
| assert((tree->gtFlags & GTF_SPILLED) == 0); | ||
|
|
||
| // Remove the live var from the register. | ||
| genUpdateRegLife(varDsc, /*isBorn*/ false, /*isDying*/ true DEBUGARG(tree)); | ||
| gcInfo.gcMarkRegSetNpt(varDsc->lvRegMask()); | ||
|
|
||
|
|
@@ -847,10 +860,19 @@ void CodeGen::genSpillVar(GenTree* tree) | |
| } | ||
|
|
||
| tree->gtFlags &= ~GTF_SPILL; | ||
| // If this is NOT a write-thru, reset the var location. | ||
| if ((tree->gtFlags & GTF_SPILLED) == 0) | ||
| { | ||
| varDsc->SetRegNum(REG_STK); | ||
| if (varTypeIsMultiReg(tree)) | ||
| { | ||
| varDsc->SetOtherReg(REG_STK); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| // We only have 'GTF_SPILL' and 'GTF_SPILLED' on a def of a write-thru lclVar. | ||
| assert(varDsc->lvLiveInOutOfHndlr && ((tree->gtFlags & GTF_VAR_DEF) != 0)); | ||
| } | ||
|
|
||
| #ifdef USING_VARIABLE_LIVE_RANGE | ||
|
|
@@ -1030,13 +1052,16 @@ void CodeGen::genUnspillRegIfNeeded(GenTree* tree) | |
| } | ||
| #endif // USING_VARIABLE_LIVE_RANGE | ||
|
|
||
| if (!varDsc->lvLiveInOutOfHndlr) | ||
| { | ||
| #ifdef DEBUG | ||
| if (VarSetOps::IsMember(compiler, gcInfo.gcVarPtrSetCur, varDsc->lvVarIndex)) | ||
| { | ||
| JITDUMP("\t\t\t\t\t\t\tRemoving V%02u from gcVarPtrSetCur\n", lcl->GetLclNum()); | ||
| } | ||
| #endif // DEBUG | ||
| VarSetOps::RemoveElemD(compiler, gcInfo.gcVarPtrSetCur, varDsc->lvVarIndex); | ||
| } | ||
|
|
||
| #ifdef DEBUG | ||
| if (compiler->verbose) | ||
|
|
@@ -1316,15 +1341,15 @@ regNumber CodeGen::genConsumeReg(GenTree* tree) | |
| LclVarDsc* varDsc = &compiler->lvaTable[lcl->GetLclNum()]; | ||
| assert(varDsc->lvLRACandidate); | ||
|
|
||
| if (varDsc->GetRegNum() == REG_STK) | ||
| { | ||
| // We have loaded this into a register only temporarily | ||
| gcInfo.gcMarkRegSetNpt(genRegMask(tree->GetRegNum())); | ||
| } | ||
| else if ((tree->gtFlags & GTF_VAR_DEATH) != 0) | ||
| { | ||
| gcInfo.gcMarkRegSetNpt(genRegMask(varDsc->GetRegNum())); | ||
| } | ||
| } | ||
| else | ||
| { | ||
|
|
@@ -1852,13 +1877,24 @@ void CodeGen::genProduceReg(GenTree* tree) | |
|
|
||
| if (genIsRegCandidateLocal(tree)) | ||
| { | ||
| unsigned varNum = tree->AsLclVarCommon()->GetLclNum(); | ||
| LclVarDsc* varDsc = compiler->lvaGetDesc(varNum); | ||
| assert(!varDsc->lvNormalizeOnStore() || (tree->TypeGet() == genActualType(varDsc->TypeGet()))); | ||
|
|
||
| // If we reach here, we have a register candidate local that is marked with GTF_SPILL. | ||
| // This flag generally means that we need to spill this local. | ||
| // The exception is the case of a use of an EH var use that is being "spilled" | ||
| // to the stack, indicated by GTF_SPILL (note that all EH lclVar defs are always | ||
| // spilled, i.e. write-thru). | ||
| // An EH var use is always valid on the stack (so we don't need to actually spill it), | ||
| // but the GTF_SPILL flag records the fact that the register value is going dead. | ||
| if (((tree->gtFlags & GTF_VAR_DEF) != 0) || !varDsc->lvLiveInOutOfHndlr) | ||
|
||
| { | ||
| // Store local variable to its home location. | ||
| // Ensure that lclVar stores are typed correctly. | ||
| inst_TT_RV(ins_Store(tree->gtType, compiler->isSIMDTypeLocalAligned(varNum)), | ||
| emitTypeSize(tree->TypeGet()), tree, tree->GetRegNum()); | ||
| } | ||
| } | ||
| else | ||
| { | ||
|
|
||
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
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.
Should we consider any of these
lvLiveInOutofHndlrasserts as candidates fornoway_assert?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.
I've pretty much left the assert\noway_assert distinction as-is - these are generally just either expanding or contracting the condition for an assert.