8322077: Add Ideal transformation: (~a) | (~b) => ~(a & b)

src/hotspot/share/opto/addnode.cpp

@@ -806,6 +806,13 @@ Node* OrINode::Ideal(PhaseGVN* phase, bool can_reshape) {
       return new RotateRightNode(in(1)->in(1), shift, TypeInt::INT);
     }
   }
+
+  // Convert "~a | ~b" into "~(a & b)"
+  if (AddNode::is_not(phase, in(1), T_INT) && AddNode::is_not(phase, in(2), T_INT)) {
+    Node* and_a_b = new AndINode(in(1)->in(1), in(2)->in(1));
+    Node* tn = phase->transform(and_a_b);
+    return AddNode::make_not(phase, tn, T_INT);
+  }
   return nullptr;
 }
 
@@ -872,6 +879,14 @@ Node* OrLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
       return new RotateRightNode(in(1)->in(1), shift, TypeLong::LONG);
     }
   }
+
+  // Convert "~a | ~b" into "~(a & b)"
+  if (AddNode::is_not(phase, in(1), T_LONG) && AddNode::is_not(phase, in(2), T_LONG)) {
+    Node* and_a_b = new AndLNode(in(1)->in(1), in(2)->in(1));
+    Node* tn = phase->transform(and_a_b);
+    return AddNode::make_not(phase, tn, T_LONG);
+  }
+
   return nullptr;
 }
 

test/hotspot/jtreg/compiler/c2/irTests/DeMorganLawIntTests.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8322077
+ * @summary Test that Ideal transformations on the De Morgan's Law perform
+            as expected for int.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.DeMorganLawIntTests
+ */
+public class DeMorganLawIntTests {
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = { "test1", "test2", "test3", "test4" })
+    public void runMethod() {
+        int a = RunInfo.getRandom().nextInt();
+        int b = RunInfo.getRandom().nextInt();
+        int c = RunInfo.getRandom().nextInt();
+        int d = RunInfo.getRandom().nextInt();
+
+        int min = Integer.MIN_VALUE;
+        int max = Integer.MAX_VALUE;
+
+        assertResult(0, 0, 0, 0);
+        assertResult(a, b, c, d);
+        assertResult(min, min, min, min);
+        assertResult(max, max, max, max);
+    }
+
+    @DontCompile
+    public void assertResult(int a, int b, int c, int d) {
+        Asserts.assertEQ((~a | ~b) & (~c | ~d), test1(a, b, c, d));
+        Asserts.assertEQ((~a & ~b) | (~c & ~d), test2(a, b, c, d));
+        Asserts.assertEQ((~a | ~b) | (~c | ~d), test3(a, b, c, d));
+        Asserts.assertEQ((~a & ~b) & (~c & ~d), test4(a, b, c, d));
+    }
+
+    // Checks (~a | ~b) & (~c | ~d)
+    //     => ~(a & b) & ~(c & d)
+    //     => ~((a & b) | (c & d))
+    @Test
+    @IR(counts = { IRNode.AND , "2",
+                   IRNode.OR , "1",
+                   IRNode.XOR, "1", })
+    public int test1(int a, int b, int c, int d) {
+        return (~a | ~b) & (~c | ~d);
+    }
+
+    // Checks (~a & ~b) | (~c & ~d)
+    //     => ~(a | b) | ~(c | d)
+    //     => ~((a | b) & (c | d))
+    @Test
+    @IR(counts = { IRNode.AND , "1",
+                   IRNode.OR , "2",
+                   IRNode.XOR, "1", })
+    public int test2(int a, int b, int c, int d) {
+        return (~a & ~b) | (~c & ~d);
+    }
+
+    // Checks (~a | ~b) | (~c | ~d)
+    //     => ~(a & b) | ~(c & d)
+    //     => ~((a & b) & (c & d))
+    @Test
+    @IR(failOn = { IRNode.OR })
+    @IR(counts = { IRNode.AND , "3",
+                   IRNode.XOR, "1", })
+    public int test3(int a, int b, int c, int d) {
+        return (~a | ~b) | (~c | ~d);
+    }
+
+    // Checks (~a & ~b) & (~c & ~d)
+    //     => ~(a | b) & ~(c | d)
+    //     => ~((a | b) | (c | d))
+    @Test
+    @IR(failOn = { IRNode.AND })
+    @IR(counts = { IRNode.OR , "3",
+                   IRNode.XOR, "1", })
+    public int test4(int a, int b, int c, int d) {
+        return (~a & ~b) & (~c & ~d);
+    }
+}

test/hotspot/jtreg/compiler/c2/irTests/DeMorganLawLongTests.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8322077
+ * @summary Test that Ideal transformations on the De Morgan's Law perform
+            as expected for long.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.DeMorganLawLongTests
+ */
+public class DeMorganLawLongTests {
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = { "test1", "test2", "test3", "test4" })
+    public void runMethod() {
+        long a = RunInfo.getRandom().nextLong();
+        long b = RunInfo.getRandom().nextLong();
+        long c = RunInfo.getRandom().nextLong();
+        long d = RunInfo.getRandom().nextLong();
+
+        long min = Long.MIN_VALUE;
+        long max = Long.MAX_VALUE;
+
+        assertResult(0, 0, 0, 0);
+        assertResult(a, b, c, d);
+        assertResult(min, min, min, min);
+        assertResult(max, max, max, max);
+    }
+
+    @DontCompile
+    public void assertResult(long a, long b, long c, long d) {
+        Asserts.assertEQ((~a | ~b) & (~c | ~d), test1(a, b, c, d));
+        Asserts.assertEQ((~a & ~b) | (~c & ~d), test2(a, b, c, d));
+        Asserts.assertEQ((~a | ~b) | (~c | ~d), test3(a, b, c, d));
+        Asserts.assertEQ((~a & ~b) & (~c & ~d), test4(a, b, c, d));
+    }
+
+    // Checks (~a | ~b) & (~c | ~d)
+    //     => ~(a & b) & ~(c & d)
+    //     => ~((a & b) | (c & d))
+    @Test
+    @IR(counts = { IRNode.AND , "2",
+                   IRNode.OR , "1",
+                   IRNode.XOR, "1", })
+    public long test1(long a, long b, long c, long d) {
+        return (~a | ~b) & (~c | ~d);
+    }
+
+    // Checks (~a & ~b) | (~c & ~d)
+    //     => ~(a | b) | ~(c | d)
+    //     => ~((a | b) & (c | d))
+    @Test
+    @IR(counts = { IRNode.AND , "1",
+                   IRNode.OR , "2",
+                   IRNode.XOR, "1", })
+    public long test2(long a, long b, long c, long d) {
+        return (~a & ~b) | (~c & ~d);
+    }
+
+    // Checks (~a | ~b) | (~c | ~d)
+    //     => ~(a & b) | ~(c & d)
+    //     => ~((a & b) & (c & d))
+    @Test
+    @IR(failOn = { IRNode.OR })
+    @IR(counts = { IRNode.AND , "3",
+                   IRNode.XOR, "1", })
+    public long test3(long a, long b, long c, long d) {
+        return (~a | ~b) | (~c | ~d);
+    }
+
+    // Checks (~a & ~b) & (~c & ~d)
+    //     => ~(a | b) & ~(c | d)
+    //     => ~((a | b) | (c | d))
+    @Test
+    @IR(failOn = { IRNode.AND })
+    @IR(counts = { IRNode.OR , "3",
+                   IRNode.XOR, "1", })
+    public long test4(long a, long b, long c, long d) {
+        return (~a & ~b) & (~c & ~d);
+    }
+}

test/hotspot/jtreg/compiler/c2/irTests/OrINodeIdealizationTests.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8322077
+ * @summary Test that Ideal transformations of OrINode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.OrINodeIdealizationTests
+ */
+public class OrINodeIdealizationTests {
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = { "test1" })
+    public void runMethod() {
+        int a = RunInfo.getRandom().nextInt();
+        int b = RunInfo.getRandom().nextInt();
+
+        int min = Integer.MIN_VALUE;
+        int max = Integer.MAX_VALUE;
+
+        assertResult(0, 0);
+        assertResult(a, b);
+        assertResult(min, min);
+        assertResult(max, max);
+    }
+
+    @DontCompile
+    public void assertResult(int a, int b) {
+        Asserts.assertEQ((~a) | (~b), test1(a, b));
+    }
+
+    // Checks (~a) | (~b) => ~(a & b)
+    @Test
+    @IR(failOn = { IRNode.OR })
+    @IR(counts = { IRNode.AND, "1",
+                   IRNode.XOR, "1" })
+    public int test1(int a, int b) {
+        return (~a) | (~b);
+    }
+}

test/hotspot/jtreg/compiler/c2/irTests/OrLNodeIdealizationTests.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8322077
+ * @summary Test that Ideal transformations of OrLNode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.OrLNodeIdealizationTests
+ */
+public class OrLNodeIdealizationTests {
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = { "test1" })
+    public void runMethod() {
+        long a = RunInfo.getRandom().nextLong();
+        long b = RunInfo.getRandom().nextLong();
+
+        long min = Long.MIN_VALUE;
+        long max = Long.MAX_VALUE;
+
+        assertResult(0, 0);
+        assertResult(a, b);
+        assertResult(min, min);
+        assertResult(max, max);
+    }
+
+    @DontCompile
+    public void assertResult(long a, long b) {
+        Asserts.assertEQ((~a) | (~b), test1(a, b));
+    }
+
+    // Checks (~a) | (~b) => ~(a & b)
+    @Test
+    @IR(failOn = { IRNode.OR })
+    @IR(counts = { IRNode.AND, "1",
+                   IRNode.XOR, "1" })
+    public long test1(long a, long b) {
+        return (~a) | (~b);
+    }
+}