8282547: IGV: add control-flow graph view

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, xliu, thartmann

Author: robcasloz

src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -26,6 +26,7 @@
 import com.sun.hotspot.igv.data.InputBlockEdge;
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.BasicStroke;
 import java.awt.Point;
 import java.awt.Stroke;
@@ -76,6 +77,14 @@ public Port getFrom() {
         return outputSlot;
     }
 
+    public Cluster getFromCluster() {
+        return null;
+    }
+
+    public Cluster getToCluster() {
+        return null;
+    }
+
     public void setBold(boolean bold) {
         this.isBold = bold;
         updateStroke();

src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -69,6 +69,14 @@ public Port getTo() {
             return to.getSlot();
         }
 
+        public Cluster getFromCluster() {
+            return null;
+        }
+
+        public Cluster getToCluster() {
+            return null;
+        }
+
         public List<Point> getControlPoints() {
             return new ArrayList<Point>();
         }

src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -35,6 +35,7 @@ public class InputBlock {
     private String name;
     private InputGraph graph;
     private Set<InputBlock> successors;
+    private boolean artificial;
 
     @Override
     public int hashCode() {
@@ -77,6 +78,7 @@ public boolean equals(Object o) {
         this.name = name;
         nodes = new ArrayList<>();
         successors = new LinkedHashSet<>(2);
+        artificial = false;
     }
 
     public String getName() {
@@ -101,6 +103,10 @@ public Set<InputBlock> getSuccessors() {
         return Collections.unmodifiableSet(successors);
     }
 
+    public void setNodes(List<InputNode> nodes) {
+        this.nodes = nodes;
+    }
+
     @Override
     public String toString() {
         return "Block " + this.getName();
@@ -111,4 +117,12 @@ void addSuccessor(InputBlock b) {
             successors.add(b);
         }
     }
+
+    void setArtificial(boolean artificial) {
+        this.artificial = artificial;
+    }
+
+    public boolean isArtificial() {
+        return artificial;
+    }
 }

src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -38,12 +38,14 @@ public enum State {
     private InputBlock from;
     private InputBlock to;
     private State state = State.SAME;
+    private String label;
 
-    public InputBlockEdge(InputBlock from, InputBlock to) {
+    public InputBlockEdge(InputBlock from, InputBlock to, String label) {
         assert from != null;
         assert to != null;
         this.from = from;
         this.to = to;
+        this.label = label;
     }
 
     public InputBlock getFrom() {
@@ -62,6 +64,10 @@ public void setState(State state) {
         this.state = state;
     }
 
+    public String getLabel() {
+        return label;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj != null && obj instanceof InputBlockEdge) {

src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -58,7 +58,11 @@ public void setParent(Folder parent) {
     }
 
     public InputBlockEdge addBlockEdge(InputBlock left, InputBlock right) {
-        InputBlockEdge edge = new InputBlockEdge(left, right);
+        return addBlockEdge(left, right, null);
+    }
+
+    public InputBlockEdge addBlockEdge(InputBlock left, InputBlock right, String label) {
+        InputBlockEdge edge = new InputBlockEdge(left, right, label);
         blockEdges.add(edge);
         left.addSuccessor(right);
         return edge;
@@ -140,6 +144,7 @@ public List<InputEdge> findOutgoingEdges(InputNode n) {
 
     public void clearBlocks() {
         blocks.clear();
+        blockEdges.clear();
         nodeToBlock.clear();
     }
 
@@ -168,7 +173,7 @@ public void ensureNodesInBlocks() {
             assert nodes.get(n.getId()) == n;
             if (!scheduledNodes.contains(n)) {
                 if (noBlock == null) {
-                    noBlock = this.addBlock("(no block)");
+                    noBlock = addArtificialBlock();
                 }
                 noBlock.addNode(n.getId());
             }
@@ -270,6 +275,12 @@ public String toString() {
         return sb.toString();
     }
 
+    public InputBlock addArtificialBlock() {
+        InputBlock b = addBlock("(no block)");
+        b.setArtificial(true);
+        return b;
+    }
+
     public InputBlock addBlock(String name) {
         final InputBlock b = new InputBlock(this, name);
         blocks.put(b.getName(), b);

src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -261,7 +261,7 @@ protected void end(String text) throws SAXException {
                     for (InputNode n : graph.getNodes()) {
                         if (graph.getBlock(n) == null) {
                             if (noBlock == null) {
-                                noBlock = graph.addBlock("(no block)");
+                                noBlock = graph.addArtificialBlock();
                             }
 
                             noBlock.addNode(n.getId());

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -78,7 +78,7 @@ private void applyRule(ColorRule rule, Figure f) {
         ConnectionStyle style = rule.getLineStyle();
 
         for (OutputSlot s : f.getOutputSlots()) {
-            for (Connection c : s.getConnections()) {
+            for (FigureConnection c : s.getConnections()) {
                 if (color != null) {
                     c.setColor(color);
                 }

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -67,7 +67,7 @@ public void apply(Diagram diagram) {
                         InputSlot slot = null;
 
                         for (InputSlot s : succ.getInputSlots()) {
-                            for (Connection c : s.getConnections()) {
+                            for (FigureConnection c : s.getConnections()) {
                                 if (c.getOutputSlot().getFigure() == f) {
                                     slot = s;
                                 }
@@ -97,8 +97,8 @@ public void apply(Diagram diagram) {
                         }
 
                         for (InputSlot s : f.getInputSlots()) {
-                            for (Connection c : s.getConnections()) {
-                                Connection newConn = diagram.createConnection(slot, c.getOutputSlot(), c.getLabel(), c.getType());
+                            for (FigureConnection c : s.getConnections()) {
+                                FigureConnection newConn = diagram.createConnection(slot, c.getOutputSlot(), c.getLabel());
                                 newConn.setColor(c.getColor());
                                 newConn.setStyle(c.getStyle());
                             }
@@ -115,7 +115,7 @@ public void apply(Diagram diagram) {
 
                                 OutputSlot oldSlot = null;
                                 for (OutputSlot s : f.getOutputSlots()) {
-                                    for (Connection c : s.getConnections()) {
+                                    for (FigureConnection c : s.getConnections()) {
                                         if (c.getInputSlot().getFigure() == succ) {
                                             oldSlot = s;
                                         }
@@ -155,8 +155,8 @@ public void apply(Diagram diagram) {
                                         }
                                     }
                                 }
-                                for (Connection c : nextSlot.getConnections()) {
-                                    Connection newConn = diagram.createConnection(c.getInputSlot(), slot, c.getLabel(), c.getType());
+                                for (FigureConnection c : nextSlot.getConnections()) {
+                                    FigureConnection newConn = diagram.createConnection(c.getInputSlot(), slot, c.getLabel());
                                     newConn.setColor(c.getColor());
                                     newConn.setStyle(c.getStyle());
                                 }

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -62,7 +62,7 @@ public void apply(Diagram diagram) {
 
             for (Figure f : figures) {
                 for (OutputSlot os : f.getOutputSlots()) {
-                    for (Connection c : os.getConnections()) {
+                    for (FigureConnection c : os.getConnections()) {
                         c.setStyle(rule.getLineStyle());
                         c.setColor(rule.getLineColor());
                     }

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -64,7 +64,7 @@ public void apply(Diagram d) {
             for (Slot slot : slots) {
                 if (index < colors.length && colors[index] != null) {
                     slot.setColor(colors[index]);
-                    for (Connection c : slot.getConnections()) {
+                    for (FigureConnection c : slot.getConnections()) {
 
                         c.setColor(colors[index]);
                     }