Skip to content

JIT: Simplify gtHasLocalsWithAddrOp#131756

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

Closed
jakobbotsch wants to merge 1 commit into from
Closed

JIT: Simplify gtHasLocalsWithAddrOp#131756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

static bool gtHasRef(GenTree* tree, unsigned lclNum);

bool gtHasLocalsWithAddrOp(GenTree* tree);
bool gtHasLocalValueWithAddrOp(GenTree* tree);
bool gtHasAddressExposedLocals(GenTree* tree);

unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/fgopt.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

if (early)
{
tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
}

// We do not support embedded statements in the terminator node.
Expand Down
25 changes: 17 additions & 8 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.
//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
{
enum
{
DoPreOrder = true,
DoLclVarsOnly = true,
};

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
: GenTreeVisitor(comp)
{
}

fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
{
if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
{
return WALK_CONTINUE;
}

LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
{
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
}
};

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down
10 changes: 4 additions & 6 deletions src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

// We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
// considered as such in the interference checking.
if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
{
flags |= GTF_GLOB_REF;
}
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
GenTree* tree = stackState.esStack[i].val;

if ((tree->gtFlags & spillFlags) != 0 ||
(spillGlobEffects && // Only consider the following when spillGlobEffects == true
!impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
// lvAddrTaken flag.
// Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
(spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
{
impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
}
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
// which is safe in this case.
//
// Instead mark the arg as having a caller local ref.
if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
if (gtHasLocalValueWithAddrOp(curArgVal))
{
argInfo->argHasCallerLocalRef = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/indirectcalltransformer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
for (GenTree** use : m_origCall->UseEdges())
{
GenTree* node = *use;
if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
{
SpillUseToTemp(block, use);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
JIT: Simplify `gtHasLocalsWithAddrOp` by jakobbotsch · Pull Request #131756 · dotnet/runtime · GitHub
Skip to content
JIT: Simplify gtHasLocalsWithAddrOp#131756

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading

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

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

 Closed

jakobbotsch
wants to merge
1
commit into

from

 Closed


JIT: Simplify gtHasLocalsWithAddrOp#131756
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3949,7 +3949,7 @@ class Compiler

 static bool gtHasRef(GenTree* tree, unsigned lclNum);

 bool gtHasLocalsWithAddrOp(GenTree* tree);
 bool gtHasLocalValueWithAddrOp(GenTree* tree);
 bool gtHasAddressExposedLocals(GenTree* tree);

 unsigned gtSetCallArgsOrder(CallArgs* args, bool lateArgs, int* callCostEx, int* callCostSz);
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/jit/fgopt.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5817,8 +5817,8 @@ bool Compiler::fgCanMoveFirstStatementIntoPred(bool early, Statement* firstStmt,

 if (early)
 {
 tree1Flags |= gtHasLocalsWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalsWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 tree1Flags |= gtHasLocalValueWithAddrOp(tree1) ? GTF_GLOB_REF : GTF_EMPTY;
 tree2Flags |= gtHasLocalValueWithAddrOp(tree2) ? GTF_GLOB_REF : GTF_EMPTY;
 }

 // We do not support embedded statements in the terminator node.
Expand Down

25 changes: 17 additions & 8 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3247,33 +3247,42 @@ GenTree** GenTree::EffectiveUse(GenTree** use)
}

//------------------------------------------------------------------------------
// gtHasLocalsWithAddrOp:
// Check if this tree contains locals with lvHasLdAddrOp or
// IsAddressExposed() flags set. Does a full tree walk.
// gtHasLocalValueWithAddrOp:
// Check if this tree contains uses of the value of locals with lvHasLdAddrOp
// or IsAddressExposed() flags set. Does a full tree walk.
//
// Paramters:
// tree - the tree
//
// Return Value:
// True if any sub tree is such a local.
// True if any sub tree is such a local use.
Comment thread
jakobbotsch marked this conversation as resolved.

//
// Remarks:
// Only GT_LCL_VAR and GT_LCL_FLD nodes are considered; addresses of locals
// (GT_LCL_ADDR) and stores to locals are not.
//
bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
bool Compiler::gtHasLocalValueWithAddrOp(GenTree* tree)
{
 struct LocalsWithAddrOpVisitor : GenTreeVisitor<LocalsWithAddrOpVisitor>
 struct LocalValueWithAddrOpVisitor : GenTreeVisitor<LocalValueWithAddrOpVisitor>
 {
 enum
 {
 DoPreOrder = true,
 DoLclVarsOnly = true,
 };

LocalsWithAddrOpVisitor(Compiler* comp)
LocalValueWithAddrOpVisitor(Compiler* comp)
 : GenTreeVisitor(comp)
 {
 }

 fgWalkResult PreOrderVisit(GenTree** use, GenTree* user)
 {
 if (!(*use)->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 return WALK_CONTINUE;
 }

 LclVarDsc* varDsc = m_compiler->lvaGetDesc((*use)->AsLclVarCommon());
 if (varDsc->lvHasLdAddrOp || varDsc->IsAddressExposed())
 {
Expand All@@ -3284,7 +3293,7 @@ bool Compiler::gtHasLocalsWithAddrOp(GenTree* tree)
 }
 };

LocalsWithAddrOpVisitor visitor(this);
LocalValueWithAddrOpVisitor visitor(this);
 return visitor.WalkTree(&tree, nullptr) == WALK_ABORT;
}

Expand Down

10 changes: 4 additions & 6 deletions
src/coreclr/jit/importer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,7 +420,7 @@ void Compiler::impAppendStmt(Statement* stmt, unsigned chkLevel, bool checkConsu

 // We don't mark indirections off of "aliased" locals with GLOB_REF, but they must still be
 // considered as such in the interference checking.
 if (((flags & GTF_GLOB_REF) == 0) && !impIsAddressInLocal(value) && gtHasLocalsWithAddrOp(value))
 if (((flags & GTF_GLOB_REF) == 0) && gtHasLocalValueWithAddrOp(value))
 {
 flags |= GTF_GLOB_REF;
 }
Expand DownExpand Up@@ -1843,10 +1843,8 @@ void Compiler::impSpillSideEffect(bool spillGlobEffects, unsigned i DEBUGARG(con
 GenTree* tree = stackState.esStack[i].val;

 if ((tree->gtFlags & spillFlags) != 0 ||
 (spillGlobEffects && // Only consider the following when spillGlobEffects == true
 !impIsAddressInLocal(tree) && // No need to spill the LCL_ADDR nodes.
 gtHasLocalsWithAddrOp(tree))) // Spill if we still see GT_LCL_VAR that contains lvHasLdAddrOp or
 // lvAddrTaken flag.
 // Spill if we still see uses of locals that have lvHasLdAddrOp or are address exposed.
 (spillGlobEffects && gtHasLocalValueWithAddrOp(tree)))
 {
 impSpillStackEntry(i, BAD_VAR_NUM DEBUGARG(false) DEBUGARG(reason));
 }
Expand DownExpand Up@@ -13970,7 +13968,7 @@ void Compiler::impInlineRecordArgInfo(InlineInfo* pInlineInfo,
 // which is safe in this case.
 //
 // Instead mark the arg as having a caller local ref.
 if (!argInfo->argIsInvariant && gtHasLocalsWithAddrOp(curArgVal))
 if (gtHasLocalValueWithAddrOp(curArgVal))
 {
 argInfo->argHasCallerLocalRef = true;
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/jit/indirectcalltransformer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ class IndirectCallTransformer
 for (GenTree** use : m_origCall->UseEdges())
 {
 GenTree* node = *use;
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalsWithAddrOp(node))
 if (((node->gtFlags & GTF_ALL_EFFECT) != 0) || m_compiler->gtHasLocalValueWithAddrOp(node))
 {
 SpillUseToTemp(block, use);
 }
Expand Down
Loading