Mercurial > hg > truffle

annotate graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java @ 15348:1c347436d596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added UnaryOpLogicNode base class, renamed BinaryLogicNode
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 24 Apr 2014 10:44:12 +0200
parents 97eed257999b
children 7766f486f5d6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
1 /*
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
2 * Copyright (c) 2011, 2011, Oracle and/or its affiliates. All rights reserved.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
4 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
7 * published by the Free Software Foundation.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
8 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
13 * accompanied this code).
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
14 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
18 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
21 * questions.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
22 */
5060
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
23 package com.oracle.graal.nodes.calc;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
24
5507
dc71b06d09f8 Moving classes from cri.ri to api.meta.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5502
diff changeset
25 import com.oracle.graal.api.meta.*;
15193
96bb07a5d667 Spit up and move GraalInternalError.
Josef Eisl <josef.eisl@jku.at>
parents: 15184
diff changeset
26 import com.oracle.graal.compiler.common.*;
15200
97eed257999b Move Condition to graal.compiler.common.
Josef Eisl <josef.eisl@jku.at>
parents: 15193
diff changeset
27 import com.oracle.graal.compiler.common.calc.*;
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
28 import com.oracle.graal.graph.*;
11881
da9db8331658 moved Canonicalizable and Simplifiable to the com.oracle.graal.graph project (GRAAL-506)
Doug Simon <doug.simon@oracle.com>
parents: 11880
diff changeset
29 import com.oracle.graal.graph.spi.*;
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
30 import com.oracle.graal.nodes.*;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
31
5056
2f2c6347fce4 comments cleanup/retagging
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4550
diff changeset
32 /* TODO (thomaswue/gdub) For high-level optimization purpose the compare node should be a boolean *value* (it is currently only a helper node)
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
33 * But in the back-end the comparison should not always be materialized (for example in x86 the comparison result will not be in a register but in a flag)
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
34 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
35 * Compare should probably be made a value (so that it can be canonicalized for example) and in later stages some Compare usage should be transformed
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
36 * into variants that do not materialize the value (CompareIf, CompareGuard...)
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
37 */
15348
1c347436d596 added UnaryOpLogicNode base class, renamed BinaryLogicNode
Lukas Stadler <lukas.stadler@oracle.com>
parents: 15200
diff changeset
38 public abstract class CompareNode extends BinaryOpLogicNode implements Canonicalizable {
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
39
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
40 /**
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
41 * Constructs a new Compare instruction.
15184
94874b2fc509 common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14950
diff changeset
42 *
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
43 * @param x the instruction producing the first input to the instruction
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
44 * @param y the instruction that produces the second input to this instruction
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
45 */
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
46 public CompareNode(ValueNode x, ValueNode y) {
15184
94874b2fc509 common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14950
diff changeset
47 super(x, y);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
48 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
49
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
50 /**
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
51 * Gets the condition (comparison operation) for this instruction.
15184
94874b2fc509 common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14950
diff changeset
52 *
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
53 * @return the condition
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
54 */
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
55 public abstract Condition condition();
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
56
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
57 /**
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
58 * Checks whether unordered inputs mean true or false (only applies to float operations).
15184
94874b2fc509 common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents: 14950
diff changeset
59 *
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
60 * @return {@code true} if unordered inputs produce true
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
61 */
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
62 public abstract boolean unorderedIsTrue();
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
63
12052
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
64 private LogicNode optimizeConditional(Constant constant, ConditionalNode conditionalNode, ConstantReflectionProvider constantReflection, Condition cond) {
5660
3570883de730 generalized canonicalization of a compare node for inputs of type ConditionalNode
Doug Simon <doug.simon@oracle.com>
parents: 5541
diff changeset
65 Constant trueConstant = conditionalNode.trueValue().asConstant();
3570883de730 generalized canonicalization of a compare node for inputs of type ConditionalNode
Doug Simon <doug.simon@oracle.com>
parents: 5541
diff changeset
66 Constant falseConstant = conditionalNode.falseValue().asConstant();
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
67
12052
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
68 if (falseConstant != null && trueConstant != null && constantReflection != null) {
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
69 boolean trueResult = cond.foldCondition(trueConstant, constant, constantReflection, unorderedIsTrue());
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
70 boolean falseResult = cond.foldCondition(falseConstant, constant, constantReflection, unorderedIsTrue());
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
71
6571
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
72 if (trueResult == falseResult) {
7767
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode
Lukas Stadler <lukas.stadler@jku.at>
parents: 7530
diff changeset
73 return LogicConstantNode.forBoolean(trueResult, graph());
6571
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
74 } else {
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
75 if (trueResult) {
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
76 assert falseResult == false;
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
77 return conditionalNode.condition();
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
78 } else {
6571
f182f58459fa removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents: 5758
diff changeset
79 assert falseResult == true;
11409
1f302b6e16b0 Introduce LogicNegationNode and remove Negatable interface.
Roland Schatz <roland.schatz@oracle.com>
parents: 9448
diff changeset
80 return graph().unique(new LogicNegationNode(conditionalNode.condition()));
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
81
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
82 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
83 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
84 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
85 return this;
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
86 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
87
7767
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode
Lukas Stadler <lukas.stadler@jku.at>
parents: 7530
diff changeset
88 protected LogicNode optimizeNormalizeCmp(Constant constant, NormalizeCompareNode normalizeNode, boolean mirrored) {
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
89 throw new GraalInternalError("NormalizeCompareNode connected to %s (%s %s %s)", this, constant, normalizeNode, mirrored);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
90 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
91
7767
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode
Lukas Stadler <lukas.stadler@jku.at>
parents: 7530
diff changeset
92 @Override
11880
9a747d8e0d0f broadened types in Canonicalizable interface so that it can be moved to the com.oracle.graal.graph project (GRAAL-506)
Doug Simon <doug.simon@oracle.com>
parents: 11409
diff changeset
93 public Node canonical(CanonicalizerTool tool) {
11959
23ccaa863eda made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11881
diff changeset
94 if (x().isConstant() && y().isConstant() && tool.getMetaAccess() != null) {
12052
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
95 return LogicConstantNode.forBoolean(condition().foldCondition(x().asConstant(), y().asConstant(), tool.getConstantReflection(), unorderedIsTrue()), graph());
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
96 }
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
97 if (x().isConstant()) {
5660
3570883de730 generalized canonicalization of a compare node for inputs of type ConditionalNode
Doug Simon <doug.simon@oracle.com>
parents: 5541
diff changeset
98 if (y() instanceof ConditionalNode) {
12052
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
99 return optimizeConditional(x().asConstant(), (ConditionalNode) y(), tool.getConstantReflection(), condition().mirror());
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
100 } else if (y() instanceof NormalizeCompareNode) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
101 return optimizeNormalizeCmp(x().asConstant(), (NormalizeCompareNode) y(), true);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
102 }
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
103 } else if (y().isConstant()) {
5660
3570883de730 generalized canonicalization of a compare node for inputs of type ConditionalNode
Doug Simon <doug.simon@oracle.com>
parents: 5541
diff changeset
104 if (x() instanceof ConditionalNode) {
12052
0afe7370260c refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents: 11959
diff changeset
105 return optimizeConditional(y().asConstant(), (ConditionalNode) x(), tool.getConstantReflection(), condition());
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
106 } else if (x() instanceof NormalizeCompareNode) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5402
diff changeset
107 return optimizeNormalizeCmp(y().asConstant(), (NormalizeCompareNode) x(), false);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
108 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
109 }
9448
7b88c5e5cbd4 Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7767
diff changeset
110 if (x() instanceof ConvertNode && y() instanceof ConvertNode) {
7b88c5e5cbd4 Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7767
diff changeset
111 ConvertNode convertX = (ConvertNode) x();
7b88c5e5cbd4 Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7767
diff changeset
112 ConvertNode convertY = (ConvertNode) y();
14000
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
113 if (convertX.isLossless() && convertY.isLossless() && convertX.getInput().stamp().isCompatible(convertY.getInput().stamp())) {
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
114 setX(convertX.getInput());
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
115 setY(convertY.getInput());
9448
7b88c5e5cbd4 Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7767
diff changeset
116 }
12729
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
117 } else if (x() instanceof ConvertNode && y().isConstant()) {
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
118 ConvertNode convertX = (ConvertNode) x();
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
119 ConstantNode newY = canonicalConvertConstant(convertX, y().asConstant());
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
120 if (newY != null) {
14000
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
121 setX(convertX.getInput());
12729
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
122 setY(newY);
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
123 }
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
124 } else if (y() instanceof ConvertNode && x().isConstant()) {
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
125 ConvertNode convertY = (ConvertNode) y();
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
126 ConstantNode newX = canonicalConvertConstant(convertY, x().asConstant());
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
127 if (newX != null) {
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
128 setX(newX);
14000
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
129 setY(convertY.getInput());
12729
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
130 }
9448
7b88c5e5cbd4 Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7767
diff changeset
131 }
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
132 return this;
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
133 }
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
134
12729
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
135 private static ConstantNode canonicalConvertConstant(ConvertNode convert, Constant constant) {
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
136 if (convert.isLossless()) {
14000
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
137 Constant reverseConverted = convert.reverse(constant);
958c99d0790c Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents: 13195
diff changeset
138 if (convert.convert(reverseConverted).equals(constant)) {
14008
1658d30cd273 Fix type error in compare convert-constant optimization.
Roland Schatz <roland.schatz@oracle.com>
parents: 14000
diff changeset
139 return ConstantNode.forPrimitive(convert.getInput().stamp(), reverseConverted, convert.graph());
12729
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
140 }
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
141 }
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
142 return null;
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
143 }
64d960e854e6 Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents: 12695
diff changeset
144
12655
2c4aa758ee18 made ConstantNodes external to a Graph (GRAAL-508)
Doug Simon <doug.simon@oracle.com>
parents: 12052
diff changeset
145 public static CompareNode createCompareNode(StructuredGraph graph, Condition condition, ValueNode x, ValueNode y) {
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
146 assert x.getKind() == y.getKind();
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
147 assert condition.isCanonical() : "condition is not canonical: " + condition;
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
148 assert !x.getKind().isNumericFloat();
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
149
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
150 CompareNode comparison;
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
151 if (condition == Condition.EQ) {
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
152 if (x.getKind() == Kind.Object) {
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
153 comparison = new ObjectEqualsNode(x, y);
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
154 } else {
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
155 assert x.getKind().isNumericInteger();
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
156 comparison = new IntegerEqualsNode(x, y);
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
157 }
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
158 } else if (condition == Condition.LT) {
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
159 assert x.getKind().isNumericInteger();
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
160 comparison = new IntegerLessThanNode(x, y);
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
161 } else {
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
162 assert condition == Condition.BT;
14633
da2431cc1506 Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents: 14157
diff changeset
163 assert x.getKind().isNumericInteger();
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
164 comparison = new IntegerBelowThanNode(x, y);
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
165 }
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
166
12655
2c4aa758ee18 made ConstantNodes external to a Graph (GRAAL-508)
Doug Simon <doug.simon@oracle.com>
parents: 12052
diff changeset
167 return graph.unique(comparison);
6950
41938af2b3d8 modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents: 6571
diff changeset
168 }
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
169 }