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

Jump to bottom

Simple GT_NEG optimization for #13837 #43921

Merged
merged 5 commits into from
Nov 6, 2020
Merged

Simple GT_NEG optimization for #13837 #43921

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14b52a8
Simple arithmetic optimization with GT_NEG
JulieLeeMSFT Aug 14, 2020
ffebda9
Skip GT_NEG optimization when an operand is constant. Revert bitwise …
ewhapdx Aug 22, 2020
a2613a0
Fixed Value Numbering assert
JulieLeeMSFT Nov 3, 2020
d3dc19f
Cleaned up code and comments for simple GT_NEG optimization
JulieLeeMSFT Nov 5, 2020
b4b7b99
Formatting
JulieLeeMSFT Nov 6, 2020
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
107 changes: 107 additions & 0 deletions src/coreclr/src/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13324,6 +13324,60 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac)

/* No match - exit */
}

// Skip optimization if non-NEG operand is constant.
// Both op1 and op2 are not constant because it was already checked above.
if (opts.OptimizationEnabled() && fgGlobalMorph &&
(((op1->gtFlags & GTF_EXCEPT) == 0) || ((op2->gtFlags & GTF_EXCEPT) == 0)))
{
// a - -b = > a + b
// SUB(a, (NEG(b)) => ADD(a, b)

if (!op1->OperIs(GT_NEG) && op2->OperIs(GT_NEG))
{
// tree: SUB
// op1: a
// op2: NEG
// op2Child: b

GenTree* op2Child = op2->AsOp()->gtOp1; // b
oper = GT_ADD;
tree->SetOper(oper, GenTree::PRESERVE_VN);
tree->AsOp()->gtOp1 = op1; // no change
JulieLeeMSFT marked this conversation as resolved.
Show resolved Hide resolved
tree->AsOp()->gtOp2 = op2Child;

DEBUG_DESTROY_NODE(op2);

// op1 = op1; // no change
JulieLeeMSFT marked this conversation as resolved.
Show resolved Hide resolved
op2 = op2Child;
}

// -a - -b = > b - a
// SUB(NEG(a), (NEG(b)) => SUB(b, a)

if (op1->OperIs(GT_NEG) && op2->OperIs(GT_NEG))
{
// tree: SUB
// op1: NEG
// op1Child: a
// op2: NEG
// op2Child: b

GenTree* op1Child = op1->AsOp()->gtOp1; // a
GenTree* op2Child = op2->AsOp()->gtOp1; // b
// oper = GT_SUB; // no change
// tree->SetOper(oper, GenTree::PRESERVE_VN); // no change
JulieLeeMSFT marked this conversation as resolved.
Show resolved Hide resolved
tree->AsOp()->gtOp1 = op2Child;
tree->AsOp()->gtOp2 = op1Child;

DEBUG_DESTROY_NODE(op1);
DEBUG_DESTROY_NODE(op2);

op1 = op2Child;
op2 = op1Child;
}
}

break;

#ifdef TARGET_ARM64
Expand Down Expand Up @@ -13533,6 +13587,59 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac)
}
}
}

if (opts.OptimizationEnabled() && fgGlobalMorph &&
(((op1->gtFlags & GTF_EXCEPT) == 0) || ((op2->gtFlags & GTF_EXCEPT) == 0)))
{
// - a + b = > b - a
// ADD((NEG(a), b) => SUB(b, a)

// Skip optimization if non-NEG operand is constant.
if (op1->OperIs(GT_NEG) && !op2->OperIs(GT_NEG) &&
!(op2->IsCnsIntOrI() && varTypeIsIntegralOrI(typ)))
{
// tree: ADD
// op1: NEG
// op2: b
// op1Child: a

GenTree* op1Child = op1->AsOp()->gtOp1; // a
oper = GT_SUB;
tree->SetOper(oper, GenTree::PRESERVE_VN);
tree->AsOp()->gtOp1 = op2;
tree->AsOp()->gtOp2 = op1Child;

DEBUG_DESTROY_NODE(op1);

op1 = op2;
op2 = op1Child;
}

// a + -b = > a - b
// ADD(a, (NEG(b)) => SUB(a, b)

if (!op1->OperIs(GT_NEG) && op2->OperIs(GT_NEG))
{
// a is non cosntant because it was already canonicalized to have
// variable on the left and constant on the right.

// tree: ADD
// op1: a
// op2: NEG
// op2Child: b

GenTree* op2Child = op2->AsOp()->gtOp1; // a
oper = GT_SUB;
tree->SetOper(oper, GenTree::PRESERVE_VN);
// tree->AsOp()->gtOp1 = op1; // no change
JulieLeeMSFT marked this conversation as resolved.
Show resolved Hide resolved
tree->AsOp()->gtOp2 = op2Child;

DEBUG_DESTROY_NODE(op2);

// op1 = op2;
op2 = op2Child;
}
}
}
/* See if we can fold GT_MUL by const nodes */
else if (oper == GT_MUL && op2->IsCnsIntOrI() && !optValnumCSE_phase)
Expand Down