Mercurial > hg > graal-jvmci-8
changeset 5248:066f1687ba24
rename: nodesFor -> blockToNodesMap
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 18 Apr 2012 13:42:11 +0200 |
parents | 62bbfd78c703 |
children | 2d26d5ca2e5b |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/schedule/SchedulePhase.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeSystemTest.java |
diffstat | 5 files changed, 30 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Tue Apr 17 22:24:14 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Apr 18 13:42:11 2012 +0200 @@ -233,7 +233,7 @@ b.linearScanNumber = z++; } - LIR lir = new LIR(schedule.getCFG(), schedule.getNodesFor(), linearScanOrder, codeEmittingOrder); + LIR lir = new LIR(schedule.getCFG(), schedule.getBlockToNodesMap(), linearScanOrder, codeEmittingOrder); Debug.dump(lir, "After linear scan order"); return lir;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/schedule/SchedulePhase.java Tue Apr 17 22:24:14 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/schedule/SchedulePhase.java Wed Apr 18 13:42:11 2012 +0200 @@ -38,7 +38,10 @@ private ControlFlowGraph cfg; private NodeMap<Block> earliestCache; - private BlockMap<List<Node>> nodesFor; + /** + * Map from blocks to the nodes in each block. + */ + private BlockMap<List<Node>> blockToNodesMap; public SchedulePhase() { super("Schedule"); @@ -48,7 +51,7 @@ protected void run(StructuredGraph graph) { cfg = ControlFlowGraph.compute(graph, true, true, true, false); earliestCache = graph.createNodeMap(); - nodesFor = new BlockMap<>(cfg); + blockToNodesMap = new BlockMap<>(cfg); assignBlockToNodes(graph); sortNodesWithinBlocks(graph); @@ -56,7 +59,7 @@ public void scheduleGraph() { for (Block block : cfg.getBlocks()) { - List<Node> nodeList = nodesFor.get(block); + List<Node> nodeList = blockToNodesMap.get(block); ScheduledNode last = null; for (Node node : nodeList) { if (!(node instanceof FrameState)) { @@ -73,19 +76,25 @@ return cfg; } - public BlockMap<List<Node>> getNodesFor() { - return nodesFor; + /** + * Gets the map from each block to the nodes in the block. + */ + public BlockMap<List<Node>> getBlockToNodesMap() { + return blockToNodesMap; } + /** + * Gets the nodes in a given block. + */ public List<Node> nodesFor(Block block) { - return nodesFor.get(block); + return blockToNodesMap.get(block); } private void assignBlockToNodes(StructuredGraph graph) { for (Block block : cfg.getBlocks()) { List<Node> nodes = new ArrayList<>(); - assert nodesFor.get(block) == null; - nodesFor.put(block, nodes); + assert blockToNodesMap.get(block) == null; + blockToNodesMap.put(block, nodes); for (Node node : block.getNodes()) { nodes.add(node); } @@ -122,7 +131,7 @@ block = latestBlock; } cfg.getNodeToBlock().set(n, block); - nodesFor.get(block).add(n); + blockToNodesMap.get(block).add(n); } private Block latestBlock(Node n) { @@ -264,7 +273,7 @@ } private void sortNodesWithinBlocks(Block b, NodeBitMap map) { - List<Node> instructions = nodesFor.get(b); + List<Node> instructions = blockToNodesMap.get(b); List<Node> sortedInstructions = new ArrayList<>(instructions.size() + 2); assert !map.isMarked(b.getBeginNode()) && cfg.blockFor(b.getBeginNode()) == b; @@ -298,7 +307,7 @@ sortedInstructions.add(b.getEndNode()); } } - nodesFor.put(b, sortedInstructions); + blockToNodesMap.put(b, sortedInstructions); } private void addToSorting(Block b, Node i, List<Node> sortedInstructions, NodeBitMap map) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java Tue Apr 17 22:24:14 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java Wed Apr 18 13:42:11 2012 +0200 @@ -141,7 +141,7 @@ out.print(succ + " "); } System.out.println(); - for (Node node : printSchedule.getNodesFor().get(block)) { + for (Node node : printSchedule.getBlockToNodesMap().get(block)) { out.println(" " + node + " (" + node.usages().size() + ")"); } }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Tue Apr 17 22:24:14 2012 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Wed Apr 18 13:42:11 2012 +0200 @@ -42,7 +42,7 @@ * The nodes for the blocks. * TODO: This should go away, we want all nodes connected with a next-pointer. */ - private final BlockMap<List<Node>> nodesFor; + private final BlockMap<List<Node>> blockToNodesMap; /** * The linear-scan ordered list of blocks. @@ -80,9 +80,9 @@ * @param numLoops number of loops * @param compilation the compilation */ - public LIR(ControlFlowGraph cfg, BlockMap<List<Node>> nodesFor, List<Block> linearScanOrder, List<Block> codeEmittingOrder) { + public LIR(ControlFlowGraph cfg, BlockMap<List<Node>> blockToNodesMap, List<Block> linearScanOrder, List<Block> codeEmittingOrder) { this.cfg = cfg; - this.nodesFor = nodesFor; + this.blockToNodesMap = blockToNodesMap; this.codeEmittingOrder = codeEmittingOrder; this.linearScanOrder = linearScanOrder; @@ -90,8 +90,11 @@ deoptimizationStubs = new ArrayList<>(); } + /** + * Gets the nodes in a given block. + */ public List<Node> nodesFor(Block block) { - return nodesFor.get(block); + return blockToNodesMap.get(block); } /**
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeSystemTest.java Tue Apr 17 22:24:14 2012 +0200 +++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeSystemTest.java Wed Apr 18 13:42:11 2012 +0200 @@ -226,7 +226,7 @@ System.out.print(succ + " "); } System.out.println(); - for (Node node : schedule.getNodesFor().get(block)) { + for (Node node : schedule.getBlockToNodesMap().get(block)) { System.out.println(" " + node + " (" + node.usages().size() + ")"); } }