Mercurial > hg > truffle
annotate graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java @ 16461:be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 10 Jul 2014 17:11:57 +0200 |
parents | 387b15da0f68 |
children | 3d190fc2e081 06c15e88d383 |
rev | line source |
---|---|
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
1 /* |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
2 * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
4 * |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
5 * This code is free software; you can redistribute it and/or modify it |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
6 * under the terms of the GNU General Public License version 2 only, as |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
7 * published by the Free Software Foundation. |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
8 * |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
9 * This code is distributed in the hope that it will be useful, but WITHOUT |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
12 * version 2 for more details (a copy is included in the LICENSE file that |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
13 * accompanied this code). |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
14 * |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
15 * You should have received a copy of the GNU General Public License version |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
16 * 2 along with this work; if not, write to the Free Software Foundation, |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
18 * |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
21 * questions. |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
22 */ |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
23 package com.oracle.graal.virtual.phases.ea; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
24 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
25 import static com.oracle.graal.api.meta.LocationIdentity.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
26 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
27 import java.util.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
28 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
29 import com.oracle.graal.api.meta.*; |
15198
2c0cfbf454b5
Move LIRTypeTool and Stamp to graal.compiler.common.
Josef Eisl <josef.eisl@jku.at>
parents:
14978
diff
changeset
|
30 import com.oracle.graal.compiler.common.type.*; |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
31 import com.oracle.graal.graph.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
32 import com.oracle.graal.nodes.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
33 import com.oracle.graal.nodes.cfg.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
34 import com.oracle.graal.nodes.extended.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
35 import com.oracle.graal.nodes.java.*; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
36 import com.oracle.graal.nodes.util.*; |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
37 import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.CacheEntry; |
10839
f3697f17f671
small fixes for early read elimination
Lukas Stadler <lukas.stadler@jku.at>
parents:
10814
diff
changeset
|
38 import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry; |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
39 import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.ReadCacheEntry; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
40 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
41 public class ReadEliminationClosure extends EffectsClosure<ReadEliminationBlockState> { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
42 |
15867
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
43 public ReadEliminationClosure(ControlFlowGraph cfg) { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
44 super(null, cfg); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
45 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
46 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
47 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
48 protected ReadEliminationBlockState getInitialState() { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
49 return new ReadEliminationBlockState(); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
50 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
51 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
52 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
53 protected boolean processNode(Node node, ReadEliminationBlockState state, GraphEffectList effects, FixedWithNextNode lastFixedNode) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
54 boolean deleted = false; |
15867
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
55 if (node instanceof AccessFieldNode) { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
56 AccessFieldNode access = (AccessFieldNode) node; |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
57 if (access.isVolatile()) { |
10914 | 58 processIdentity(state, ANY_LOCATION); |
15867
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
59 } else { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
60 ValueNode object = GraphUtil.unproxify(access.object()); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
61 LoadCacheEntry identifier = new LoadCacheEntry(object, access.field()); |
10914 | 62 ValueNode cachedValue = state.getCacheEntry(identifier); |
15867
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
63 if (node instanceof LoadFieldNode) { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
64 if (cachedValue != null) { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
65 effects.replaceAtUsages(access, cachedValue); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
66 addScalarAlias(access, cachedValue); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
67 deleted = true; |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
68 } else { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
69 state.addCacheEntry(identifier, access); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
70 } |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
71 } else { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
72 assert node instanceof StoreFieldNode; |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
73 StoreFieldNode store = (StoreFieldNode) node; |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
74 ValueNode value = getScalarAlias(store.value()); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
75 if (GraphUtil.unproxify(value) == GraphUtil.unproxify(cachedValue)) { |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
76 effects.deleteFixedNode(store); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
77 deleted = true; |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
78 } |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
79 state.killReadCache(store.field()); |
23f45bae453a
read elimination without schedule
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15198
diff
changeset
|
80 state.addCacheEntry(identifier, value); |
10914 | 81 } |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
82 } |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
83 } else if (node instanceof FixedAccessNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
84 if (node instanceof ReadNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
85 ReadNode read = (ReadNode) node; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
86 if (read.location() instanceof ConstantLocationNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
87 ValueNode object = GraphUtil.unproxify(read.object()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
88 ReadCacheEntry identifier = new ReadCacheEntry(object, read.location()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
89 ValueNode cachedValue = state.getCacheEntry(identifier); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
90 if (cachedValue != null) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
91 if (read.getGuard() != null && !(read.getGuard() instanceof FixedNode)) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
92 effects.addFixedNodeBefore(new ValueAnchorNode((ValueNode) read.getGuard()), read); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
93 } |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
94 effects.replaceAtUsages(read, cachedValue); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
95 addScalarAlias(read, cachedValue); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
96 deleted = true; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
97 } else { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
98 state.addCacheEntry(identifier, read); |
14710
6fd5f25b546c
keep the guard alive when removing ReadNodes without usages
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14633
diff
changeset
|
99 } |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
100 } |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
101 } else if (node instanceof WriteNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
102 WriteNode write = (WriteNode) node; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
103 if (write.location() instanceof ConstantLocationNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
104 ValueNode object = GraphUtil.unproxify(write.object()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
105 ReadCacheEntry identifier = new ReadCacheEntry(object, write.location()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
106 ValueNode cachedValue = state.getCacheEntry(identifier); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
107 |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
108 ValueNode value = getScalarAlias(write.value()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
109 if (GraphUtil.unproxify(value) == GraphUtil.unproxify(cachedValue)) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
110 effects.deleteFixedNode(write); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
111 deleted = true; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
112 } |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
113 processIdentity(state, write.location().getLocationIdentity()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
114 state.addCacheEntry(identifier, value); |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
115 } else { |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
116 processIdentity(state, write.location().getLocationIdentity()); |
11926
e04a86167368
Add support for unsafe access in early read elimination.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11857
diff
changeset
|
117 } |
e04a86167368
Add support for unsafe access in early read elimination.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11857
diff
changeset
|
118 } |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
119 } else if (node instanceof UnsafeAccessNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
120 if (node instanceof UnsafeLoadNode) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
121 UnsafeLoadNode load = (UnsafeLoadNode) node; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
122 if (load.offset().isConstant() && load.getLocationIdentity() != LocationIdentity.ANY_LOCATION) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
123 ValueNode object = GraphUtil.unproxify(load.object()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
124 LoadCacheEntry identifier = new LoadCacheEntry(object, load.getLocationIdentity()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
125 ValueNode cachedValue = state.getCacheEntry(identifier); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
126 if (cachedValue != null) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
127 effects.replaceAtUsages(load, cachedValue); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
128 addScalarAlias(load, cachedValue); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
129 deleted = true; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
130 } else { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
131 state.addCacheEntry(identifier, load); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
132 } |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
133 } |
10839
f3697f17f671
small fixes for early read elimination
Lukas Stadler <lukas.stadler@jku.at>
parents:
10814
diff
changeset
|
134 } else { |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
135 assert node instanceof UnsafeStoreNode; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
136 UnsafeStoreNode write = (UnsafeStoreNode) node; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
137 if (write.offset().isConstant() && write.getLocationIdentity() != LocationIdentity.ANY_LOCATION) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
138 ValueNode object = GraphUtil.unproxify(write.object()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
139 LoadCacheEntry identifier = new LoadCacheEntry(object, write.getLocationIdentity()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
140 ValueNode cachedValue = state.getCacheEntry(identifier); |
11926
e04a86167368
Add support for unsafe access in early read elimination.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11857
diff
changeset
|
141 |
15869
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
142 ValueNode value = getScalarAlias(write.value()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
143 if (GraphUtil.unproxify(value) == GraphUtil.unproxify(cachedValue)) { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
144 effects.deleteFixedNode(write); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
145 deleted = true; |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
146 } |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
147 processIdentity(state, write.getLocationIdentity()); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
148 state.addCacheEntry(identifier, value); |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
149 } else { |
387b15da0f68
small cleanup in ReadElimination
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15867
diff
changeset
|
150 processIdentity(state, write.getLocationIdentity()); |
11926
e04a86167368
Add support for unsafe access in early read elimination.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11857
diff
changeset
|
151 } |
e04a86167368
Add support for unsafe access in early read elimination.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
11857
diff
changeset
|
152 } |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
153 } else if (node instanceof MemoryCheckpoint.Single) { |
10914 | 154 LocationIdentity identity = ((MemoryCheckpoint.Single) node).getLocationIdentity(); |
155 processIdentity(state, identity); | |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
156 } else if (node instanceof MemoryCheckpoint.Multi) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
157 for (LocationIdentity identity : ((MemoryCheckpoint.Multi) node).getLocationIdentities()) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
158 processIdentity(state, identity); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
159 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
160 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
161 return deleted; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
162 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
163 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
164 private static void processIdentity(ReadEliminationBlockState state, LocationIdentity identity) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
165 if (identity == ANY_LOCATION) { |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
166 state.killReadCache(); |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
167 return; |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
168 } |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
169 state.killReadCache(identity); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
170 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
171 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
172 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
173 protected void processLoopExit(LoopExitNode exitNode, ReadEliminationBlockState initialState, ReadEliminationBlockState exitState, GraphEffectList effects) { |
16461
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
174 if (exitNode.graph().hasValueProxies()) { |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
175 for (Map.Entry<CacheEntry<?>, ValueNode> entry : exitState.getReadCache().entrySet()) { |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
176 if (initialState.getReadCache().get(entry.getKey()) != entry.getValue()) { |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
177 ProxyNode proxy = new ValueProxyNode(exitState.getCacheEntry(entry.getKey()), exitNode); |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
178 effects.addFloatingNode(proxy, "readCacheProxy"); |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
179 entry.setValue(proxy); |
be0ad9b9aefe
do not create proxy nodes if the graph doesn't need them
Lukas Stadler <lukas.stadler@oracle.com>
parents:
15869
diff
changeset
|
180 } |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
181 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
182 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
183 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
184 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
185 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
186 protected ReadEliminationBlockState cloneState(ReadEliminationBlockState other) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
187 return new ReadEliminationBlockState(other); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
188 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
189 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
190 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
191 protected MergeProcessor createMergeProcessor(Block merge) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
192 return new ReadEliminationMergeProcessor(merge); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
193 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
194 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
195 private class ReadEliminationMergeProcessor extends EffectsClosure<ReadEliminationBlockState>.MergeProcessor { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
196 |
14978
e302df8bf51c
separate subclasses for value and guard phis and proxies
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14850
diff
changeset
|
197 private final HashMap<Object, ValuePhiNode> materializedPhis = new HashMap<>(); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
198 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
199 public ReadEliminationMergeProcessor(Block mergeBlock) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
200 super(mergeBlock); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
201 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
202 |
14558
fabf5447603e
Use stamp constructor in PhiNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
13152
diff
changeset
|
203 protected <T> PhiNode getCachedPhi(T virtual, Stamp stamp) { |
14978
e302df8bf51c
separate subclasses for value and guard phis and proxies
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14850
diff
changeset
|
204 ValuePhiNode result = materializedPhis.get(virtual); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
205 if (result == null) { |
14978
e302df8bf51c
separate subclasses for value and guard phis and proxies
Lukas Stadler <lukas.stadler@oracle.com>
parents:
14850
diff
changeset
|
206 result = new ValuePhiNode(stamp, merge); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
207 materializedPhis.put(virtual, result); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
208 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
209 return result; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
210 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
211 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
212 @Override |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
213 protected void merge(List<ReadEliminationBlockState> states) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
214 super.merge(states); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
215 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
216 mergeReadCache(states); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
217 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
218 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
219 private void mergeReadCache(List<ReadEliminationBlockState> states) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
220 for (Map.Entry<CacheEntry<?>, ValueNode> entry : states.get(0).readCache.entrySet()) { |
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
221 CacheEntry<?> key = entry.getKey(); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
222 ValueNode value = entry.getValue(); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
223 boolean phi = false; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
224 for (int i = 1; i < states.size(); i++) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
225 ValueNode otherValue = states.get(i).readCache.get(key); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
226 if (otherValue == null) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
227 value = null; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
228 phi = false; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
229 break; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
230 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
231 if (!phi && otherValue != value) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
232 phi = true; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
233 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
234 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
235 if (phi) { |
14558
fabf5447603e
Use stamp constructor in PhiNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
13152
diff
changeset
|
236 PhiNode phiNode = getCachedPhi(entry, value.stamp().unrestricted()); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
237 mergeEffects.addFloatingNode(phiNode, "mergeReadCache"); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
238 for (int i = 0; i < states.size(); i++) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
239 afterMergeEffects.addPhiInput(phiNode, states.get(i).getCacheEntry(key)); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
240 } |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
241 newState.addCacheEntry(key, phiNode); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
242 } else if (value != null) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
243 newState.addCacheEntry(key, value); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
244 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
245 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
246 for (PhiNode phi : merge.phis()) { |
14633
da2431cc1506
Rename ValueNode kind() to getKind().
Josef Eisl <josef.eisl@jku.at>
parents:
14558
diff
changeset
|
247 if (phi.getKind() == Kind.Object) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
248 for (Map.Entry<CacheEntry<?>, ValueNode> entry : states.get(0).readCache.entrySet()) { |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
249 if (entry.getKey().object == phi.valueAt(0)) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
250 mergeReadCachePhi(phi, entry.getKey(), states); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
251 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
252 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
253 |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
254 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
255 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
256 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
257 |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
258 private void mergeReadCachePhi(PhiNode phi, CacheEntry<?> identifier, List<ReadEliminationBlockState> states) { |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
259 ValueNode[] values = new ValueNode[phi.valueCount()]; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
260 for (int i = 0; i < phi.valueCount(); i++) { |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
261 ValueNode value = states.get(i).getCacheEntry(identifier.duplicateWithObject(phi.valueAt(i))); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
262 if (value == null) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
263 return; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
264 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
265 values[i] = value; |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
266 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
267 |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
268 CacheEntry<?> newIdentifier = identifier.duplicateWithObject(phi); |
14558
fabf5447603e
Use stamp constructor in PhiNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
13152
diff
changeset
|
269 PhiNode phiNode = getCachedPhi(newIdentifier, values[0].stamp().unrestricted()); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
270 mergeEffects.addFloatingNode(phiNode, "mergeReadCachePhi"); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
271 for (int i = 0; i < values.length; i++) { |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
272 afterMergeEffects.addPhiInput(phiNode, values[i]); |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
273 } |
10814
8b0c8fbbfa1c
make early read elimination work on read/write nodes (in addition to load/store)
Lukas Stadler <lukas.stadler@jku.at>
parents:
10783
diff
changeset
|
274 newState.addCacheEntry(newIdentifier, phiNode); |
10783
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
275 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
276 } |
2151364f2076
add EarlyReadEliminationPhase, including tests
Lukas Stadler <lukas.stadler@jku.at>
parents:
diff
changeset
|
277 } |