Mercurial > hg > truffle
annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java @ 18993:480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 28 Jan 2015 00:50:31 +0100 |
parents | f57d86eb036f |
children | a2cb19764970 |
rev | line source |
---|---|
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
1 /* |
18187
9619ba4daf4c
Rename Constant to JavaConstant.
Roland Schatz <roland.schatz@oracle.com>
parents:
17094
diff
changeset
|
2 * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
4 * |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
5 * This code is free software; you can redistribute it and/or modify it |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
6 * under the terms of the GNU General Public License version 2 only, as |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
7 * published by the Free Software Foundation. |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
8 * |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
9 * This code is distributed in the hope that it will be useful, but WITHOUT |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
12 * version 2 for more details (a copy is included in the LICENSE file that |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
13 * accompanied this code). |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
14 * |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
15 * You should have received a copy of the GNU General Public License version |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
16 * 2 along with this work; if not, write to the Free Software Foundation, |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
18 * |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
21 * questions. |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
22 */ |
6526
ee651c726397
split phases out of graal.phases project into graal.phases.common project
Doug Simon <doug.simon@oracle.com>
parents:
6525
diff
changeset
|
23 package com.oracle.graal.phases.common; |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
24 |
17065
37d6d174bc40
denote certain applications of DeadCodeEliminationPhase as optional and only run them if -G:-ReduceDCE
Doug Simon <doug.simon@oracle.com>
parents:
17046
diff
changeset
|
25 import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; |
37d6d174bc40
denote certain applications of DeadCodeEliminationPhase as optional and only run them if -G:-ReduceDCE
Doug Simon <doug.simon@oracle.com>
parents:
17046
diff
changeset
|
26 |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
27 import java.util.*; |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
28 |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
29 import com.oracle.graal.api.meta.*; |
5060
4ed4295ce15f
Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5059
diff
changeset
|
30 import com.oracle.graal.debug.*; |
4ed4295ce15f
Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5059
diff
changeset
|
31 import com.oracle.graal.graph.*; |
16404
fe985eebfcd9
ConvertDeoptimizeToGuardPhase: remove useless BeginNodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16207
diff
changeset
|
32 import com.oracle.graal.graph.spi.*; |
5060
4ed4295ce15f
Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5059
diff
changeset
|
33 import com.oracle.graal.nodes.*; |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
34 import com.oracle.graal.nodes.calc.*; |
8382
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
35 import com.oracle.graal.nodes.util.*; |
6526
ee651c726397
split phases out of graal.phases project into graal.phases.common project
Doug Simon <doug.simon@oracle.com>
parents:
6525
diff
changeset
|
36 import com.oracle.graal.phases.*; |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
37 |
11396
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
38 /** |
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
39 * This phase will find branches which always end with a {@link DeoptimizeNode} and replace their |
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
40 * {@link ControlSplitNode ControlSplitNodes} with {@link FixedGuardNode FixedGuardNodes}. |
15471
ef315dfdda35
new GraphUtil.predecessorIterable
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15145
diff
changeset
|
41 * |
11459
c66cdfb7445b
ConvertDeoptimizeToGuardPhase: small javadoc fix
Bernhard Urban <bernhard.urban@jku.at>
parents:
11413
diff
changeset
|
42 * This is useful because {@link FixedGuardNode FixedGuardNodes} will be lowered to |
11413
2c3ca4b71965
Add more javadoc to ConvertDeoptimizeToGuardPhase
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11396
diff
changeset
|
43 * {@link GuardNode GuardNodes} which can later be optimized more aggressively than control-flow |
2c3ca4b71965
Add more javadoc to ConvertDeoptimizeToGuardPhase
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11396
diff
changeset
|
44 * constructs. |
15471
ef315dfdda35
new GraphUtil.predecessorIterable
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15145
diff
changeset
|
45 * |
11396
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
46 * This is currently only done for branches that start from a {@link IfNode}. If it encounters a |
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
47 * branch starting at an other kind of {@link ControlSplitNode}, it will only bring the |
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
48 * {@link DeoptimizeNode} as close to the {@link ControlSplitNode} as possible. |
15471
ef315dfdda35
new GraphUtil.predecessorIterable
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15145
diff
changeset
|
49 * |
11396
a268b0de65d6
Add some javadoc for GuardLoweringPhase, ConvertDeoptimizeToGuardPhase and DeoptimizeNode
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
11335
diff
changeset
|
50 */ |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
51 public class ConvertDeoptimizeToGuardPhase extends Phase { |
16572
7531cdfed73c
ConvertDeoptimizeToGuardPhase: the SimplifierTool can be an instance field
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16462
diff
changeset
|
52 private SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(null, null, null, false); |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
53 |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
54 private static AbstractBeginNode findBeginNode(FixedNode startNode) { |
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
55 return GraphUtil.predecessorIterable(startNode).filter(AbstractBeginNode.class).first(); |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
56 } |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
57 |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
58 @Override |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
59 protected void run(final StructuredGraph graph) { |
16462
1a6989c482f6
assertion in ConvertDeoptimizeToGuardPhase
Lukas Stadler <lukas.stadler@oracle.com>
parents:
16404
diff
changeset
|
60 assert graph.hasValueProxies() : "ConvertDeoptimizeToGuardPhase always creates proxies"; |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
61 if (graph.getNodes(DeoptimizeNode.class).isEmpty()) { |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
62 return; |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
63 } |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
64 for (DeoptimizeNode d : graph.getNodes(DeoptimizeNode.class)) { |
8384
0edb2a515cb1
Fixes a corner case when killing the control flowing into a deoptimize node.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8382
diff
changeset
|
65 assert d.isAlive(); |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
66 visitDeoptBegin(AbstractBeginNode.prevBegin(d), d.action(), d.reason(), graph); |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
67 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
68 |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
69 for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.class)) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
70 |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
71 AbstractBeginNode pred = AbstractBeginNode.prevBegin(fixedGuard); |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
72 if (pred instanceof MergeNode) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
73 MergeNode merge = (MergeNode) pred; |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
74 if (fixedGuard.condition() instanceof CompareNode) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
75 CompareNode compare = (CompareNode) fixedGuard.condition(); |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
76 List<AbstractEndNode> mergePredecessors = merge.cfgPredecessors().snapshot(); |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
77 |
18487
0f4813e0b4a9
Use asConstant() instead of asJavaConstant() where possible.
Roland Schatz <roland.schatz@oracle.com>
parents:
18187
diff
changeset
|
78 Constant[] xs = IfNode.constantValues(compare.getX(), merge, true); |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
79 if (xs == null) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
80 continue; |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
81 } |
18487
0f4813e0b4a9
Use asConstant() instead of asJavaConstant() where possible.
Roland Schatz <roland.schatz@oracle.com>
parents:
18187
diff
changeset
|
82 Constant[] ys = IfNode.constantValues(compare.getY(), merge, true); |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
83 if (ys == null) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
84 continue; |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
85 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
86 for (int i = 0; i < mergePredecessors.size(); ++i) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
87 AbstractEndNode mergePredecessor = mergePredecessors.get(i); |
14721
ede5735ed267
deal with deleted ends in ConvertDeoptimizeToGuardPhase
Lukas Stadler <lukas.stadler@oracle.com>
parents:
12407
diff
changeset
|
88 if (!mergePredecessor.isAlive()) { |
ede5735ed267
deal with deleted ends in ConvertDeoptimizeToGuardPhase
Lukas Stadler <lukas.stadler@oracle.com>
parents:
12407
diff
changeset
|
89 break; |
ede5735ed267
deal with deleted ends in ConvertDeoptimizeToGuardPhase
Lukas Stadler <lukas.stadler@oracle.com>
parents:
12407
diff
changeset
|
90 } |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
91 if (xs[i] == null) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
92 continue; |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
93 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
94 if (ys[i] == null) { |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
95 continue; |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
96 } |
18487
0f4813e0b4a9
Use asConstant() instead of asJavaConstant() where possible.
Roland Schatz <roland.schatz@oracle.com>
parents:
18187
diff
changeset
|
97 if (xs[i] instanceof PrimitiveConstant && ys[i] instanceof PrimitiveConstant && |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
98 compare.condition().foldCondition(xs[i], ys[i], null, compare.unorderedIsTrue()) == fixedGuard.isNegated()) { |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
99 visitDeoptBegin(AbstractBeginNode.prevBegin(mergePredecessor), fixedGuard.getAction(), fixedGuard.getReason(), graph); |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
100 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
101 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
102 } |
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
103 } |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
104 } |
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
105 |
17094
86888df288ec
fixed case of Optionality constants
Doug Simon <doug.simon@oracle.com>
parents:
17065
diff
changeset
|
106 new DeadCodeEliminationPhase(Optional).apply(graph); |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
107 } |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
108 |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
109 private void visitDeoptBegin(AbstractBeginNode deoptBegin, DeoptimizationAction deoptAction, DeoptimizationReason deoptReason, StructuredGraph graph) { |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
110 if (deoptBegin instanceof MergeNode) { |
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
111 MergeNode mergeNode = (MergeNode) deoptBegin; |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
112 Debug.log("Visiting %s", mergeNode); |
16404
fe985eebfcd9
ConvertDeoptimizeToGuardPhase: remove useless BeginNodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16207
diff
changeset
|
113 FixedNode next = mergeNode.next(); |
fe985eebfcd9
ConvertDeoptimizeToGuardPhase: remove useless BeginNodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16207
diff
changeset
|
114 while (mergeNode.isAlive()) { |
fe985eebfcd9
ConvertDeoptimizeToGuardPhase: remove useless BeginNodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16207
diff
changeset
|
115 AbstractEndNode end = mergeNode.forwardEnds().first(); |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
116 AbstractBeginNode newBeginNode = findBeginNode(end); |
16572
7531cdfed73c
ConvertDeoptimizeToGuardPhase: the SimplifierTool can be an instance field
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16462
diff
changeset
|
117 visitDeoptBegin(newBeginNode, deoptAction, deoptReason, graph); |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
118 } |
16404
fe985eebfcd9
ConvertDeoptimizeToGuardPhase: remove useless BeginNodes
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16207
diff
changeset
|
119 assert next.isAlive(); |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
120 AbstractBeginNode newBeginNode = findBeginNode(next); |
16572
7531cdfed73c
ConvertDeoptimizeToGuardPhase: the SimplifierTool can be an instance field
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16462
diff
changeset
|
121 visitDeoptBegin(newBeginNode, deoptAction, deoptReason, graph); |
8382
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
122 return; |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
123 } else if (deoptBegin.predecessor() instanceof IfNode) { |
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
124 IfNode ifNode = (IfNode) deoptBegin.predecessor(); |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
125 AbstractBeginNode otherBegin = ifNode.trueSuccessor(); |
7767
4a6646d8eb87
separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode
Lukas Stadler <lukas.stadler@jku.at>
parents:
7660
diff
changeset
|
126 LogicNode conditionNode = ifNode.condition(); |
18845
f57d86eb036f
removed Node factory methods
Doug Simon <doug.simon@oracle.com>
parents:
18487
diff
changeset
|
127 FixedGuardNode guard = graph.add(new FixedGuardNode(conditionNode, deoptReason, deoptAction, deoptBegin == ifNode.trueSuccessor())); |
9360
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
128 FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor(); |
18993
480bd3b1adcd
Rename BeginNode => AbstractBeginNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
18845
diff
changeset
|
129 AbstractBeginNode survivingSuccessor; |
9360
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
130 if (deoptBegin == ifNode.trueSuccessor()) { |
11308
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
131 survivingSuccessor = ifNode.falseSuccessor(); |
9360
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
132 } else { |
11308
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
133 survivingSuccessor = ifNode.trueSuccessor(); |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
134 } |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
135 graph.removeSplitPropagate(ifNode, survivingSuccessor); |
11333
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
136 ProxyNode proxyGuard = null; |
11308
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
137 for (Node n : survivingSuccessor.usages().snapshot()) { |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
138 if (n instanceof GuardNode || n instanceof ProxyNode) { |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
139 // Keep wired to the begin node. |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
140 } else { |
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
141 // Rewire to the fixed guard. |
11333
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
142 if (survivingSuccessor instanceof LoopExitNode) { |
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
143 if (proxyGuard == null) { |
11335
ccbbb7dbca69
Make sure the created ProxyNode is of PhiType.Guard.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11333
diff
changeset
|
144 proxyGuard = ProxyNode.forGuard(guard, survivingSuccessor, graph); |
11333
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
145 } |
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
146 n.replaceFirstInput(survivingSuccessor, proxyGuard); |
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
147 } else { |
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
148 n.replaceFirstInput(survivingSuccessor, guard); |
a07d9113d1f6
Fix in ConvertDeoptimizeToGuardPhase for the case where we need to insert a ProxyNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11308
diff
changeset
|
149 } |
11308
77167d6f868c
Fix forward propagation of guarded nodes in ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
9436
diff
changeset
|
150 } |
6548
4dc9e468c8b0
The lowering currently does not support a FixedGuard as the usage of an InstanceOfNode
Christian Wimmer <christian.wimmer@oracle.com>
parents:
6526
diff
changeset
|
151 } |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
152 Debug.log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", deoptBegin == ifNode.trueSuccessor() ? "true" : "false", ifNode, otherBegin); |
9360
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
153 FixedNode next = pred.next(); |
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
154 pred.setNext(guard); |
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
155 guard.setNext(next); |
17046
c72182ae4476
Remove redundant Begin nodes before LoopExit.
Roland Schatz <roland.schatz@oracle.com>
parents:
16895
diff
changeset
|
156 survivingSuccessor.simplify(simplifierTool); |
9360
412f6e6dad73
Allow FixedGuard usages for InstanceOf nodes.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8441
diff
changeset
|
157 return; |
8382
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
158 } |
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
159 |
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
160 // We could not convert the control split - at least cut off control flow after the split. |
8388
bcfe9832552a
Speical case ExceptionObjectNode in deopt to guard conversion.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8387
diff
changeset
|
161 FixedWithNextNode deoptPred = deoptBegin; |
bcfe9832552a
Speical case ExceptionObjectNode in deopt to guard conversion.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8387
diff
changeset
|
162 FixedNode next = deoptPred.next(); |
bcfe9832552a
Speical case ExceptionObjectNode in deopt to guard conversion.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8387
diff
changeset
|
163 |
12407
53297646b011
Improve convert deoptimize to guard phase to recognize FixedGuardNode following MergeNode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11459
diff
changeset
|
164 if (!(next instanceof DeoptimizeNode)) { |
18845
f57d86eb036f
removed Node factory methods
Doug Simon <doug.simon@oracle.com>
parents:
18487
diff
changeset
|
165 DeoptimizeNode newDeoptNode = graph.add(new DeoptimizeNode(deoptAction, deoptReason)); |
8388
bcfe9832552a
Speical case ExceptionObjectNode in deopt to guard conversion.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8387
diff
changeset
|
166 deoptPred.setNext(newDeoptNode); |
bcfe9832552a
Speical case ExceptionObjectNode in deopt to guard conversion.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8387
diff
changeset
|
167 assert deoptPred == newDeoptNode.predecessor(); |
8382
496db8bf756d
Killing cfg path to deoptimization.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
8276
diff
changeset
|
168 GraphUtil.killCFG(next); |
4682
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
169 } |
7cb57ac24ab8
Better ConvertDeoptimizeToGuardPhase (experimental).
Andreas Woess <andreas.woess@jku.at>
parents:
4548
diff
changeset
|
170 } |
4548
f55914bc1d67
Added experimental ConvertDeoptimizeToGuardPhase.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
171 } |