Skip to content
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

Optimization for full range checks (#70145) #70222

Merged
merged 13 commits into from
Jun 19, 2022
Merged

Optimization for full range checks (#70145) #70222

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8f2935d
Optimization for full range checks (#70145)
SkiFoD Jun 3, 2022
81523b6
Fix the x86 long value error (#70145)
SkiFoD Jun 6, 2022
05022dd
Fix arm building errors (#70145)
SkiFoD Jun 7, 2022
ebbaa3e
Moved code according to the comments (#70145)
SkiFoD Jun 8, 2022
5548ead
Moved code to fgOptimizeRelationalComparisonWithConst (#70145)
SkiFoD Jun 9, 2022
4d7aaec
Moved logic to separate functions (#70145)
SkiFoD Jun 10, 2022
2da383c
Simplified determining Lower/Upper bounds (#70145)
SkiFoD Jun 10, 2022
01d7d48
Generalized both sides to intervals (#70145)
SkiFoD Jun 11, 2022
8acf1cc
Refactoring of conditions (#70145)
SkiFoD Jun 14, 2022
9a85185
Cut out unsigned types (#70145)
SkiFoD Jun 14, 2022
d11970c
Refactoring according to the comments (#70145)
SkiFoD Jun 16, 2022
7c2cbd5
Fix parentheses (#70145)
SkiFoD Jun 16, 2022
4faafae
Fix summary (#70145)
SkiFoD Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 66 additions & 1 deletion src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11375,6 +11375,12 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac)
if (!optValnumCSE_phase && op2->IsIntegralConst())
{
tree = fgOptimizeEqualityComparisonWithConst(tree->AsOp());

if (tree->OperIs(GT_CNS_INT, GT_COMMA))
{
return tree;
}

assert(tree->OperIsCompare());

oper = tree->OperGet();
Expand Down Expand Up @@ -12478,6 +12484,65 @@ GenTree* Compiler::fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp)
op1->SetVNsFromNode(cmp);

DEBUG_DESTROY_NODE(cmp);

if (op1->OperIs(GT_GE, GT_LE) && (op1->gtGetOp2()->IsIntegralConst() || op1->gtGetOp1()->IsIntegralConst()))
SkiFoD marked this conversation as resolved.
Show resolved Hide resolved
{
GenTree* conNode = op1->gtGetOp2()->IsIntegralConst() ? op1->gtGetOp2() : op1->gtGetOp1();

IntegralRange valRange = IntegralRange::ForNode(conNode, this);

#if defined(HOST_X86) || defined(HOST_ARM)
ssize_t valMin =
(int32_t)IntegralRange::SymbolicToRealValue(valRange.LowerBoundForType(conNode->TypeGet()));
ssize_t valMax =
(int32_t)IntegralRange::SymbolicToRealValue(valRange.UpperBoundForType(conNode->TypeGet()));
#else
ssize_t valMin = IntegralRange::SymbolicToRealValue(valRange.LowerBoundForType(conNode->TypeGet()));
ssize_t valMax = IntegralRange::SymbolicToRealValue(valRange.UpperBoundForType(conNode->TypeGet()));
#endif
// Folds
// 1. byte x <= 0 => true
// 2. int x <= int.MinValue => true
// 3. long x <= long.MaxValue => true
// 4. byte x >= byte.MaxValue => true
// 5. int x >= int.MaxValue => true
// 6. long x >= long.MaxValue => true
//
// when const is RHS:
if (op1->gtGetOp2()->IsIntegralConst())
{

if ((op1->OperIs(GT_GE) && conNode->IsIntegralConst(valMin)) ||
(op1->OperIs(GT_LE) && conNode->IsIntegralConst(valMax)))
{
GenTree* ret = gtNewIconNode(1, TYP_INT);
ret->SetVNsFromNode(op1);
DEBUG_DESTROY_NODE(op1);
return fgMorphTree(ret);
}
} // when const is LHS:
else
{
if ((op1->OperIs(GT_GE) && conNode->IsIntegralConst(valMax)) ||
(op1->OperIs(GT_LE) && conNode->IsIntegralConst(valMin)))
{
GenTree* cmpSideEffects = nullptr;
GenTree* ret = gtNewIconNode(1, TYP_INT);

gtExtractSideEffList(op1, &cmpSideEffects);
SkiFoD marked this conversation as resolved.
Show resolved Hide resolved

if (cmpSideEffects != nullptr)
{
ret = gtNewOperNode(GT_COMMA, TYP_INT, cmpSideEffects, ret);
}

ret->SetVNsFromNode(op1);
DEBUG_DESTROY_NODE(op1);
return fgMorphTree(ret);
}
}
}

SkiFoD marked this conversation as resolved.
Show resolved Hide resolved
return op1;
}

Expand Down Expand Up @@ -13025,7 +13090,7 @@ GenTree* Compiler::fgOptimizeMultiply(GenTreeOp* mul)
// Should we try to replace integer multiplication with lea/add/shift sequences?
bool mulShiftOpt = compCodeOpt() != SMALL_CODE;
#else // !TARGET_XARCH
bool mulShiftOpt = false;
bool mulShiftOpt = false;
#endif // !TARGET_XARCH

size_t abs_mult = (mult >= 0) ? mult : -mult;
Expand Down