# HG changeset patch # User Roland Schatz # Date 1393593927 -3600 # Node ID 692452c4cfb63110c83248bf6e39a0d9cf5c26be # Parent af05197816600dbfe883c728e700197410333b92 Fix UnsignedMathSubstitutions and add unit tests. diff -r af0519781660 -r 692452c4cfb6 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Fri Feb 28 13:51:50 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Fri Feb 28 14:25:27 2014 +0100 @@ -23,6 +23,7 @@ package com.oracle.graal.nodes.calc; import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.nodes.*; @@ -32,6 +33,14 @@ @NodeInfo(shortName = "|/|") public class UnsignedDivNode extends FixedBinaryNode implements Canonicalizable, Lowerable, LIRLowerable { + /** + * Used by {@code NodeIntrinsic} in {@code UnsignedMathSubstitutions}. + */ + @SuppressWarnings("unused") + private UnsignedDivNode(Kind kind, ValueNode x, ValueNode y) { + this(StampFactory.forKind(kind), x, y); + } + public UnsignedDivNode(Stamp stamp, ValueNode x, ValueNode y) { super(stamp, x, y); } diff -r af0519781660 -r 692452c4cfb6 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Fri Feb 28 13:51:50 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Fri Feb 28 14:25:27 2014 +0100 @@ -23,6 +23,7 @@ package com.oracle.graal.nodes.calc; import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.nodes.*; @@ -32,6 +33,14 @@ @NodeInfo(shortName = "|%|") public class UnsignedRemNode extends FixedBinaryNode implements Canonicalizable, Lowerable, LIRLowerable { + /** + * Used by {@code NodeIntrinsic} in {@code UnsignedMathSubstitutions}. + */ + @SuppressWarnings("unused") + private UnsignedRemNode(Kind kind, ValueNode x, ValueNode y) { + this(StampFactory.forKind(kind), x, y); + } + public UnsignedRemNode(Stamp stamp, ValueNode x, ValueNode y) { super(stamp, x, y); } diff -r af0519781660 -r 692452c4cfb6 graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedMathTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedMathTest.java Fri Feb 28 14:25:27 2014 +0100 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2014, 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 com.oracle.graal.replacements.test; + +import org.junit.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.compiler.test.*; + +/** + * Tests the substitutions for the {@link UnsignedMath} class. + */ +public class UnsignedMathTest extends GraalCompilerTest { + + public static boolean aboveThanInt(int a, int b) { + return UnsignedMath.aboveThan(a, b); + } + + public static boolean aboveOrEqualInt(int a, int b) { + return UnsignedMath.aboveOrEqual(a, b); + } + + public static boolean belowThanInt(int a, int b) { + return UnsignedMath.belowThan(a, b); + } + + public static boolean belowOrEqualInt(int a, int b) { + return UnsignedMath.belowOrEqual(a, b); + } + + public static int divideInt(int a, int b) { + return UnsignedMath.divide(a, b); + } + + public static int remainderInt(int a, int b) { + return UnsignedMath.remainder(a, b); + } + + public static boolean aboveThanLong(long a, long b) { + return UnsignedMath.aboveThan(a, b); + } + + public static boolean aboveOrEqualLong(long a, long b) { + return UnsignedMath.aboveOrEqual(a, b); + } + + public static boolean belowThanLong(long a, long b) { + return UnsignedMath.belowThan(a, b); + } + + public static boolean belowOrEqualLong(long a, long b) { + return UnsignedMath.belowOrEqual(a, b); + } + + public static long divideLong(long a, long b) { + return UnsignedMath.divide(a, b); + } + + public static long remainderLong(long a, long b) { + return UnsignedMath.remainder(a, b); + } + + private void testInt(int a, int b) { + test("aboveThanInt", a, b); + test("aboveOrEqualInt", a, b); + test("belowThanInt", a, b); + test("belowOrEqualInt", a, b); + test("divideInt", a, b); + test("remainderInt", a, b); + } + + private void testLong(long a, long b) { + test("aboveThanLong", a, b); + test("aboveOrEqualLong", a, b); + test("belowThanLong", a, b); + test("belowOrEqualLong", a, b); + test("divideLong", a, b); + test("remainderLong", a, b); + } + + @Test + public void testInt() { + testInt(5, 7); + testInt(-3, -7); + testInt(-3, 7); + testInt(42, -5); + } + + @Test + public void testLong() { + testLong(5, 7); + testLong(-3, -7); + testLong(-3, 7); + testLong(42, -5); + } +}