Skip to content

JIT: Introduce O1K_VN #112889

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
merged 3 commits into from
Feb 25, 2025
Merged

JIT: Introduce O1K_VN #112889

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
bd86ddf
Introduce O1K_VN
EgorBo Feb 25, 2025
cb0a711
cleanup
EgorBo Feb 25, 2025
82de83c
add a comment
EgorBo Feb 25, 2025
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
79 changes: 38 additions & 41 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,10 @@ void Compiler::optPrintAssertion(AssertionDsc* curAssertion, AssertionIndex asse
{
printf("ArrBnds ");
}
else if (curAssertion->op1.kind == O1K_VN)
{
printf("Vn ");
}
else if (curAssertion->op1.kind == O1K_SUBTYPE)
{
printf("Subtype ");
Expand Down Expand Up @@ -787,6 +791,10 @@ void Compiler::optPrintAssertion(AssertionDsc* curAssertion, AssertionIndex asse
vnStore->vnDump(this, curAssertion->op1.bnd.vnLen);
printf("]");
}
else if (curAssertion->op1.kind == O1K_VN)
{
printf("[" FMT_VN "]", curAssertion->op1.vn);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use vnStore->vnDump?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will address in #110171

}
else if (curAssertion->op1.kind == O1K_BOUND_OPER_BND)
{
printf("Oper_Bnd");
Expand Down Expand Up @@ -1534,6 +1542,31 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
}
}
}
else
{
// Currently, O1K_VN serves as a backup for O1K_LCLVAR (where it's not a local),
// but long term we should keep O1K_LCLVAR for local assertions only.
if (!optLocalAssertionProp)
{
ValueNum op1VN = optConservativeNormalVN(op1);
ValueNum op2VN = optConservativeNormalVN(op2);

// For TP reasons, limited to 32-bit constants on the op2 side.
if ((op1VN != ValueNumStore::NoVN) && (op2VN != ValueNumStore::NoVN) && vnStore->IsVNInt32Constant(op2VN) &&
!vnStore->IsVNHandle(op2VN))
{
assert(assertionKind == OAK_EQUAL || assertionKind == OAK_NOT_EQUAL);
assertion.assertionKind = assertionKind;
assertion.op1.vn = op1VN;
assertion.op1.kind = O1K_VN;
assertion.op2.vn = op2VN;
assertion.op2.kind = O2K_CONST_INT;
assertion.op2.u1.iconVal = vnStore->ConstantValue<int>(op2VN);
assertion.op2.SetIconFlag(GTF_EMPTY);
return optAddAssertion(&assertion);
}
}
}

DONE_ASSERTION:
return optFinalizeCreatingAssertion(&assertion);
Expand Down Expand Up @@ -1831,7 +1864,10 @@ void Compiler::optDebugCheckAssertion(AssertionDsc* assertion)
break;
case O1K_ARR_BND:
// It would be good to check that bnd.vnIdx and bnd.vnLen are valid value numbers.
assert(!optLocalAssertionProp);
assert(assertion->assertionKind == OAK_NO_THROW);
break;
case O1K_VN:
case O1K_BOUND_OPER_BND:
case O1K_BOUND_LOOP_BND:
case O1K_CONSTANT_LOOP_BND:
Expand Down Expand Up @@ -2249,45 +2285,7 @@ AssertionInfo Compiler::optAssertionGenJtrue(GenTree* tree)
if (vnStore->IsVNCheckedBound(op1VN) && vnStore->IsVNInt32Constant(op2VN))
{
assert(relop->OperIs(GT_EQ, GT_NE));

int con = vnStore->ConstantValue<int>(op2VN);
if (con >= 0)
{
AssertionDsc dsc;

// For arr.Length != 0, we know that 0 is a valid index
// For arr.Length == con, we know that con - 1 is the greatest valid index
if (con == 0)
{
dsc.assertionKind = OAK_NOT_EQUAL;
dsc.op1.bnd.vnIdx = vnStore->VNForIntCon(0);
}
else
{
dsc.assertionKind = OAK_EQUAL;
dsc.op1.bnd.vnIdx = vnStore->VNForIntCon(con - 1);
}

dsc.op1.vn = op1VN;
dsc.op1.kind = O1K_ARR_BND;
dsc.op1.bnd.vnLen = op1VN;
dsc.op2.vn = vnStore->VNConservativeNormalValue(op2->gtVNPair);
dsc.op2.kind = O2K_CONST_INT;
dsc.op2.u1.iconVal = 0;
dsc.op2.SetIconFlag(GTF_EMPTY);

// when con is not zero, create an assertion on the arr.Length == con edge
// when con is zero, create an assertion on the arr.Length != 0 edge
AssertionIndex index = optAddAssertion(&dsc);
if (relop->OperIs(GT_NE) != (con == 0))
{
return AssertionInfo::ForNextEdge(index);
}
else
{
return index;
}
}
return optCreateJtrueAssertions(op1, op2, assertionKind);
}
}

Expand Down Expand Up @@ -4061,8 +4059,7 @@ void Compiler::optAssertionProp_RangeProperties(ASSERT_VALARG_TP assertions,
}

// First, analyze possible X ==/!= CNS assertions.
if (curAssertion->IsConstantInt32Assertion() && (curAssertion->op1.kind == O1K_LCLVAR) &&
(curAssertion->op1.vn == treeVN))
if (curAssertion->IsConstantInt32Assertion() && (curAssertion->op1.vn == treeVN))
{
if ((curAssertion->assertionKind == OAK_NOT_EQUAL) && (curAssertion->op2.u1.iconVal == 0))
{
Expand Down
11 changes: 9 additions & 2 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7884,6 +7884,7 @@ class Compiler
{
O1K_INVALID,
O1K_LCLVAR,
O1K_VN,
O1K_ARR_BND,
O1K_BOUND_OPER_BND,
O1K_BOUND_LOOP_BND,
Expand Down Expand Up @@ -8008,7 +8009,8 @@ class Compiler

bool IsConstantInt32Assertion()
{
return ((assertionKind == OAK_EQUAL) || (assertionKind == OAK_NOT_EQUAL)) && (op2.kind == O2K_CONST_INT);
return ((assertionKind == OAK_EQUAL) || (assertionKind == OAK_NOT_EQUAL)) && (op2.kind == O2K_CONST_INT) &&
((op1.kind == O1K_LCLVAR) || (op1.kind == O1K_VN));
}

bool CanPropLclVar()
Expand All @@ -8028,7 +8030,7 @@ class Compiler

bool CanPropBndsCheck()
{
return op1.kind == O1K_ARR_BND;
return (op1.kind == O1K_ARR_BND) || (op1.kind == O1K_VN);
}

bool CanPropSubRange()
Expand Down Expand Up @@ -8066,6 +8068,11 @@ class Compiler
assert(vnBased);
return (op1.bnd.vnIdx == that->op1.bnd.vnIdx) && (op1.bnd.vnLen == that->op1.bnd.vnLen);
}
else if (op1.kind == O1K_VN)
{
assert(vnBased);
return (op1.vn == that->op1.vn);
}
else
{
return ((vnBased && (op1.vn == that->op1.vn)) ||
Expand Down
Loading