Skip to content

[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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
carlossanlop merged 2 commits into from
Nov 10, 2022
Merged

[release/7.0] JIT: fix gc hole in peephole optimizations #78109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f8b60
JIT: fix gc hole in peephole optimizations
AndyAyersMS Nov 8, 2022
1c4bca1
revise per feedback
AndyAyersMS Nov 9, 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
14 changes: 14 additions & 0 deletions src/coreclr/jit/emit.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

instrDesc* emitLastIns;

// Check if a peephole optimization involving emitLastIns is safe.
//
// We must have a lastInstr to consult.
// The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
// The final check prevents looking across an IG boundary unless we're in an extension IG.
bool emitCanPeepholeLastIns()
{
return (emitLastIns != nullptr) && // there is an emitLastInstr
!emitForceNewIG && // and we're not about to start a new IG
((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
// and it's an extension IG
}

#ifdef TARGET_ARMARCH
instrDesc* emitLastMemBarrier;
#endif
Expand Down
13 changes: 5 additions & 8 deletions src/coreclr/jit/emitarm64.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
return false;
}

const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
const bool canOptimize = emitCanPeepholeLastIns();

if (dst == src)
{
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
{
// See if the previous instruction already cleared upper 4 bytes for us unintentionally
if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
{
JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
return true;
}
}
}

if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
(emitLastIns != nullptr) &&
if (canOptimize && // Don't optimize if unsafe.
(emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
(emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
{
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
{
return false;
}
Expand Down
28 changes: 12 additions & 16 deletions src/coreclr/jit/emitxarch.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
// If there are no instructions in this IG, we can look back at
// the previous IG's instructions if this IG is an extension.
// Only consider if safe
//
if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
if (!emitCanPeepholeLastIns())
{
return false;
}
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
return false;
}

// Don't look back across IG boundaries (possible control flow)
if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
// Only consider if safe
//
if (!emitCanPeepholeLastIns())
{
return false;
}
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
return false;
}

// Don't look back across IG boundaries (possible control flow)
if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
// Only consider if safe
//
if (!emitCanPeepholeLastIns())
{
return false;
}
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
return true;
}

bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

// TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
// functionality even if their actual identifier differs and we should optimize these

if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
(emitLastIns == nullptr) || // or if a last instruction doesn't exist
if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
(emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
(emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
(emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
return false;
}

bool hasSideEffect = HasSideEffect(ins, size);

bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
// TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
// functionality even if their actual identifier differs and we should optimize these

if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
(emitLastIns == nullptr) || // or if a last instruction doesn't exist
if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
(emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
(emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
{
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

const bool hasSideEffect = HasSideEffect(ins, size);

// Check if the last instruction and current instructions use the same register and local memory.
if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
{
Expand Down
, '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" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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('^' + ".*" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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('^' + ".*" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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('^' + ".*" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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('^' + ".*" + '
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down

, '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); }
})();
})();
[release/7.0] JIT: fix gc hole in peephole optimizations by github-actions[bot] · Pull Request #78109 · dotnet/runtime · GitHub
Skip to content
[release/7.0] JIT: fix gc hole in peephole optimizations#78109

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

carlossanlop
merged 2 commits into

from

Nov 10, 2022
 Merged


[release/7.0] JIT: fix gc hole in peephole optimizations
#78109
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
50f8b60

JIT: fix gc hole in peephole optimizations


AndyAyersMS Nov 8, 2022
1c4bca1

revise per feedback


AndyAyersMS Nov 9, 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


14 changes: 14 additions & 0 deletions
src/coreclr/jit/emit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2179,6 +2179,20 @@ class emitter

 instrDesc* emitLastIns;

 // Check if a peephole optimization involving emitLastIns is safe.
 //
 // We must have a lastInstr to consult.
 // The emitForceNewIG check here prevents peepholes from crossing nogc boundaries.
 // The final check prevents looking across an IG boundary unless we're in an extension IG.
 bool emitCanPeepholeLastIns()
 {
 return (emitLastIns != nullptr) && // there is an emitLastInstr
 !emitForceNewIG && // and we're not about to start a new IG
 ((emitCurIGinsCnt > 0) || // and we're not at the start of a new IG
 ((emitCurIG->igFlags & IGF_EXTEND) != 0)); // or we are at the start of a new IG,
 // and it's an extension IG
 }

#ifdef TARGET_ARMARCH
 instrDesc* emitLastMemBarrier;
#endif
Expand Down

13 changes: 5 additions & 8 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15940,7 +15940,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 return false;
 }

 const bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 const bool canOptimize = emitCanPeepholeLastIns();

 if (dst == src)
 {
Expand All@@ -15960,17 +15960,16 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
 else if (isGeneralRegisterOrSP(dst) && (size == EA_4BYTE))
 {
 // See if the previous instruction already cleared upper 4 bytes for us unintentionally
 if (!isFirstInstrInBlock && (emitLastIns != nullptr) && (emitLastIns->idReg1() == dst) &&
(emitLastIns->idOpSize() == size) && emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 if (canOptimize && (emitLastIns->idReg1() == dst) && (emitLastIns->idOpSize() == size) &&
 emitLastIns->idInsIs(INS_ldr, INS_ldrh, INS_ldrb))
 {
 JITDUMP("\n -- suppressing mov because ldr already cleared upper 4 bytes\n");
 return true;
 }
 }
 }

 if (!isFirstInstrInBlock && // Don't optimize if instruction is not the first instruction in IG.
 (emitLastIns != nullptr) &&
 if (canOptimize && // Don't optimize if unsafe.
 (emitLastIns->idIns() == INS_mov) && // Don't optimize if last instruction was not 'mov'.
 (emitLastIns->idOpSize() == size)) // Don't optimize if operand size is different than previous instruction.
 {
Expand DownExpand Up@@ -16048,9 +16047,7 @@ bool emitter::IsRedundantMov(instruction ins, emitAttr size, regNumber dst, regN
bool emitter::IsRedundantLdStr(
 instruction ins, regNumber reg1, regNumber reg2, ssize_t imm, emitAttr size, insFormat fmt)
{
 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 if (((ins != INS_ldr) && (ins != INS_str)) || (isFirstInstrInBlock) || (emitLastIns == nullptr))
 if (((ins != INS_ldr) && (ins != INS_str)) || !emitCanPeepholeLastIns())
 {
 return false;
 }
Expand Down

28 changes: 12 additions & 16 deletions
src/coreclr/jit/emitxarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,10 +314,9 @@ bool emitter::IsFlagsAlwaysModified(instrDesc* id)

bool emitter::AreUpper32BitsZero(regNumber reg)
{
 // If there are no instructions in this IG, we can look back at
 // the previous IG's instructions if this IG is an extension.
 // Only consider if safe
 //
 if ((emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -397,8 +396,9 @@ bool emitter::AreFlagsSetToZeroCmp(regNumber reg, emitAttr opSize, genTreeOps tr
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -480,8 +480,9 @@ bool emitter::AreFlagsSetForSignJumpOpt(regNumber reg, emitAttr opSize, GenTree*
 return false;
 }

 // Don't look back across IG boundaries (possible control flow)
 if (emitCurIGinsCnt == 0 && ((emitCurIG->igFlags & IGF_EXTEND) == 0))
 // Only consider if safe
 //
 if (!emitCanPeepholeLastIns())
 {
 return false;
 }
Expand DownExpand Up@@ -4698,13 +4699,10 @@ bool emitter::IsRedundantMov(
 return true;
 }

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);

 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size) || // or if the operand size is different from the last instruction
 (emitLastIns->idInsFmt() != fmt)) // or if the format is different from the last instruction
Expand DownExpand Up@@ -7343,14 +7341,10 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 return false;
 }

 bool hasSideEffect = HasSideEffect(ins, size);

 bool isFirstInstrInBlock = (emitCurIGinsCnt == 0) && ((emitCurIG->igFlags & IGF_EXTEND) == 0);
 // TODO-XArch-CQ: Certain instructions, such as movaps vs movups, are equivalent in
 // functionality even if their actual identifier differs and we should optimize these

 if (isFirstInstrInBlock || // Don't optimize if instruction is the first instruction in IG.
 (emitLastIns == nullptr) || // or if a last instruction doesn't exist
 if (!emitCanPeepholeLastIns() || // Don't optimize if unsafe
 (emitLastIns->idIns() != ins) || // or if the instruction is different from the last instruction
 (emitLastIns->idOpSize() != size)) // or if the operand size is different from the last instruction
 {
Expand All@@ -7367,6 +7361,8 @@ bool emitter::IsRedundantStackMov(instruction ins, insFormat fmt, emitAttr size,
 int varNum = emitLastIns->idAddr()->iiaLclVar.lvaVarNum();
 int lastOffs = emitLastIns->idAddr()->iiaLclVar.lvaOffset();

 const bool hasSideEffect = HasSideEffect(ins, size);

 // Check if the last instruction and current instructions use the same register and local memory.
 if (varNum == varx && lastReg1 == ireg && lastOffs == offs)
 {
Expand Down