Skip to content

JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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
jakobbotsch merged 2 commits into from
Jun 26, 2023
Merged

JIT: Stop setting class handles for promoted parameter SIMD fields #87967

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
db937f9
JIT: Stop setting class handles for promoted parameter SIMD fields
jakobbotsch Jun 23, 2023
a46f436
Fix SysV for wrapped SIMD fields
jakobbotsch Jun 23, 2023
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
19 changes: 16 additions & 3 deletions src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
if (varTypeIsStruct(varDsc))
{
CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
CORINFO_CLASS_HANDLE typeHnd;
if (varDsc->lvIsStructField)
{
// The only case we currently permit is a wrapped SIMD field,
// where we won't have the class handle available, so get it
// from the parent struct -- they will agree on ABI details.
LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
typeHnd = parentDsc->GetLayout()->GetClassHandle();
}
else
{
typeHnd = varDsc->GetLayout()->GetClassHandle();
}
assert(typeHnd != nullptr);
SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
}
}
#if FEATURE_MULTIREG_ARGS
else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
else if (varDsc->lvIsMultiRegArg)
{
if (varDsc->lvIsHfaRegArg())
{
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
{
// This must be a SIMD type that's fully enregistered, but is passed as an HFA.
// Each field will be inserted into the same destination register.
assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
assert(varTypeIsSIMD(varDsc));
assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
assert(argNum > 0);
assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down
31 changes: 24 additions & 7 deletions src/coreclr/jit/lclvars.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
if (varTypeIsSIMD(pFieldInfo->fldType))
{
compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
// We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
// be promoting this if we didn't think it could be enregistered.
fieldVarDsc->lvRegStruct = true;

// SIMD types may be HFAs so we need to set the correct state on
// the promoted fields to get the right ABI treatment in the
// backend.
if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
{
// hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
if (varTypeIsValidHfaType(hfaType))
{
fieldVarDsc->SetHfaType(hfaType);
fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
}
}
}
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
}
#endif // not TARGET_64BIT

unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

// Check whether this local is an unsafe value type and requires GS cookie protection.
// GS checks require the stack to be re-ordered, which can't be done with EnC.
if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
if (unsafeValueClsCheck)
{
setNeedsGSSecurityCookie();
compGSReorderStackLayout = true;
varDsc->lvIsUnsafeBuffer = true;
unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
{
setNeedsGSSecurityCookie();
compGSReorderStackLayout = true;
varDsc->lvIsUnsafeBuffer = true;
}
}

#ifdef DEBUG
if (JitConfig.EnableExtraSuperPmiQueries())
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/regalloc.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
if (argDsc->lvIsHfaRegArg())
{
assert(regState->rsIsFloat);
unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
unsigned cSlots = argDsc->lvHfaSlots();
for (unsigned i = 1; i < cSlots; i++)
{
assert(inArgReg + i <= LAST_FP_ARGREG);
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" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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('^' + ".*" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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('^' + ".*" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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('^' + ".*" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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('^' + ".*" + '
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
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); }
})();
})();
JIT: Stop setting class handles for promoted parameter SIMD fields by jakobbotsch · Pull Request #87967 · dotnet/runtime · GitHub
Skip to content
JIT: Stop setting class handles for promoted parameter SIMD fields#87967

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

jakobbotsch
merged 2 commits into

from

Jun 26, 2023
 Merged


JIT: Stop setting class handles for promoted parameter SIMD fields
#87967
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
db937f9

JIT: Stop setting class handles for promoted parameter SIMD fields


jakobbotsch Jun 23, 2023
a46f436

Fix SysV for wrapped SIMD fields


jakobbotsch Jun 23, 2023

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


19 changes: 16 additions & 3 deletions
src/coreclr/jit/codegencommon.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3017,7 +3017,20 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
#if defined(UNIX_AMD64_ABI)
 if (varTypeIsStruct(varDsc))
 {
 CORINFO_CLASS_HANDLE typeHnd = varDsc->GetLayout()->GetClassHandle();
 CORINFO_CLASS_HANDLE typeHnd;
 if (varDsc->lvIsStructField)
 {
 // The only case we currently permit is a wrapped SIMD field,
 // where we won't have the class handle available, so get it
 // from the parent struct -- they will agree on ABI details.
 LclVarDsc* parentDsc = compiler->lvaGetDesc(varDsc->lvParentLcl);
 assert(varTypeIsSIMD(varDsc) && (parentDsc->lvFieldCnt == 1));
 typeHnd = parentDsc->GetLayout()->GetClassHandle();
 }
 else
 {
 typeHnd = varDsc->GetLayout()->GetClassHandle();
 }
 assert(typeHnd != nullptr);
 SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc;
 compiler->eeGetSystemVAmd64PassStructInRegisterDescriptor(typeHnd, &structDesc);
Expand DownExpand Up@@ -3114,7 +3127,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 }
 }
#if FEATURE_MULTIREG_ARGS
 else if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs))
 else if (varDsc->lvIsMultiRegArg)
 {
 if (varDsc->lvIsHfaRegArg())
 {
Expand DownExpand Up@@ -3323,7 +3336,7 @@ void CodeGen::genFnPrologCalleeRegArgs(regNumber xtraReg, bool* pXtraRegClobbere
 {
 // This must be a SIMD type that's fully enregistered, but is passed as an HFA.
 // Each field will be inserted into the same destination register.
 assert(varTypeIsSIMD(varDsc) && !compiler->isOpaqueSIMDType(varDsc->GetLayout()));
 assert(varTypeIsSIMD(varDsc));
 assert(regArgTab[argNum].slot <= (int)varDsc->lvHfaSlots());
 assert(argNum > 0);
 assert(regArgTab[argNum - 1].varNum == varNum);
Expand Down

31 changes: 24 additions & 7 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2516,10 +2516,23 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
#ifdef FEATURE_SIMD
 if (varTypeIsSIMD(pFieldInfo->fldType))
 {
 compiler->lvaSetStruct(varNum, pFieldInfo->fldTypeHnd, false);
 // We will not recursively promote this, so mark it as 'lvRegStruct' (note that we wouldn't
 // be promoting this if we didn't think it could be enregistered.
 fieldVarDsc->lvRegStruct = true;

 // SIMD types may be HFAs so we need to set the correct state on
 // the promoted fields to get the right ABI treatment in the
 // backend.
 if (GlobalJitOptions::compFeatureHfa && (pFieldInfo->fldSize <= MAX_PASS_MULTIREG_BYTES))
 {
 // hfaType is set to float, double or SIMD type if it is an HFA, otherwise TYP_UNDEF
 var_types hfaType = compiler->GetHfaType(pFieldInfo->fldTypeHnd);
 if (varTypeIsValidHfaType(hfaType))
 {
 fieldVarDsc->SetHfaType(hfaType);
 fieldVarDsc->lvIsMultiRegArg = (varDsc->lvIsMultiRegArg != 0) && (fieldVarDsc->lvHfaSlots() > 1);
 }
 }
 }
#endif // FEATURE_SIMD

Expand DownExpand Up@@ -2979,16 +2992,20 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck && (classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 if (unsafeValueClsCheck)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 unsigned classAttribs = info.compCompHnd->getClassAttribs(layout->GetClassHandle());

 if ((classAttribs & CORINFO_FLG_UNSAFE_VALUECLASS) && !opts.compDbgEnC)
 {
 setNeedsGSSecurityCookie();
 compGSReorderStackLayout = true;
 varDsc->lvIsUnsafeBuffer = true;
 }
 }

#ifdef DEBUG
 if (JitConfig.EnableExtraSuperPmiQueries())
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ regNumber Compiler::raUpdateRegStateForArg(RegState* regState, LclVarDsc* argDsc
 if (argDsc->lvIsHfaRegArg())
 {
 assert(regState->rsIsFloat);
 unsigned cSlots = GetHfaCount(argDsc->GetLayout()->GetClassHandle());
 unsigned cSlots = argDsc->lvHfaSlots();
 for (unsigned i = 1; i < cSlots; i++)
 {
 assert(inArgReg + i <= LAST_FP_ARGREG);
Expand Down