Mercurial > hg > truffle

annotate graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java @ 3078:b15101f82e2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added read elimination phase.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Tue, 28 Jun 2011 13:52:36 +0200
parents f35a9ae24f11
children bee93b329be2 0dfaf5733c63
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
1 /*
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
2 * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
4 *
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
7 * published by the Free Software Foundation.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
8 *
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
13 * accompanied this code).
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
14 *
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
18 *
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
21 * questions.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
22 */
2874
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
23 package com.oracle.max.graal.compiler.graph;
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
24
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
25 import java.util.*;
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
26
2874
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
27 import com.oracle.max.graal.compiler.*;
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
28 import com.oracle.max.graal.compiler.ir.*;
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
29 import com.oracle.max.graal.compiler.lir.*;
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
30 import com.oracle.max.graal.compiler.observer.*;
2879
7f584bf507ed Renamed and moved phase subclasses.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2875
diff changeset
31 import com.oracle.max.graal.compiler.phases.*;
2874
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
32 import com.oracle.max.graal.compiler.schedule.*;
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
33 import com.oracle.max.graal.compiler.value.*;
d90bf514d647 Renamed packages.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2872
diff changeset
34 import com.oracle.max.graal.graph.*;
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
35
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
36 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
37 * This class implements the overall container for the HIR (high-level IR) graph
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
38 * and directs its construction, optimization, and finalization.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
39 */
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
40 public class IR {
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
41
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
42 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
43 * The compilation associated with this IR.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
44 */
2888
224412c24426 Changed C1X=>Graal and c1x=>graal in Java code.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2887
diff changeset
45 public final GraalCompilation compilation;
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
46
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
47 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
48 * The start block of this IR.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
49 */
2718
c1ce2a53d6c3 Attempt to remove dependency between backend and BlockBegin.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2716
diff changeset
50 public LIRBlock startBlock;
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
51
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
52 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
53 * The linear-scan ordered list of blocks.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
54 */
2718
c1ce2a53d6c3 Attempt to remove dependency between backend and BlockBegin.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2716
diff changeset
55 private List<LIRBlock> orderedBlocks;
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
56
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
57 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
58 * Creates a new IR instance for the specified compilation.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
59 * @param compilation the compilation
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
60 */
2888
224412c24426 Changed C1X=>Graal and c1x=>graal in Java code.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2887
diff changeset
61 public IR(GraalCompilation compilation) {
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
62 this.compilation = compilation;
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
63 }
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
64
2801
2af109bec0c0 Make block contains a list of nodes instead a list of instructions.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2789
diff changeset
65 public Map<Node, LIRBlock> valueToBlock;
2759
b72e6638b9e6 Removed the link from BlockBegin to LIRBlock.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2756
diff changeset
66
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
67 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
68 * Builds the graph, optimizes it, and computes the linear scan block order.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
69 */
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
70 public void build() {
3011
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
71
3013
5ee0f57bb18c added message to verification error, InliningPhase uses TTY
Lukas Stadler <lukas.stadler@jku.at>
parents: 3011
diff changeset
72 // Object stored = GraphBuilderPhase.cachedGraphs.get(compilation.method);
3011
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
73 // if (stored != null) {
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
74 // Map<Node, Node> replacements = new HashMap<Node, Node>();
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
75 // CompilerGraph duplicate = (CompilerGraph) stored;
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
76 // replacements.put(duplicate.start(), compilation.graph.start());
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
77 // compilation.graph.addDuplicate(duplicate.getNodes(), replacements);
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
78 // } else {
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
79 new GraphBuilderPhase(compilation, compilation.method, false, false).apply(compilation.graph);
f00918f35c7f inlining and runtime interface related changes:
Lukas Stadler <lukas.stadler@jku.at>
parents: 2992
diff changeset
80 // }
2960
49a8b14e9d24 Tentative change that adds successor tags.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2948
diff changeset
81
2981
42681ed31c4d Some LoopCounter work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2948
diff changeset
82 //printGraph("After GraphBuilding", compilation.graph);
2953
445233cd91df added GraalOptions.TestGraphDuplication, fixed graph duplication
Lukas Stadler <lukas.stadler@jku.at>
parents: 2948
diff changeset
83
445233cd91df added GraalOptions.TestGraphDuplication, fixed graph duplication
Lukas Stadler <lukas.stadler@jku.at>
parents: 2948
diff changeset
84 if (GraalOptions.TestGraphDuplication) {
445233cd91df added GraalOptions.TestGraphDuplication, fixed graph duplication
Lukas Stadler <lukas.stadler@jku.at>
parents: 2948
diff changeset
85 new DuplicationPhase().apply(compilation.graph);
2984
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2975 2981
diff changeset
86 //printGraph("After Duplication", compilation.graph);
2953
445233cd91df added GraalOptions.TestGraphDuplication, fixed graph duplication
Lukas Stadler <lukas.stadler@jku.at>
parents: 2948
diff changeset
87 }
445233cd91df added GraalOptions.TestGraphDuplication, fixed graph duplication
Lukas Stadler <lukas.stadler@jku.at>
parents: 2948
diff changeset
88
2886
c3b8968233fa Removed counting of deleted nodes for each phase.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2883
diff changeset
89 new DeadCodeEliminationPhase().apply(compilation.graph);
2981
42681ed31c4d Some LoopCounter work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2948
diff changeset
90 //printGraph("After DeadCodeElimination", compilation.graph);
2886
c3b8968233fa Removed counting of deleted nodes for each phase.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2883
diff changeset
91
2888
224412c24426 Changed C1X=>Graal and c1x=>graal in Java code.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2887
diff changeset
92 if (GraalOptions.Inline) {
2911
Lukas Stadler <lukas.stadler@jku.at>
parents: 2910 2888
diff changeset
93 new InliningPhase(compilation, this, GraalOptions.TraceInlining).apply(compilation.graph);
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
94 }
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
95
2838
adc4b3ec0a8c Deleted LIR critical edge splitter and replaced with GraalIR edge splitter using Anchor nodes (=> simpler).
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2835
diff changeset
96 Graph graph = compilation.graph;
adc4b3ec0a8c Deleted LIR critical edge splitter and replaced with GraalIR edge splitter using Anchor nodes (=> simpler).
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2835
diff changeset
97
2888
224412c24426 Changed C1X=>Graal and c1x=>graal in Java code.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2887
diff changeset
98 if (GraalOptions.OptCanonicalizer) {
2863
4f64bd98f9dc Canonicalization work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2858
diff changeset
99 new CanonicalizerPhase().apply(graph);
3046
f9e045cd2c23 Merge, add some edge spliting around loopbegin when necessary
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 3042 2992
diff changeset
100 new DeadCodeEliminationPhase().apply(graph);
2863
4f64bd98f9dc Canonicalization work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2858
diff changeset
101 }
3060
f08a810b8449 Graph.getNodes() is Iterable<Node>, doesn't return null nodes and doesn't throw ConcurrentModificationException
Lukas Stadler <lukas.stadler@jku.at>
parents: 3052
diff changeset
102 //
f08a810b8449 Graph.getNodes() is Iterable<Node>, doesn't return null nodes and doesn't throw ConcurrentModificationException
Lukas Stadler <lukas.stadler@jku.at>
parents: 3052
diff changeset
103 // new EscapeAnalysisPhase().apply(graph);
2863
4f64bd98f9dc Canonicalization work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2858
diff changeset
104
3042
183389909fe3 Begin making LoopBegin not be a Merge anymore
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2984
diff changeset
105 if (GraalOptions.OptLoops) {
183389909fe3 Begin making LoopBegin not be a Merge anymore
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2984
diff changeset
106 new LoopPhase().apply(graph);
183389909fe3 Begin making LoopBegin not be a Merge anymore
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2984
diff changeset
107 }
2981
42681ed31c4d Some LoopCounter work
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2948
diff changeset
108
3033
ebd1d48a1ae1 Local value numbering for inserted null check guards.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3029
diff changeset
109 if (GraalOptions.Lower) {
ebd1d48a1ae1 Local value numbering for inserted null check guards.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3029
diff changeset
110 new LoweringPhase(compilation.runtime).apply(graph);
3070
16043c211a98 Towards splitting the lowering and the memory graph creation phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3062
diff changeset
111 new MemoryPhase().apply(graph);
3078
b15101f82e2d Added read elimination phase.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3072
diff changeset
112 new ReadEliminationPhase().apply(graph);
3033
ebd1d48a1ae1 Local value numbering for inserted null check guards.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3029
diff changeset
113 }
2945
41318fcb6b56 Added two algorithms for identifying Java-level blocks.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2919
diff changeset
114
41318fcb6b56 Added two algorithms for identifying Java-level blocks.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2919
diff changeset
115 IdentifyBlocksPhase schedule = new IdentifyBlocksPhase(true);
2895
5fd2b31f50ee Schedule now inherits Phase.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2888
diff changeset
116 schedule.apply(graph);
2901
d577d07cedec Added time measurement for phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2895
diff changeset
117
d577d07cedec Added time measurement for phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2895
diff changeset
118
2760
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
119 List<Block> blocks = schedule.getBlocks();
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
120 List<LIRBlock> lirBlocks = new ArrayList<LIRBlock>();
2760
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
121 Map<Block, LIRBlock> map = new HashMap<Block, LIRBlock>();
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
122 for (Block b : blocks) {
2777
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
123 LIRBlock block = new LIRBlock(b.blockID());
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
124 map.put(b, block);
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
125 block.setInstructions(b.getInstructions());
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
126 block.setLinearScanNumber(b.blockID());
2805
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2801
diff changeset
127
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2801
diff changeset
128 block.setFirstInstruction(b.firstNode());
c3f64b66fc78 Towards removing the next pointer from Constant and ArithmeticOp
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2801
diff changeset
129 block.setLastInstruction(b.lastNode());
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
130 lirBlocks.add(block);
2760
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
131 }
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
132
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
133 for (Block b : blocks) {
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
134 for (Block succ : b.getSuccessors()) {
2833
1cd59ca9ac86 Removed Throw HIR instruction. Removed special handling for exceptions in register allocator.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2832
diff changeset
135 map.get(b).blockSuccessors().add(map.get(succ));
2760
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
136 }
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
137
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
138 for (Block pred : b.getPredecessors()) {
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
139 map.get(b).blockPredecessors().add(map.get(pred));
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
140 }
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
141 }
127db58b044e One more step towards schedule.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2759
diff changeset
142
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
143 orderedBlocks = lirBlocks;
2801
2af109bec0c0 Make block contains a list of nodes instead a list of instructions.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2789
diff changeset
144 valueToBlock = new HashMap<Node, LIRBlock>();
2777
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
145 for (LIRBlock b : orderedBlocks) {
2801
2af109bec0c0 Make block contains a list of nodes instead a list of instructions.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2789
diff changeset
146 for (Node i : b.getInstructions()) {
2777
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
147 valueToBlock.put(i, b);
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
148 }
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
149 }
2967
60a58915c94d Removed next pointer from EndNode to Merge. New scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2965
diff changeset
150 startBlock = valueToBlock.get(graph.start());
2777
3e4d992fd312 towards replacing computelinearscanorder with scheduler.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2776
diff changeset
151 assert startBlock != null;
2789
aeccd2af4e9e Fixes around critical edge split and placeholder removal after goto removal.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2788
diff changeset
152 assert startBlock.blockPredecessors().size() == 0;
2788
df4c5254c5cc Towards goto removal.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2783
diff changeset
153
3023
79165996a12d Fixed an issue with bci=-1 in the framestate of a merged unwind.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3013
diff changeset
154
79165996a12d Fixed an issue with bci=-1 in the framestate of a merged unwind.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3013
diff changeset
155 if (GraalOptions.Time) {
79165996a12d Fixed an issue with bci=-1 in the framestate of a merged unwind.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3013
diff changeset
156 GraalTimers.COMPUTE_LINEAR_SCAN_ORDER.start();
79165996a12d Fixed an issue with bci=-1 in the framestate of a merged unwind.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3013
diff changeset
157 }
79165996a12d Fixed an issue with bci=-1 in the framestate of a merged unwind.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3013
diff changeset
158
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
159 ComputeLinearScanOrder clso = new ComputeLinearScanOrder(lirBlocks.size(), startBlock);
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
160 orderedBlocks = clso.linearScanOrder();
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
161 this.compilation.stats.loopCount = clso.numLoops();
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
162
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
163 int z = 0;
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
164 for (LIRBlock b : orderedBlocks) {
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
165 b.setLinearScanNumber(z++);
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
166 }
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
167
2901
d577d07cedec Added time measurement for phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2895
diff changeset
168 printGraph("After linear scan order", compilation.graph);
2778
2ac7b30b7290 Enabled new block finding algorithm.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2777
diff changeset
169
2901
d577d07cedec Added time measurement for phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2895
diff changeset
170 if (GraalOptions.Time) {
d577d07cedec Added time measurement for phases.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2895
diff changeset
171 GraalTimers.COMPUTE_LINEAR_SCAN_ORDER.stop();
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
172 }
3061
00239c259a42 Compute Loop information, keep Placeholder on loop exits, added some utility functions for data/cfg traversal
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 3052
diff changeset
173
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
174 }
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
175
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
176 /**
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
177 * Gets the linear scan ordering of blocks as a list.
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
178 * @return the blocks in linear scan order
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
179 */
2718
c1ce2a53d6c3 Attempt to remove dependency between backend and BlockBegin.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2716
diff changeset
180 public List<LIRBlock> linearScanOrder() {
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
181 return orderedBlocks;
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
182 }
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
183
2866
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
184 public void printGraph(String phase, Graph graph) {
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
185 if (compilation.compiler.isObserved()) {
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
186 compilation.compiler.fireCompilationEvent(new CompilationEvent(compilation, phase, graph, true, false));
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
187 }
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
188 }
7f14e6b48a9c added dead code elimination
Lukas Stadler <lukas.stadler@jku.at>
parents: 2842
diff changeset
189
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
190 public int numLoops() {
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
191 return compilation.stats.loopCount;
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
192 }
2564
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
193
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
194 /**
2840
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
195 * Gets the maximum number of locks in the graph's frame states.
2564
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
196 */
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
197 public final int maxLocks() {
2840
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
198 int maxLocks = 0;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
199 for (Node node : compilation.graph.getNodes()) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
200 if (node instanceof FrameState) {
2910
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
201 FrameState current = (FrameState) node;
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
202 int lockCount = 0;
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
203 while (current != null) {
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
204 lockCount += current.locksSize();
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
205 current = current.outerFrameState();
7eec76f3e39e adjust monitor index while inlining, renamed NodeWorklist to NodeFlood
Lukas Stadler <lukas.stadler@jku.at>
parents: 2883
diff changeset
206 }
2840
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
207 if (lockCount > maxLocks) {
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
208 maxLocks = lockCount;
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
209 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
210 }
75e0d39833a0 new CompilerGraph, create only one Return and one Unwind per CompilerGraph
Lukas Stadler <lukas.stadler@jku.at>
parents: 2835
diff changeset
211 }
2564
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
212 return maxLocks;
274360f98f97 Remove inlining (2nd part) removed IRScope
Gilles Duboscq <gilles.duboscq@oracle.com>
parents: 2546
diff changeset
213 }
2718
c1ce2a53d6c3 Attempt to remove dependency between backend and BlockBegin.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2716
diff changeset
214
3072
f35a9ae24f11 More clean up in the IR.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3070
diff changeset
215 public FixedNodeWithNext getHIRStartBlock() {
f35a9ae24f11 More clean up in the IR.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 3070
diff changeset
216 return (FixedNodeWithNext) compilation.graph.start().successors().get(0);
2718
c1ce2a53d6c3 Attempt to remove dependency between backend and BlockBegin.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2716
diff changeset
217 }
2507
9ec15d6914ca Pull over of compiler from maxine repository.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents:
diff changeset
218 }