Skip to content

LSRA: Refactor some of the methods around creating kill set#102469

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
kunalspathak merged 8 commits into from
May 21, 2024
Merged

LSRA: Refactor some of the methods around creating kill set #102469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e739a4
refactor code around buildkill
kunalspathak May 20, 2024
e93f528
fix build errors
kunalspathak May 20, 2024
05b09b2
some more errors
kunalspathak May 20, 2024
f00f7a8
jit format
kunalspathak May 20, 2024
b124b0e
fix riscv64
kunalspathak May 21, 2024
5b254a2
make retTypeDesc as noway_assert
kunalspathak May 21, 2024
640dc20
fix riscv64 errors
kunalspathak May 21, 2024
db56bd1
jit format
kunalspathak May 21, 2024
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
32 changes: 20 additions & 12 deletions src/coreclr/jit/lsra.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
void buildUpperVectorRestoreRefPosition(
Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
bool supportsSpecialPutArg();

int BuildSimple(GenTree* tree);
int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
int BuildDelayFreeUses(GenTree* node,
GenTree* rmwNode = nullptr,
regMaskTP candidates = RBM_NONE,
RefPosition** useRefPosition = nullptr);
int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
int BuildSimple(GenTree* tree);
int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
int BuildDelayFreeUses(GenTree* node,
GenTree* rmwNode = nullptr,
regMaskTP candidates = RBM_NONE,
RefPosition** useRefPosition = nullptr);
int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/lsraarm.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
assert(dstCount == 0);
BuildUse(tree->gtGetOp1());
killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;

case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
// This kills GC refs in callee save regs
srcCount = 0;
assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
break;

case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
case GT_RETURN:
srcCount = BuildReturn(tree);
killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;

case GT_RETFILT:
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/jit/lsraarm64.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
srcCount = 0;
assert(dstCount == 0);
killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;

case GT_START_PREEMPTGC:
// This kills GC refs in callee save regs
srcCount = 0;
assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
break;

case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
case GT_RETURN:
srcCount = BuildReturn(tree);
killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
// Plus one for error register
srcCount = BuildReturn(tree) + 1;
killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
srcCount = 1;
assert(dstCount == 0);
killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
break;

case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

if ((dstCount == 1) || (dstCount == 2))
{
BuildDef(intrinsicTree, dstCandidates);
BuildDef(intrinsicTree);

if (dstCount == 2)
{
BuildDef(intrinsicTree, dstCandidates, 1);
BuildDef(intrinsicTree, RBM_NONE, 1);
}
}
else
Expand Down
58 changes: 37 additions & 21 deletions src/coreclr/jit/lsraarmarch.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
bool hasMultiRegRetVal = false;
const ReturnTypeDesc* retTypeDesc = nullptr;
regMaskTP dstCandidates = RBM_NONE;
bool hasMultiRegRetVal = false;
const ReturnTypeDesc* retTypeDesc = nullptr;
regMaskTP singleDstCandidates = RBM_NONE;

int srcCount = 0;
int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
{
// The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
// TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
}
else
#endif // TARGET_ARM
if (hasMultiRegRetVal)
{
assert(retTypeDesc != nullptr);
dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
}
else if (varTypeUsesFloatArgReg(registerType))
{
dstCandidates = RBM_FLOATRET;
}
else if (registerType == TYP_LONG)
{
dstCandidates = RBM_LNGRET;
}
else
if (!hasMultiRegRetVal)
{
dstCandidates = RBM_INTRET;
if (varTypeUsesFloatArgReg(registerType))
{
singleDstCandidates = RBM_FLOATRET;
}
else if (registerType == TYP_LONG)
{
singleDstCandidates = RBM_LNGRET;
}
else
{
singleDstCandidates = RBM_INTRET;
}
}

// First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

// Now generate defs and kills.
regMaskTP killMask = getKillSetForCall(call);
BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
if (dstCount > 0)
{
if (hasMultiRegRetVal)
{
assert(retTypeDesc != nullptr);
regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
assert(genCountBits(multiDstCandidates) > 0);
BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
}
else
{
assert(dstCount == 1);
BuildDefWithKills(call, singleDstCandidates, killMask);
}
}
else
{
BuildKills(call, killMask);
}

#ifdef SWIFT_SUPPORT
if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

buildInternalRegisterUses();
regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
return useCount;
}

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading

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

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

kunalspathak
merged 8 commits into

from

May 21, 2024
 Merged


LSRA: Refactor some of the methods around creating kill set
#102469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
5e739a4

refactor code around buildkill


kunalspathak May 20, 2024
e93f528

fix build errors


kunalspathak May 20, 2024
05b09b2

some more errors


kunalspathak May 20, 2024
f00f7a8

jit format


kunalspathak May 20, 2024
b124b0e

fix riscv64


kunalspathak May 21, 2024
5b254a2

make retTypeDesc as noway_assert


kunalspathak May 21, 2024
640dc20

fix riscv64 errors


kunalspathak May 21, 2024
db56bd1

jit format


kunalspathak May 21, 2024

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


32 changes: 20 additions & 12 deletions
src/coreclr/jit/lsra.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1051,7 +1051,7 @@ class LinearScan : public LinearScanInterface
 void buildRefPositionsForNode(GenTree* tree, LsraLocation loc);

#if FEATURE_PARTIAL_SIMD_CALLEE_SAVE
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc, regMaskTP fpCalleeKillSet);
 void buildUpperVectorSaveRefPositions(GenTree* tree, LsraLocation currentLoc DEBUG_ARG(regMaskTP fpCalleeKillSet));
 void buildUpperVectorRestoreRefPosition(
 Interval* lclVarInterval, LsraLocation currentLoc, GenTree* node, bool isUse, unsigned multiRegIdx);
#endif // FEATURE_PARTIAL_SIMD_CALLEE_SAVE
Expand DownExpand Up@@ -1999,19 +1999,27 @@ class LinearScan : public LinearScanInterface
 void getTgtPrefOperands(GenTree* tree, GenTree* op1, GenTree* op2, bool* prefOp1, bool* prefOp2);
 bool supportsSpecialPutArg();

 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);
 int BuildSimple(GenTree* tree);
 int BuildOperandUses(GenTree* node, regMaskTP candidates = RBM_NONE);
 void AddDelayFreeUses(RefPosition* refPosition, GenTree* rmwNode);
 int BuildDelayFreeUses(GenTree* node,
 GenTree* rmwNode = nullptr,
 regMaskTP candidates = RBM_NONE,
 RefPosition** useRefPosition = nullptr);
 int BuildIndirUses(GenTreeIndir* indirTree, regMaskTP candidates = RBM_NONE);
 int BuildAddrUses(GenTree* addr, regMaskTP candidates = RBM_NONE);
 void HandleFloatVarArgs(GenTreeCall* call, GenTree* argNode, bool* callHasFloatRegArgs);

 RefPosition* BuildDef(GenTree* tree, regMaskTP dstCandidates = RBM_NONE, int multiRegIdx = 0);
 void BuildDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates = RBM_NONE);
 void BuildDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
 void BuildCallDefs(GenTree* tree, int dstCount, regMaskTP dstCandidates);
 void BuildKills(GenTree* tree, regMaskTP killMask);
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64)
 void BuildDefWithKills(GenTree* tree, regMaskTP dstCandidates, regMaskTP killMask);
#else
 void BuildDefWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);
#endif // TARGET_ARMARCH || TARGET_RISCV64
 void BuildCallDefsWithKills(GenTree* tree, int dstCount, regMaskTP dstCandidates, regMaskTP killMask);

 int BuildReturn(GenTree* tree);
#ifdef TARGET_XARCH
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -373,7 +373,7 @@ int LinearScan::BuildNode(GenTree* tree)
 assert(dstCount == 0);
 BuildUse(tree->gtGetOp1());
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MUL:
Expand DownExpand Up@@ -422,7 +422,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_LONG:
Expand DownExpand Up@@ -469,7 +469,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_RETFILT:
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/jit/lsraarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -666,14 +666,14 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 0;
 assert(dstCount == 0);
 killMask = getKillSetForProfilerHook();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_START_PREEMPTGC:
 // This kills GC refs in callee save regs
 srcCount = 0;
 assert(dstCount == 0);
BuildDefsWithKills(tree, 0, RBM_NONE, RBM_NONE);
BuildKills(tree, RBM_NONE);
 break;

 case GT_CNS_DBL:
Expand DownExpand Up@@ -738,7 +738,7 @@ int LinearScan::BuildNode(GenTree* tree)
 case GT_RETURN:
 srcCount = BuildReturn(tree);
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

#ifdef SWIFT_SUPPORT
Expand All@@ -747,7 +747,7 @@ int LinearScan::BuildNode(GenTree* tree)
 // Plus one for error register
 srcCount = BuildReturn(tree) + 1;
 killMask = getKillSetForReturn();
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;
#endif // SWIFT_SUPPORT

Expand DownExpand Up@@ -839,7 +839,7 @@ int LinearScan::BuildNode(GenTree* tree)
 srcCount = 1;
 assert(dstCount == 0);
 killMask = compiler->compHelperCallKillSet(CORINFO_HELP_STOP_FOR_GC);
BuildDefsWithKills(tree, 0, RBM_NONE, killMask);
BuildKills(tree, killMask);
 break;

 case GT_MOD:
Expand DownExpand Up@@ -1927,11 +1927,11 @@ int LinearScan::BuildHWIntrinsic(GenTreeHWIntrinsic* intrinsicTree, int* pDstCou

 if ((dstCount == 1) || (dstCount == 2))
 {
 BuildDef(intrinsicTree, dstCandidates);
 BuildDef(intrinsicTree);

 if (dstCount == 2)
 {
 BuildDef(intrinsicTree, dstCandidates, 1);
 BuildDef(intrinsicTree, RBM_NONE, 1);
 }
 }
 else
Expand Down

58 changes: 37 additions & 21 deletions
src/coreclr/jit/lsraarmarch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,9 +127,9 @@ int LinearScan::BuildIndir(GenTreeIndir* indirTree)
//
int LinearScan::BuildCall(GenTreeCall* call)
{
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP dstCandidates  = RBM_NONE;
 bool hasMultiRegRetVal = false;
 const ReturnTypeDesc* retTypeDesc = nullptr;
 regMaskTP singleDstCandidates = RBM_NONE;

 int srcCount = 0;
 int dstCount = 0;
Expand DownExpand Up@@ -227,26 +227,24 @@ int LinearScan::BuildCall(GenTreeCall* call)
 {
 // The ARM CORINFO_HELP_INIT_PINVOKE_FRAME helper uses a custom calling convention that returns with
 // TCB in REG_PINVOKE_TCB. fgMorphCall() sets the correct argument registers.
dstCandidates = RBM_PINVOKE_TCB;
singleDstCandidates = RBM_PINVOKE_TCB;
 }
 else
#endif // TARGET_ARM
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 dstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 }
 else if (varTypeUsesFloatArgReg(registerType))
 {
 dstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 dstCandidates = RBM_LNGRET;
 }
 else
 if (!hasMultiRegRetVal)
 {
 dstCandidates = RBM_INTRET;
 if (varTypeUsesFloatArgReg(registerType))
 {
 singleDstCandidates = RBM_FLOATRET;
 }
 else if (registerType == TYP_LONG)
 {
 singleDstCandidates = RBM_LNGRET;
 }
 else
 {
 singleDstCandidates = RBM_INTRET;
 }
 }

 // First, count reg args
Expand DownExpand Up@@ -399,7 +397,25 @@ int LinearScan::BuildCall(GenTreeCall* call)

 // Now generate defs and kills.
 regMaskTP killMask = getKillSetForCall(call);
 BuildDefsWithKills(call, dstCount, dstCandidates, killMask);
 if (dstCount > 0)
 {
 if (hasMultiRegRetVal)
 {
 assert(retTypeDesc != nullptr);
 regMaskTP multiDstCandidates = retTypeDesc->GetABIReturnRegs(call->GetUnmanagedCallConv());
 assert(genCountBits(multiDstCandidates) > 0);
 BuildCallDefsWithKills(call, dstCount, multiDstCandidates, killMask);
 }
 else
 {
 assert(dstCount == 1);
 BuildDefWithKills(call, singleDstCandidates, killMask);
 }
 }
 else
 {
 BuildKills(call, killMask);
 }

#ifdef SWIFT_SUPPORT
 if (call->HasSwiftErrorHandling())
Expand DownExpand Up@@ -836,7 +852,7 @@ int LinearScan::BuildBlockStore(GenTreeBlk* blkNode)

 buildInternalRegisterUses();
 regMaskTP killMask = getKillSetForBlockStore(blkNode);
BuildDefsWithKills(blkNode, 0, RBM_NONE, killMask);
BuildKills(blkNode, killMask);
 return useCount;
}

Expand Down
Loading