JIT: extend copy prop to local fields#74384

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
AndyAyersMS merged 8 commits into from
Aug 30, 2022
Merged

JIT: extend copy prop to local fields #74384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1d8333
JIT: extend copy prop to local fields
AndyAyersMS Aug 22, 2022
aafa84b
fix x86 issue
AndyAyersMS Aug 24, 2022
bd69556
alternate version where we gen during morph block
AndyAyersMS Aug 23, 2022
0360119
plumb flag through to decide what to do in fgMorphTreeDone
AndyAyersMS Aug 24, 2022
a5ea0eb
First bit of feedback.
AndyAyersMS Aug 25, 2022
813f22e
restore GTF_DEBUG_NODE_MORPHED checks
AndyAyersMS Aug 25, 2022
acfdc15
Merge remote-tracking branch 'upstream/main' into CopyPropLclFld
AndyAyersMS Aug 25, 2022
752e701
add comment and layout check to optCreateAssertion
AndyAyersMS Aug 25, 2022
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
118 changes: 117 additions & 1 deletion src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
//
// Copy Assertions
//
case GT_OBJ:
case GT_BLK:
{
// TODO-ADDR: delete once local morph folds SIMD-typed indirections.
//
GenTree* const addr = op2->AsIndir()->Addr();

if (addr->OperIs(GT_ADDR))
{
GenTree* const base = addr->AsOp()->gtOp1;

if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
{
ClassLayout* const varLayout = base->GetLayout(this);
ClassLayout* const objLayout = op2->GetLayout(this);
if (ClassLayout::AreCompatible(varLayout, objLayout))
{
op2 = base;
goto IS_COPY;
}
}
}

goto DONE_ASSERTION;
}

case GT_LCL_VAR:
{
IS_COPY:
//
// Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
//
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
return false;
}

unsigned lclNum = tree->AsLclVar()->GetLclNum();
// No ZEROOBJ assertions for simd.
//
if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.
{
return false;
}

const unsigned lclNum = tree->AsLclVar()->GetLclNum();
AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
if (assertionIndex == NO_ASSERTION_INDEX)
{
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
return nullptr;
}

// Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
//
if (tree->OperIs(GT_LCL_FLD))
{
if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())

@SingleAccretionSingleAccretionAug 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.

Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.

@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.

@SingleAccretionSingleAccretionAug 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs

I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).

{
return nullptr;
}
else
{
lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
}
}

tree->SetLclNum(copyLclNum);
tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
// If we have a var definition then bail or
// If this is the address of the var then it will have the GTF_DONT_CSE
// flag set and we don't want to to assertion prop on it.
if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
{
return nullptr;
}

// Only run during local prop and if copies are available.
//
if (!optLocalAssertionProp || !optCanPropLclVar)
{
return nullptr;
}

BitVecOps::Iter iter(apTraits, assertions);
unsigned index = 0;
while (iter.NextElem(&index))
{
AssertionIndex assertionIndex = GetAssertionIndex(index);
if (assertionIndex > optAssertionCount)
{
break;
}

// See if the variable is equal to another variable.
AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
if (!curAssertion->CanPropLclVar())
{
continue;
}

// Copy prop.
if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
{
// Perform copy assertion prop.
GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
if (newTree != nullptr)
{
return newTree;
}
}

continue;
}

return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
case GT_LCL_VAR:
return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

case GT_LCL_FLD:
return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

case GT_ASG:
return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down
8 changes: 5 additions & 3 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
GenTree* fgMorphCopyBlock(GenTree* tree);
GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
GenTree* fgMorphForRegisterFP(GenTree* tree);
GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.
GenTree* fgOptimizeCast(GenTreeCast* cast);
GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
GenTree* fgMorphRetInd(GenTreeUnOp* tree);
GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
void fgMorphTreeDone(GenTree* tree);
void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
// Assertion propagation functions.
GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
JIT: extend copy prop to local fields#74384

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

AndyAyersMS
merged 8 commits into

from

Aug 30, 2022
 Merged


JIT: extend copy prop to local fields
#74384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1d8333

JIT: extend copy prop to local fields


AndyAyersMS Aug 22, 2022
aafa84b

fix x86 issue


AndyAyersMS Aug 24, 2022
bd69556

alternate version where we gen during morph block


AndyAyersMS Aug 23, 2022
0360119

plumb flag through to decide what to do in fgMorphTreeDone


AndyAyersMS Aug 24, 2022
a5ea0eb

First bit of feedback.


AndyAyersMS Aug 25, 2022
813f22e

restore GTF_DEBUG_NODE_MORPHED checks


AndyAyersMS Aug 25, 2022
acfdc15

Merge remote-tracking branch 'upstream/main' into CopyPropLclFld


AndyAyersMS Aug 25, 2022
752e701

add comment and layout check to optCreateAssertion


AndyAyersMS Aug 25, 2022

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


118 changes: 117 additions & 1 deletion
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1636,8 +1636,35 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
 //
 // Copy Assertions
 //
 case GT_OBJ:
 case GT_BLK:
 {
 // TODO-ADDR: delete once local morph folds SIMD-typed indirections.
 //
 GenTree* const addr = op2->AsIndir()->Addr();

 if (addr->OperIs(GT_ADDR))
 {
 GenTree* const base = addr->AsOp()->gtOp1;

 if (base->OperIs(GT_LCL_VAR) && varTypeIsStruct(base))
 {
 ClassLayout* const varLayout = base->GetLayout(this);
 ClassLayout* const objLayout = op2->GetLayout(this);
 if (ClassLayout::AreCompatible(varLayout, objLayout))
 {
 op2 = base;
 goto IS_COPY;
 }
 }
 }

 goto DONE_ASSERTION;
 }

 case GT_LCL_VAR:
 {
 IS_COPY:
 //
 // Must either be an OAK_EQUAL or an OAK_NOT_EQUAL assertion
 //
Expand DownExpand Up@@ -3416,7 +3443,14 @@ bool Compiler::optZeroObjAssertionProp(GenTree* tree, ASSERT_VALARG_TP assertion
 return false;
 }

 unsigned lclNum = tree->AsLclVar()->GetLclNum();
 // No ZEROOBJ assertions for simd.
 //
 if (varTypeIsSIMD(tree))
Comment thread
kunalspathak marked this conversation as resolved.

 {
 return false;
 }

 const unsigned lclNum = tree->AsLclVar()->GetLclNum();
 AssertionIndex assertionIndex = optLocalAssertionIsEqualOrNotEqual(O1K_LCLVAR, lclNum, O2K_ZEROOBJ, 0, assertions);
 if (assertionIndex == NO_ASSERTION_INDEX)
 {
Expand DownExpand Up@@ -3568,6 +3602,20 @@ GenTree* Compiler::optCopyAssertionProp(AssertionDsc* curAssertion,
 return nullptr;
 }

 // Heuristic: for LclFld prop, don't force the copy or its promoted fields to be in memory.
 //
 if (tree->OperIs(GT_LCL_FLD))
 {
 if (copyVarDsc->IsEnregisterableLcl() || copyVarDsc->lvPromotedStruct())
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Nit: one almost never wants to call lvPromotedStruct() instead of just checking lvPromoted. If we start having non-struct promoted variables in the future, we'll want this behavior for them as well.
Orthogonally, this is a bit conservative. If we already know copyVarDsc is not going to be enregistered, it should be ok to propagate it, so lvaGetPromotionType(copyVarDsc) == PROMOTION_TYPE_INDEPENDENT should in theory be a better check.
@AndyAyersMSAndyAyersMSAug 22, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs. Will have to look more closely.
@SingleAccretionSingleAccretionAug 22, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I saw quite a few more regressions with promoted structs
I suppose that addresses the PROMOTION_TYPE_INDEPENDENT idea. Guessing these could have been from SSA-based optimization not working as well (since promoted structs are excluded from all of them).
 {
 return nullptr;
 }
 else
 {
 lvaSetVarDoNotEnregister(copyLclNum DEBUGARG(DoNotEnregisterReason::LocalField));
 }
 }

 tree->SetLclNum(copyLclNum);
 tree->SetSsaNum(copySsaNum);

Expand DownExpand Up@@ -3689,6 +3737,71 @@ GenTree* Compiler::optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeL
 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_LclFld: try and optimize a local field use via assertions
//
// Arguments:
// assertions - set of live assertions
// tree - local field use to optimize
// stmt - statement containing the tree
//
// Returns:
// Updated tree, or nullptr
//
// Notes:
// stmt may be nullptr during local assertion prop
//
GenTree* Compiler::optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt)
{
 // If we have a var definition then bail or
 // If this is the address of the var then it will have the GTF_DONT_CSE
 // flag set and we don't want to to assertion prop on it.
 if (tree->gtFlags & (GTF_VAR_DEF | GTF_DONT_CSE))
 {
 return nullptr;
 }

 // Only run during local prop and if copies are available.
 //
 if (!optLocalAssertionProp || !optCanPropLclVar)
 {
 return nullptr;
 }

 BitVecOps::Iter iter(apTraits, assertions);
 unsigned index = 0;
 while (iter.NextElem(&index))
 {
 AssertionIndex assertionIndex = GetAssertionIndex(index);
 if (assertionIndex > optAssertionCount)
 {
 break;
 }

 // See if the variable is equal to another variable.
 AssertionDsc* curAssertion = optGetAssertion(assertionIndex);
 if (!curAssertion->CanPropLclVar())
 {
 continue;
 }

 // Copy prop.
 if (curAssertion->op2.kind == O2K_LCLVAR_COPY)
 {
 // Perform copy assertion prop.
 GenTree* newTree = optCopyAssertionProp(curAssertion, tree, stmt DEBUGARG(assertionIndex));
 if (newTree != nullptr)
 {
 return newTree;
 }
 }

 continue;
 }

 return nullptr;
}

//------------------------------------------------------------------------
// optAssertionProp_Asg: Try and optimize an assignment via assertions.
//
Expand DownExpand Up@@ -4916,6 +5029,9 @@ GenTree* Compiler::optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree,
 case GT_LCL_VAR:
 return optAssertionProp_LclVar(assertions, tree->AsLclVarCommon(), stmt);

 case GT_LCL_FLD:
 return optAssertionProp_LclFld(assertions, tree->AsLclVarCommon(), stmt);

 case GT_ASG:
 return optAssertionProp_Asg(assertions, tree->AsOp(), stmt);

Expand Down

8 changes: 5 additions & 3 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5767,7 +5767,7 @@ class Compiler
 GenTree* fgMorphCopyBlock(GenTree* tree);
 GenTree* fgMorphStoreDynBlock(GenTreeStoreDynBlk* tree);
 GenTree* fgMorphForRegisterFP(GenTree* tree);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac = nullptr);
 GenTree* fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optAssertionPropDone = nullptr);
Comment thread
kunalspathak marked this conversation as resolved.

 GenTree* fgOptimizeCast(GenTreeCast* cast);
 GenTree* fgOptimizeCastOnAssignment(GenTreeOp* asg);
 GenTree* fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp);
Expand All@@ -5786,7 +5786,7 @@ class Compiler
 GenTree* fgMorphRetInd(GenTreeUnOp* tree);
 GenTree* fgMorphModToSubMulDiv(GenTreeOp* tree);
 GenTree* fgMorphUModToAndSub(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree);
 GenTree* fgMorphSmpOpOptional(GenTreeOp* tree, bool* optAssertionPropDone);
 GenTree* fgMorphMultiOp(GenTreeMultiOp* multiOp);
 GenTree* fgMorphConst(GenTree* tree);

Expand All@@ -5802,7 +5802,8 @@ class Compiler
private:
 void fgKillDependentAssertionsSingle(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgKillDependentAssertions(unsigned lclNum DEBUGARG(GenTree* tree));
 void fgMorphTreeDone(GenTree* tree, GenTree* oldTree = nullptr DEBUGARG(int morphNum = 0));
 void fgMorphTreeDone(GenTree* tree);
 void fgMorphTreeDone(GenTree* tree, bool optAssertionPropDone, bool isMorphedTree DEBUGARG(int morphNum = 0));

 Statement* fgMorphStmt;

Expand DownExpand Up@@ -7368,6 +7369,7 @@ class Compiler
 // Assertion propagation functions.
 GenTree* optAssertionProp(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt, BasicBlock* block);
 GenTree* optAssertionProp_LclVar(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_LclFld(ASSERT_VALARG_TP assertions, GenTreeLclVarCommon* tree, Statement* stmt);
 GenTree* optAssertionProp_Asg(ASSERT_VALARG_TP assertions, GenTreeOp* asg, Statement* stmt);
 GenTree* optAssertionProp_Return(ASSERT_VALARG_TP assertions, GenTreeUnOp* ret, Statement* stmt);
 GenTree* optAssertionProp_Ind(ASSERT_VALARG_TP assertions, GenTree* tree, Statement* stmt);
Expand Down
Loading