src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AddNode.java
author dlong
Wed, 09 Oct 2019 21:53:48 -0700
changeset 58533 46b0b7fe255c
parent 52578 7dd81e82d083
permissions -rw-r--r--
8231973: Update Graal Reviewed-by: kvn
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     1
/*
58533
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
     2
 * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     4
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     7
 * published by the Free Software Foundation.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     8
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    13
 * accompanied this code).
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    14
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    18
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    21
 * questions.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    22
 */
50858
2d3e99a72541 8205824: Update Graal
never
parents: 48190
diff changeset
    23
2d3e99a72541 8205824: Update Graal
never
parents: 48190
diff changeset
    24
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    25
package org.graalvm.compiler.nodes.calc;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    26
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    27
import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    28
import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    29
import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Add;
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
    30
import org.graalvm.compiler.core.common.type.IntegerStamp;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    31
import org.graalvm.compiler.core.common.type.Stamp;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    32
import org.graalvm.compiler.graph.NodeClass;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    33
import org.graalvm.compiler.graph.spi.Canonicalizable.BinaryCommutative;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    34
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    35
import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    36
import org.graalvm.compiler.nodeinfo.NodeInfo;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    37
import org.graalvm.compiler.nodes.ConstantNode;
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    38
import org.graalvm.compiler.nodes.NodeView;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    39
import org.graalvm.compiler.nodes.ValueNode;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    40
import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    41
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
    42
import jdk.vm.ci.code.CodeUtil;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    43
import jdk.vm.ci.meta.Constant;
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
    44
import jdk.vm.ci.meta.JavaConstant;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    45
import jdk.vm.ci.meta.Value;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    46
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    47
@NodeInfo(shortName = "+")
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    48
public class AddNode extends BinaryArithmeticNode<Add> implements NarrowableArithmeticNode, BinaryCommutative<ValueNode> {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    49
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    50
    public static final NodeClass<AddNode> TYPE = NodeClass.create(AddNode.class);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    51
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    52
    public AddNode(ValueNode x, ValueNode y) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    53
        this(TYPE, x, y);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    54
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    55
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    56
    protected AddNode(NodeClass<? extends AddNode> c, ValueNode x, ValueNode y) {
58533
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    57
        super(c, getArithmeticOpTable(x).getAdd(), x, y);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    58
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    59
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    60
    public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    61
        BinaryOp<Add> op = ArithmeticOpTable.forStamp(x.stamp(view)).getAdd();
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    62
        Stamp stamp = op.foldStamp(x.stamp(view), y.stamp(view));
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    63
        ConstantNode tryConstantFold = tryConstantFold(op, x, y, stamp, view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    64
        if (tryConstantFold != null) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    65
            return tryConstantFold;
46371
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
    66
        }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
    67
        if (x.isConstant() && !y.isConstant()) {
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    68
            return canonical(null, op, y, x, view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    69
        } else {
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    70
            return canonical(null, op, x, y, view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    71
        }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    72
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    73
58533
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    74
    @Override
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    75
    protected BinaryOp<Add> getOp(ArithmeticOpTable table) {
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    76
        return table.getAdd();
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    77
    }
46b0b7fe255c 8231973: Update Graal
dlong
parents: 52578
diff changeset
    78
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
    79
    private static ValueNode canonical(AddNode addNode, BinaryOp<Add> op, ValueNode forX, ValueNode forY, NodeView view) {
46371
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
    80
        AddNode self = addNode;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    81
        boolean associative = op.isAssociative();
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    82
        if (associative) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    83
            if (forX instanceof SubNode) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    84
                SubNode sub = (SubNode) forX;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    85
                if (sub.getY() == forY) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    86
                    // (a - b) + b
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    87
                    return sub.getX();
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    88
                }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    89
            }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    90
            if (forY instanceof SubNode) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    91
                SubNode sub = (SubNode) forY;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    92
                if (sub.getY() == forX) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    93
                    // b + (a - b)
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    94
                    return sub.getX();
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    95
                }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    96
            }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    97
        }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    98
        if (forY.isConstant()) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    99
            Constant c = forY.asConstant();
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   100
            if (op.isNeutral(c)) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   101
                return forX;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   102
            }
46371
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   103
            if (associative && self != null) {
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   104
                // canonicalize expressions like "(a + 1) + 2"
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
   105
                ValueNode reassociated = reassociate(self, ValueNode.isConstantPredicate(), forX, forY, view);
46371
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   106
                if (reassociated != self) {
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   107
                    return reassociated;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   108
                }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   109
            }
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   110
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   111
            // Attempt to optimize the pattern of an extend node between two add nodes.
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   112
            if (c instanceof JavaConstant && (forX instanceof SignExtendNode || forX instanceof ZeroExtendNode)) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   113
                IntegerConvertNode<?, ?> integerConvertNode = (IntegerConvertNode<?, ?>) forX;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   114
                ValueNode valueNode = integerConvertNode.getValue();
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   115
                long constant = ((JavaConstant) c).asLong();
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   116
                if (valueNode instanceof AddNode) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   117
                    AddNode addBeforeExtend = (AddNode) valueNode;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   118
                    if (addBeforeExtend.getY().isConstant()) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   119
                        // There is a second add before the extend node that also has a constant as
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   120
                        // second operand. Therefore there will be canonicalizations triggered if we
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   121
                        // can move the add above the extension. For this we need to check whether
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   122
                        // the result of the addition is the same before the extension (which can be
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   123
                        // either zero extend or sign extend).
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   124
                        IntegerStamp beforeExtendStamp = (IntegerStamp) addBeforeExtend.stamp(view);
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   125
                        int bits = beforeExtendStamp.getBits();
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   126
                        if (constant >= CodeUtil.minValue(bits) && constant <= CodeUtil.maxValue(bits)) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   127
                            IntegerStamp narrowConstantStamp = IntegerStamp.create(bits, constant, constant);
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   128
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   129
                            if (!IntegerStamp.addCanOverflow(narrowConstantStamp, beforeExtendStamp)) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   130
                                ConstantNode constantNode = ConstantNode.forIntegerStamp(narrowConstantStamp, constant);
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   131
                                if (forX instanceof SignExtendNode) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   132
                                    return SignExtendNode.create(AddNode.create(addBeforeExtend, constantNode, view), integerConvertNode.getResultBits(), view);
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   133
                                } else {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   134
                                    assert forX instanceof ZeroExtendNode;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   135
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   136
                                    // Must check to not cross zero with the new add.
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   137
                                    boolean crossesZeroPoint = true;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   138
                                    if (constant > 0) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   139
                                        if (beforeExtendStamp.lowerBound() >= 0 || beforeExtendStamp.upperBound() < -constant) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   140
                                            // We are good here.
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   141
                                            crossesZeroPoint = false;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   142
                                        }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   143
                                    } else {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   144
                                        if (beforeExtendStamp.lowerBound() >= -constant || beforeExtendStamp.upperBound() < 0) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   145
                                            // We are good here as well.
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   146
                                            crossesZeroPoint = false;
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   147
                                        }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   148
                                    }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   149
                                    if (!crossesZeroPoint) {
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   150
                                        return ZeroExtendNode.create(AddNode.create(addBeforeExtend, constantNode, view), integerConvertNode.getResultBits(), view);
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   151
                                    }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   152
                                }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   153
                            }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   154
                        }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   155
                    }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   156
                }
7dd81e82d083 8210777: Update Graal
dlong
parents: 50858
diff changeset
   157
            }
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   158
        }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   159
        if (forX instanceof NegateNode) {
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
   160
            return BinaryArithmeticNode.sub(forY, ((NegateNode) forX).getValue(), view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   161
        } else if (forY instanceof NegateNode) {
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
   162
            return BinaryArithmeticNode.sub(forX, ((NegateNode) forY).getValue(), view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   163
        }
46371
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   164
        if (self == null) {
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   165
            self = (AddNode) new AddNode(forX, forY).maybeCommuteInputs();
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   166
        }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   167
        return self;
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   168
    }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   169
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   170
    @Override
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   171
    public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   172
        ValueNode ret = super.canonical(tool, forX, forY);
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   173
        if (ret != this) {
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   174
            return ret;
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   175
        }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   176
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   177
        if (forX.isConstant() && !forY.isConstant()) {
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   178
            // we try to swap and canonicalize
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   179
            ValueNode improvement = canonical(tool, forY, forX);
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   180
            if (improvement != this) {
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   181
                return improvement;
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   182
            }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   183
            // if this fails we only swap
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   184
            return new AddNode(forY, forX);
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   185
        }
0337d0617e7b 8178088: Update Graal
iveresov
parents: 46344
diff changeset
   186
        BinaryOp<Add> op = getOp(forX, forY);
48190
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
   187
        NodeView view = NodeView.from(tool);
25cfedf27edc 8192814: Update Graal
dlong
parents: 47216
diff changeset
   188
        return canonical(this, op, forX, forY, view);
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   189
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   190
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   191
    @Override
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   192
    public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   193
        Value op1 = nodeValueMap.operand(getX());
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   194
        assert op1 != null : getX() + ", this=" + this;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   195
        Value op2 = nodeValueMap.operand(getY());
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   196
        if (shouldSwapInputs(nodeValueMap)) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   197
            Value tmp = op1;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   198
            op1 = op2;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   199
            op2 = tmp;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   200
        }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   201
        nodeValueMap.setResult(this, gen.emitAdd(op1, op2, false));
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   202
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   203
}