Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into from
Jun 23, 2022
Merged

Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64 #70960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e75433
Unix x64: local morph
SingleAccretion Jun 15, 2022
6b50969
Morph and costs tuning
SingleAccretion Jun 17, 2022
5fede1b
Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream
SingleAccretion Jun 22, 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
26 changes: 15 additions & 11 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
{
costEx = IND_COST_EX;
costSz = 2;
/* Sign-extend and zero-extend are more expensive to load */

// Some types are more expensive to load than others.
if (varTypeIsSmall(tree->TypeGet()))
{
costEx += 1;
costSz += 1;
}
else if (tree->TypeIs(TYP_STRUCT))
{
costEx += 2 * IND_COST_EX;
costSz += 2 * 2;
}
}
#if defined(TARGET_AMD64)
// increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
}
else if (tree->TypeIs(TYP_STRUCT))
{
costEx += IND_COST_EX;
costSz += 2;
costEx += 2 * IND_COST_EX;
costSz += 2 * 2;
}
break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
break;

case GT_ADDR:
if (op1->OperIsLocalRead())
{
costEx = 3;
costSz = 3;
goto DONE;
}

costEx = 0;
costSz = 1;

// If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
if (op1->OperGet() == GT_IND)
{
GenTree* indOp1 = op1->AsOp()->gtOp1;
costEx = indOp1->GetCostEx();
costSz = indOp1->GetCostSz();
}
break;

case GT_ARR_LENGTH:
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/lclmorph.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
// | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
// |------------|---------|-------------|---------|
//
// * - On x86/Windows x64 only.
// * - On XArch only.
//
// |------------|------|------|--------|----------|
// | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

if (user->IsCall())
{
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
}

if (match == StructMatch::Compatible)
Expand Down
19 changes: 11 additions & 8 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
GenTree* argx = arg->GetEarlyNode();
assert(argx != nullptr);

if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
// As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
{
noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
assert(argx != nullptr);

// We should have already handled these kinds of args
assert(argx->gtOper != GT_LCL_VAR);
assert(argx->gtOper != GT_LCL_FLD);
assert(argx->gtOper != GT_CNS_INT);
assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
!argx->OperIs(GT_CNS_INT));

// This arg should either have no persistent side effects or be the last one in our table
// assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
// - This is irrelevant for X86, since structs are always passed by value on the stack.

GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
bool canTransform = false;

if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
// or UNIX_AMD64_ABI cases where they will be passed in registers.
else
{
canTransform = (lclVar != nullptr);
canTransform = argIsLocal;
passingSize = genTypeSize(structBaseType);
}
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
makeOutArgCopy = true;
}
}
else if (lclVar == nullptr)
else if (!argIsLocal)
{
// This should only be the case of a value directly producing a known struct type.
assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
{
argNode = fgMorphLclArgToFieldlist(lcl);
}
#ifndef TARGET_XARCH
else if (argNode->TypeGet() == TYP_STRUCT)
{
// If this is a non-register struct, it must be referenced from memory.
// ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
if (!actualArg->OperIs(GT_OBJ))
{
// Create an Obj of the temp to use it as a call argument.
argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
}
// Its fields will need to be accessed by address.
lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
}
#endif // !TARGET_XARCH
}

return argNode;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down

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

Skip to content
Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64#70960

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 3 commits into

from

Jun 23, 2022
 Merged


Enable TYP_STRUCTLCL_VAR/LCL_FLD call args on Unix x64
#70960
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1e75433

Unix x64: local morph


SingleAccretion Jun 15, 2022
6b50969

Morph and costs tuning


SingleAccretion Jun 17, 2022
5fede1b

Merge branch 'main' into Struct-LclFld-Args-Unix-x64-Upstream


SingleAccretion Jun 22, 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


26 changes: 15 additions & 11 deletions
src/coreclr/jit/gentree.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4654,12 +4654,18 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 {
 costEx = IND_COST_EX;
 costSz = 2;
 /* Sign-extend and zero-extend are more expensive to load */

 // Some types are more expensive to load than others.
 if (varTypeIsSmall(tree->TypeGet()))
 {
 costEx += 1;
 costSz += 1;
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 }
#if defined(TARGET_AMD64)
 // increase costSz for floating point locals
Expand All@@ -4685,8 +4691,8 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 }
 else if (tree->TypeIs(TYP_STRUCT))
 {
 costEx += IND_COST_EX;
 costSz += 2;
 costEx += 2 * IND_COST_EX;
 costSz += 2 * 2;
 }
 break;

Expand DownExpand Up@@ -4916,17 +4922,15 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
 break;

 case GT_ADDR:
 if (op1->OperIsLocalRead())
 {
 costEx = 3;
 costSz = 3;
 goto DONE;
 }

 costEx = 0;
 costSz = 1;

 // If we have a GT_ADDR of an GT_IND we can just copy the costs from indOp1
 if (op1->OperGet() == GT_IND)
 {
 GenTree* indOp1 = op1->AsOp()->gtOp1;
 costEx = indOp1->GetCostEx();
 costSz = indOp1->GetCostSz();
 }
 break;

 case GT_ARR_LENGTH:
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1095,7 +1095,7 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
 // | Partial | LCL_FLD | OBJ/LCL_FLD | LCL_FLD |
 // |------------|---------|-------------|---------|
 //
 // * - On x86/Windows x64 only.
 // * - On XArch only.
 //
 // |------------|------|------|--------|----------|
 // | SIMD | CALL | ASG | RETURN | HWI/SIMD |
Expand All@@ -1113,9 +1113,9 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 if (user->IsCall())
 {
#if !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#if !defined(TARGET_XARCH)
 return IndirTransform::None;
#endif // !defined(WINDOWS_AMD64_ABI) && !defined(TARGET_X86)
#endif // !defined(TARGET_XARCH)
 }

 if (match == StructMatch::Compatible)
Expand Down

19 changes: 11 additions & 8 deletions
src/coreclr/jit/morph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1300,7 +1300,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 GenTree* argx = arg->GetEarlyNode();
 assert(argx != nullptr);

 if ((argx->gtOper == GT_LCL_VAR) || (argx->gtOper == GT_LCL_FLD))
 // As a CQ heuristic, sort TYP_STRUCT args using the cost estimation below.
 if (!argx->TypeIs(TYP_STRUCT) && argx->OperIs(GT_LCL_VAR, GT_LCL_FLD))
 {
 noway_assert(curInx <= endTab);

Expand DownExpand Up@@ -1346,9 +1347,8 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs)
 assert(argx != nullptr);

 // We should have already handled these kinds of args
 assert(argx->gtOper != GT_LCL_VAR);
 assert(argx->gtOper != GT_LCL_FLD);
 assert(argx->gtOper != GT_CNS_INT);
 assert((!argx->OperIs(GT_LCL_VAR, GT_LCL_FLD) || argx->TypeIs(TYP_STRUCT)) &&
 !argx->OperIs(GT_CNS_INT));

 // This arg should either have no persistent side effects or be the last one in our table
 // assert(((argx->gtFlags & GTF_PERSISTENT_SIDE_EFFECTS) == 0) || (curInx == (argCount-1)));
Expand DownExpand Up@@ -3197,6 +3197,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // - This is irrelevant for X86, since structs are always passed by value on the stack.

 GenTree* lclVar = fgIsIndirOfAddrOfLocal(argObj);
 bool argIsLocal = (lclVar != nullptr) || argObj->OperIsLocalRead();
 bool canTransform = false;

 if (structBaseType != TYP_STRUCT)
Expand All@@ -3214,7 +3215,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 // or UNIX_AMD64_ABI cases where they will be passed in registers.
 else
 {
 canTransform = (lclVar != nullptr);
 canTransform = argIsLocal;
 passingSize = genTypeSize(structBaseType);
 }
#endif // TARGET_ARM64 || UNIX_AMD64_ABI || TARGET_LOONGARCH64
Expand DownExpand Up@@ -3244,7 +3245,7 @@ GenTreeCall* Compiler::fgMorphArgs(GenTreeCall* call)
 makeOutArgCopy = true;
 }
 }
 else if (lclVar == nullptr)
 else if (!argIsLocal)
 {
 // This should only be the case of a value directly producing a known struct type.
 assert(argObj->TypeGet() != TYP_STRUCT);
Expand DownExpand Up@@ -3722,18 +3723,20 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg)
 {
 argNode = fgMorphLclArgToFieldlist(lcl);
 }
#ifndef TARGET_XARCH
 else if (argNode->TypeGet() == TYP_STRUCT)
 {
 // If this is a non-register struct, it must be referenced from memory.
 // ARM/ARM64/LoongArch64 backends do not support local nodes as sources of some stack args.
 if (!actualArg->OperIs(GT_OBJ))
 {
 // Create an Obj of the temp to use it as a call argument.
 argNode = gtNewOperNode(GT_ADDR, TYP_I_IMPL, argNode);
 argNode = gtNewObjNode(lvaGetStruct(lcl->GetLclNum()), argNode);
 }
 // Its fields will need to be accessed by address.
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUG_ARG(DoNotEnregisterReason::IsStructArg));
 lvaSetVarDoNotEnregister(lcl->GetLclNum() DEBUGARG(DoNotEnregisterReason::IsStructArg));
 }
#endif // !TARGET_XARCH
 }

 return argNode;
Expand Down