Skip to content

8331090: Run Ideal_minmax before de-canonicalizing CMoves #19914

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

Closed
wants to merge 1 commit into from
Closed

8331090: Run Ideal_minmax before de-canonicalizing CMoves #19914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/hotspot/share/opto/movenode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,20 @@ Node *CMoveNode::Ideal(PhaseGVN *phase, bool can_reshape) {
phase->type(in(IfTrue)) == Type::TOP) {
return nullptr;
}
// Canonicalize the node by moving constants to the right input.
if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) {
BoolNode* b = in(Condition)->as_Bool()->negate(phase);
return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type);
}

// Check for Min/Max patterns. This is called before constants are pushed to the right input, as that transform can
// make BoolTests non-canonical.
Node* minmax = Ideal_minmax(phase, this);
if (minmax != nullptr) {
return minmax;
}

// Canonicalize the node by moving constants to the right input.
if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) {
BoolNode* b = in(Condition)->as_Bool()->negate(phase);
return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type);
}

return nullptr;
}

Expand Down
32 changes: 29 additions & 3 deletions test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

/*
* @test
* @bug 8324655 8329797
* @bug 8324655 8329797 8331090
* @key randomness
* @summary Test that if expressions are properly folded into min/max nodes
* @requires os.arch != "riscv64"
Expand Down Expand Up @@ -505,7 +505,27 @@ public void checkTestMinLongVector(Object[] vals) {
}
}

@Run(test = { "testMinI1", "testMinI2", "testMaxI1", "testMaxI2", "testMinI1E", "testMinI2E", "testMaxI1E", "testMaxI2E" })
@Test
@IR(failOn = { IRNode.IF }, counts = { IRNode.MIN_I, "1" })
public int testMinIConst(int a) {
if (a > 65535) {
a = 65535;
}

return a;
}

@Test
@IR(phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, failOn = { IRNode.IF }, counts = { IRNode.MIN_L, "1" })
public long testMinLConst(long a) {
if (a > 65535) {
a = 65535;
}

return a;
}

@Run(test = { "testMinI1", "testMinI2", "testMaxI1", "testMaxI2", "testMinI1E", "testMinI2E", "testMaxI1E", "testMaxI2E", "testMinIConst" })
public void runTestIntegers() {
testIntegers(10, 20);
testIntegers(20, 10);
Expand All @@ -526,9 +546,12 @@ public void testIntegers(int a, int b) {
Asserts.assertEQ(a >= b ? b : a, testMinI2E(a, b));
Asserts.assertEQ(a >= b ? a : b, testMaxI1E(a, b));
Asserts.assertEQ(a <= b ? b : a, testMaxI2E(a, b));

Asserts.assertEQ(a > 65535 ? 65535 : a, testMinIConst(a));
Asserts.assertEQ(b > 65535 ? 65535 : b, testMinIConst(b));
}

@Run(test = { "testMinL1", "testMinL2", "testMaxL1", "testMaxL2", "testMinL1E", "testMinL2E", "testMaxL1E", "testMaxL2E" })
@Run(test = { "testMinL1", "testMinL2", "testMaxL1", "testMaxL2", "testMinL1E", "testMinL2E", "testMaxL1E", "testMaxL2E", "testMinLConst" })
public void runTestLongs() {
testLongs(10, 20);
testLongs(20, 10);
Expand All @@ -551,5 +574,8 @@ public void testLongs(long a, long b) {
Asserts.assertEQ(a >= b ? b : a, testMinL2E(a, b));
Asserts.assertEQ(a >= b ? a : b, testMaxL1E(a, b));
Asserts.assertEQ(a <= b ? b : a, testMaxL2E(a, b));

Asserts.assertEQ(a > 65535L ? 65535L : a, testMinLConst(a));
Asserts.assertEQ(b > 65535L ? 65535L : b, testMinLConst(b));
}
}