Mercurial > hg > graal-compiler
changeset 3142:051958d4c24d
IdealGraphVisualizer: Apply graph difference also to control flow graphs and use bold edges for new connections and dashed edges for removed connections
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Mon Jul 04 16:08:03 2011 +0200 @@ -23,10 +23,12 @@ */ package com.sun.hotspot.igv.controlflow; -import com.sun.hotspot.igv.controlflow.InputBlockEdge; +import com.sun.hotspot.igv.data.InputBlockEdge; import com.sun.hotspot.igv.layout.Link; import com.sun.hotspot.igv.layout.Port; +import java.awt.BasicStroke; import java.awt.Point; +import java.awt.Stroke; import java.util.ArrayList; import java.util.List; import org.netbeans.api.visual.widget.ConnectionWidget; @@ -37,12 +39,19 @@ */ public class BlockConnectionWidget extends ConnectionWidget implements Link { + private static final Stroke NORMAL_STROKE = new BasicStroke(1.0f); + private static final Stroke BOLD_STROKE = new BasicStroke(2.5f); + private static final Stroke DASHED_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0); + private static final Stroke BOLD_DASHED_STROKE = new BasicStroke(2.5f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0); + private BlockWidget from; private BlockWidget to; private Port inputSlot; private Port outputSlot; private List<Point> points; private InputBlockEdge edge; + private boolean isDashed = false; + private boolean isBold = false; public BlockConnectionWidget(ControlFlowScene scene, InputBlockEdge edge) { super(scene); @@ -67,6 +76,30 @@ return outputSlot; } + public void setBold(boolean bold) { + this.isBold = bold; + updateStroke(); + } + + public void setDashed(boolean dashed) { + this.isDashed = dashed; + updateStroke(); + } + + private void updateStroke() { + Stroke stroke = NORMAL_STROKE; + if (isBold) { + if (isDashed) { + stroke = BOLD_DASHED_STROKE; + } else { + stroke = BOLD_STROKE; + } + } else if (isDashed) { + stroke = DASHED_STROKE; + } + setStroke(stroke); + } + public void setControlPoints(List<Point> p) { this.points = p; }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Mon Jul 04 16:08:03 2011 +0200 @@ -23,6 +23,7 @@ */ package com.sun.hotspot.igv.controlflow; +import com.sun.hotspot.igv.data.InputBlockEdge; import com.sun.hotspot.igv.data.InputBlock; import com.sun.hotspot.igv.data.InputGraph; import com.sun.hotspot.igv.data.services.InputGraphProvider; @@ -108,15 +109,12 @@ addNode(b); } - for (InputBlock b : g.getBlocks()) { - for (InputBlock succ : b.getSuccessors()) { - final InputBlockEdge e = new InputBlockEdge(b, succ); - addEdge(e); - assert g.getBlocks().contains(e.getFrom()); - assert g.getBlocks().contains(e.getTo()); - this.setEdgeSource(e, e.getFrom()); - this.setEdgeTarget(e, e.getTo()); - } + for (InputBlockEdge e : g.getBlockEdges()) { + addEdge(e); + assert g.getBlocks().contains(e.getFrom()); + assert g.getBlocks().contains(e.getTo()); + this.setEdgeSource(e, e.getFrom()); + this.setEdgeTarget(e, e.getTo()); } GraphLayout<InputBlock, InputBlockEdge> layout = new HierarchicalGraphLayout<InputBlock, InputBlockEdge>();//GridGraphLayout(); @@ -265,7 +263,15 @@ } protected Widget attachEdgeWidget(InputBlockEdge edge) { - ConnectionWidget w = new BlockConnectionWidget(this, edge); + BlockConnectionWidget w = new BlockConnectionWidget(this, edge); + switch (edge.getState()) { + case NEW: + w.setBold(true); + break; + case DELETED: + w.setDashed(true); + break; + } w.setRouter(RouterFactory.createDirectRouter()); w.setTargetAnchorShape(AnchorShape.TRIANGLE_FILLED); edgeLayer.addChild(w);
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/InputBlockEdge.java Mon Jul 04 13:59:41 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ -package com.sun.hotspot.igv.controlflow; - -import com.sun.hotspot.igv.data.*; - -/** - * - * @author Thomas Wuerthinger - */ -public class InputBlockEdge { - - private InputBlock from; - private InputBlock to; - - public InputBlockEdge(InputBlock from, InputBlock to) { - assert from != null; - assert to != null; - this.from = from; - this.to = to; - } - - public InputBlock getFrom() { - return from; - } - - public InputBlock getTo() { - return to; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof InputBlockEdge && obj != null) { - InputBlockEdge e = (InputBlockEdge) obj; - return e.from.equals(from) && e.to.equals(to); - } - return super.equals(obj); - } - - @Override - public int hashCode() { - int hash = from.hashCode(); - hash = 59 * hash + to.hashCode(); - return hash; - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java Mon Jul 04 16:08:03 2011 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ +package com.sun.hotspot.igv.data; + +/** + * + * @author Thomas Wuerthinger + */ +public class InputBlockEdge { + + public enum State { + SAME, + NEW, + DELETED + } + + private InputBlock from; + private InputBlock to; + private State state = State.SAME; + + public InputBlockEdge(InputBlock from, InputBlock to) { + assert from != null; + assert to != null; + this.from = from; + this.to = to; + } + + public InputBlock getFrom() { + return from; + } + + public InputBlock getTo() { + return to; + } + + public State getState() { + return state; + } + + public void setState(State state) { + this.state = state; + } + + @Override + public boolean equals(Object obj) { + if (obj != null && obj instanceof InputBlockEdge) { + InputBlockEdge e = (InputBlockEdge) obj; + return e.from.equals(from) && e.to.equals(to); + } + return false; + } + + @Override + public int hashCode() { + int hash = from.hashCode(); + hash = 59 * hash + to.hashCode(); + return hash; + } +}
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Mon Jul 04 16:08:03 2011 +0200 @@ -44,6 +44,7 @@ private Set<InputEdge> edges; private Group parent; private Map<String, InputBlock> blocks; + private Set<InputBlockEdge> blockEdges; private Map<Integer, InputBlock> nodeToBlock; private Pair<InputGraph, InputGraph> sourceGraphs; private int parentIndex; @@ -56,11 +57,15 @@ nodes = new LinkedHashMap<Integer, InputNode>(); edges = new LinkedHashSet<InputEdge>(); blocks = new LinkedHashMap<String, InputBlock>(); + blockEdges = new LinkedHashSet<InputBlockEdge>(); nodeToBlock = new LinkedHashMap<Integer, InputBlock>(); } - public void addBlockConnection(InputBlock left, InputBlock right) { + public InputBlockEdge addBlockEdge(InputBlock left, InputBlock right) { + InputBlockEdge edge = new InputBlockEdge(left, right); + blockEdges.add(edge); left.addSuccessor(right); + return edge; } public Pair<InputGraph, InputGraph> getSourceGraphs() { @@ -296,4 +301,8 @@ public InputBlock getBlock(String s) { return blocks.get(s); } + + public Collection<InputBlockEdge> getBlockEdges() { + return Collections.unmodifiableSet(blockEdges); + } }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Mon Jul 04 16:08:03 2011 +0200 @@ -264,7 +264,7 @@ assert left != null; final InputBlock right = graph.getBlock(p.getRight()); assert right != null; - graph.addBlockConnection(left, right); + graph.addBlockEdge(left, right); } blockConnections.clear(); }
--- a/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Mon Jul 04 16:08:03 2011 +0200 @@ -26,6 +26,7 @@ import com.sun.hotspot.igv.data.Group; import com.sun.hotspot.igv.data.InputBlock; +import com.sun.hotspot.igv.data.InputBlockEdge; import com.sun.hotspot.igv.data.InputEdge; import com.sun.hotspot.igv.data.InputGraph; import com.sun.hotspot.igv.data.InputNode; @@ -118,6 +119,33 @@ blocksMap.put(blk, diffblk); } + // Difference between block edges + Set<Pair<String, String>> aEdges = new HashSet<Pair<String, String>>(); + for (InputBlockEdge edge : a.getBlockEdges()) { + aEdges.add(new Pair<String, String>(edge.getFrom().getName(), edge.getTo().getName())); + } + for (InputBlockEdge bEdge : b.getBlockEdges()) { + InputBlock from = bEdge.getFrom(); + InputBlock to = bEdge.getTo(); + Pair<String, String> pair = new Pair<String, String>(from.getName(), to.getName()); + if (aEdges.contains(pair)) { + // same + graph.addBlockEdge(blocksMap.get(from), blocksMap.get(to)); + aEdges.remove(pair); + } else { + // added + InputBlockEdge edge = graph.addBlockEdge(blocksMap.get(from), blocksMap.get(to)); + edge.setState(InputBlockEdge.State.NEW); + } + } + for (Pair<String, String> deleted : aEdges) { + // removed + InputBlock from = graph.getBlock(deleted.getLeft()); + InputBlock to = graph.getBlock(deleted.getRight()); + InputBlockEdge edge = graph.addBlockEdge(from, to); + edge.setState(InputBlockEdge.State.DELETED); + } + Set<InputNode> nodesA = new HashSet<InputNode>(a.getNodes()); Set<InputNode> nodesB = new HashSet<InputNode>(b.getNodes());
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Mon Jul 04 13:59:41 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Mon Jul 04 16:08:03 2011 +0200 @@ -125,7 +125,7 @@ n = n.preds.get(0); } if (n.block != null) { - graph.addBlockConnection(n.block, block); + graph.addBlockEdge(n.block, block); } } } @@ -136,12 +136,12 @@ for (Node n2 : n.succs) { if (n2 != parent && n2.block != null && n2.block != rootBlock) { - graph.addBlockConnection(block, n2.block); + graph.addBlockEdge(block, n2.block); } } } else { if (n != parent && n.block != null && n.block != rootBlock) { - graph.addBlockConnection(block, n.block); + graph.addBlockEdge(block, n.block); } } }