Mercurial > hg > truffle
annotate graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java @ 15979:73a0c8e14cd1
delete unused histogram
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Thu, 29 May 2014 11:20:10 -0700 |
parents | d5b824a41530 |
children | 0993768dfc8e |
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.*; |
15472
1f4d56a1fdef
small fix in CompareNode.evaluate
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15414
diff
changeset
|
26 import com.oracle.graal.api.meta.ProfilingInfo.TriState; |
15193
96bb07a5d667
Spit up and move GraalInternalError.
Josef Eisl <josef.eisl@jku.at>
parents:
15184
diff
changeset
|
27 import com.oracle.graal.compiler.common.*; |
15200
97eed257999b
Move Condition to graal.compiler.common.
Josef Eisl <josef.eisl@jku.at>
parents:
15193
diff
changeset
|
28 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
|
29 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
|
30 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
|
31 import com.oracle.graal.nodes.*; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
32 |
5056
2f2c6347fce4
comments cleanup/retagging
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
4550
diff
changeset
|
33 /* 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
|
34 * 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
|
35 * |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
36 * 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
|
37 * 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
|
38 */ |
15349
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
39 public abstract class CompareNode extends BinaryOpLogicNode { |
3733
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 /** |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
42 * Constructs a new Compare instruction. |
15184
94874b2fc509
common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14950
diff
changeset
|
43 * |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
44 * @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
|
45 * @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
|
46 */ |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
47 public CompareNode(ValueNode x, ValueNode y) { |
15184
94874b2fc509
common superclass for binary logic nodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14950
diff
changeset
|
48 super(x, y); |
3733
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 /** |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
52 * 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
|
53 * |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
54 * @return the condition |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
55 */ |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
56 public abstract Condition condition(); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
57 |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
58 /** |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
59 * 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
|
60 * |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
61 * @return {@code true} if unordered inputs produce true |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
62 */ |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
63 public abstract boolean unorderedIsTrue(); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
64 |
12052
0afe7370260c
refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
65 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
|
66 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
|
67 Constant falseConstant = conditionalNode.falseValue().asConstant(); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
68 |
12052
0afe7370260c
refactored constantEquals(), lookupArrayLength() and readUnsafeConstant() out of MetaAccessProvider into ConstantReflectionProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
69 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
|
70 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
|
71 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
|
72 |
6571
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
73 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
|
74 return LogicConstantNode.forBoolean(trueResult, graph()); |
6571
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
75 } else { |
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
76 if (trueResult) { |
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
77 assert falseResult == false; |
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
78 return conditionalNode.condition(); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
79 } else { |
6571
f182f58459fa
removed unnecessary boxing
Doug Simon <doug.simon@oracle.com>
parents:
5758
diff
changeset
|
80 assert falseResult == true; |
11409
1f302b6e16b0
Introduce LogicNegationNode and remove Negatable interface.
Roland Schatz <roland.schatz@oracle.com>
parents:
9448
diff
changeset
|
81 return graph().unique(new LogicNegationNode(conditionalNode.condition())); |
3733
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 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
86 return this; |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
87 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
88 |
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
|
89 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
|
90 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
|
91 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
92 |
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
|
93 @Override |
15349
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
94 public TriState evaluate(ConstantReflectionProvider constantReflection, ValueNode forX, ValueNode forY) { |
15472
1f4d56a1fdef
small fix in CompareNode.evaluate
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15414
diff
changeset
|
95 if (forX.isConstant() && forY.isConstant()) { |
1f4d56a1fdef
small fix in CompareNode.evaluate
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15414
diff
changeset
|
96 return TriState.get(condition().foldCondition(forX.asConstant(), forY.asConstant(), constantReflection, unorderedIsTrue())); |
15349
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
97 } |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
98 return TriState.UNKNOWN; |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
99 } |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
100 |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
101 @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
|
102 public Node canonical(CanonicalizerTool tool) { |
15349
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
103 Node result = super.canonical(tool); |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
104 if (result != this) { |
7766f486f5d6
evaluate for BinaryOpLogicNodes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15348
diff
changeset
|
105 return result; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
106 } |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
107 if (x().isConstant()) { |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
108 if ((result = canonicalizeSymmetricConstant(tool, x().asConstant(), y(), true)) != this) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
109 return result; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
110 } |
5425
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5402
diff
changeset
|
111 } else if (y().isConstant()) { |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
112 if ((result = canonicalizeSymmetricConstant(tool, y().asConstant(), x(), false)) != this) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
113 return result; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
114 } |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
115 } else if (x() instanceof ConvertNode && y() instanceof ConvertNode) { |
9448
7b88c5e5cbd4
Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
7767
diff
changeset
|
116 ConvertNode convertX = (ConvertNode) x(); |
7b88c5e5cbd4
Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
7767
diff
changeset
|
117 ConvertNode convertY = (ConvertNode) y(); |
15414
997bfb063417
Fix bug in CompareNode canonicalization.
Roland Schatz <roland.schatz@oracle.com>
parents:
15349
diff
changeset
|
118 if (convertX.preservesOrder(condition()) && convertY.preservesOrder(condition()) && convertX.getInput().stamp().isCompatible(convertY.getInput().stamp())) { |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
119 return graph().unique(duplicateModified(convertX.getInput(), convertY.getInput())); |
9448
7b88c5e5cbd4
Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
7767
diff
changeset
|
120 } |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
121 |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
122 } |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
123 return this; |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
124 } |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
125 |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
126 protected abstract CompareNode duplicateModified(ValueNode newX, ValueNode newY); |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
127 |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
128 protected Node canonicalizeSymmetricConstant(CanonicalizerTool tool, Constant constant, ValueNode nonConstant, boolean mirrored) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
129 if (nonConstant instanceof BinaryNode) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
130 if (nonConstant instanceof ConditionalNode) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
131 return optimizeConditional(constant, (ConditionalNode) nonConstant, tool.getConstantReflection(), mirrored ? condition().mirror() : condition()); |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
132 } else if (nonConstant instanceof NormalizeCompareNode) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
133 return optimizeNormalizeCmp(constant, (NormalizeCompareNode) nonConstant, mirrored); |
12729
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
134 } |
15961
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
135 } else if (nonConstant instanceof ConvertNode) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
136 ConvertNode convert = (ConvertNode) nonConstant; |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
137 ConstantNode newConstant = canonicalConvertConstant(tool, convert, constant); |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
138 if (newConstant != null) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
139 if (mirrored) { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
140 return graph().unique(duplicateModified(newConstant, convert.getInput())); |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
141 } else { |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
142 return graph().unique(duplicateModified(convert.getInput(), newConstant)); |
d5b824a41530
CompareNode refactorings
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15912
diff
changeset
|
143 } |
12729
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
144 } |
9448
7b88c5e5cbd4
Add more canonicalizations for Compare and Negate nodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
7767
diff
changeset
|
145 } |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
146 return this; |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
147 } |
6950
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
148 |
15912
c44f617fb8d7
Optimize compare compressed pattern.
Roland Schatz <roland.schatz@oracle.com>
parents:
15472
diff
changeset
|
149 private ConstantNode canonicalConvertConstant(CanonicalizerTool tool, ConvertNode convert, Constant constant) { |
15414
997bfb063417
Fix bug in CompareNode canonicalization.
Roland Schatz <roland.schatz@oracle.com>
parents:
15349
diff
changeset
|
150 if (convert.preservesOrder(condition())) { |
14000
958c99d0790c
Split convert node into separate nodes for different conversions.
Roland Schatz <roland.schatz@oracle.com>
parents:
13195
diff
changeset
|
151 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
|
152 if (convert.convert(reverseConverted).equals(constant)) { |
15912
c44f617fb8d7
Optimize compare compressed pattern.
Roland Schatz <roland.schatz@oracle.com>
parents:
15472
diff
changeset
|
153 return ConstantNode.forConstant(convert.getInput().stamp(), reverseConverted, tool.getMetaAccess(), convert.graph()); |
12729
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
154 } |
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
155 } |
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
156 return null; |
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
157 } |
64d960e854e6
Canonicalize comparison of type conversion with constants.
Roland Schatz <roland.schatz@oracle.com>
parents:
12695
diff
changeset
|
158 |
12655
2c4aa758ee18
made ConstantNodes external to a Graph (GRAAL-508)
Doug Simon <doug.simon@oracle.com>
parents:
12052
diff
changeset
|
159 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
|
160 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
|
161 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
|
162 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
|
163 |
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
164 CompareNode comparison; |
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
165 if (condition == Condition.EQ) { |
14633
da2431cc1506
Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents:
14157
diff
changeset
|
166 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
|
167 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
|
168 } else { |
14633
da2431cc1506
Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents:
14157
diff
changeset
|
169 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
|
170 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
|
171 } |
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
172 } else if (condition == Condition.LT) { |
14633
da2431cc1506
Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents:
14157
diff
changeset
|
173 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
|
174 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
|
175 } else { |
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
176 assert condition == Condition.BT; |
14633
da2431cc1506
Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents:
14157
diff
changeset
|
177 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
|
178 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
|
179 } |
41938af2b3d8
modifications to support non-perm-gen changes in HotSpot
Doug Simon <doug.simon@oracle.com>
parents:
6571
diff
changeset
|
180 |
12655
2c4aa758ee18
made ConstantNodes external to a Graph (GRAAL-508)
Doug Simon <doug.simon@oracle.com>
parents:
12052
diff
changeset
|
181 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
|
182 } |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
183 } |