src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java

rev 52509 : [mq]: graal

*** 227,259 ****
  
      @Override
      @SuppressWarnings({"unchecked", "rawtypes"})
      public void nodeProperties(GraphInfo info, Node node, Map<String, Object> props) {
          node.getDebugProperties((Map) props);
-         Graph graph = info.graph;
-         ControlFlowGraph cfg = info.cfg;
          NodeMap<Block> nodeToBlocks = info.nodeToBlocks;
!         if (cfg != null && DebugOptions.PrintGraphProbabilities.getValue(graph.getOptions()) && node instanceof FixedNode) {
!             try {
!                 props.put("probability", cfg.blockFor(node).probability());
!             } catch (Throwable t) {
!                 props.put("probability", 0.0);
!                 props.put("probability-exception", t);
              }
          }
  
!         try {
!             props.put("NodeCost-Size", node.estimatedNodeSize());
!             props.put("NodeCost-Cycles", node.estimatedNodeCycles());
!         } catch (Throwable t) {
!             props.put("node-cost-exception", t.getMessage());
!         }
  
          if (nodeToBlocks != null) {
              Object block = getBlockForNode(node, nodeToBlocks);
              if (block != null) {
!                 props.put("node-to-block", block);
              }
          }
  
          if (node instanceof ControlSinkNode) {
              props.put("category", "controlSink");
--- 227,253 ----
  
      @Override
      @SuppressWarnings({"unchecked", "rawtypes"})
      public void nodeProperties(GraphInfo info, Node node, Map<String, Object> props) {
          node.getDebugProperties((Map) props);
          NodeMap<Block> nodeToBlocks = info.nodeToBlocks;
! 
!         if (nodeToBlocks != null) {
!             Block block = getBlockForNode(node, nodeToBlocks);
!             if (block != null) {
!                 props.put("relativeFrequency", block.getRelativeFrequency());
!                 props.put("nodeToBlock", block);
              }
          }
  
!         props.put("nodeCostSize", node.estimatedNodeSize());
!         props.put("nodeCostCycles", node.estimatedNodeCycles());
  
          if (nodeToBlocks != null) {
              Object block = getBlockForNode(node, nodeToBlocks);
              if (block != null) {
!                 props.put("nodeToBlock", block);
              }
          }
  
          if (node instanceof ControlSinkNode) {
              props.put("category", "controlSink");
*** 287,303 ****
                  }
              }
          }
      }
  
!     private Object getBlockForNode(Node node, NodeMap<Block> nodeToBlocks) {
          if (nodeToBlocks.isNew(node)) {
!             return "NEW (not in schedule)";
          } else {
              Block block = nodeToBlocks.get(node);
              if (block != null) {
!                 return block.getId();
              } else if (node instanceof PhiNode) {
                  return getBlockForNode(((PhiNode) node).merge(), nodeToBlocks);
              }
          }
          return null;
--- 281,297 ----
                  }
              }
          }
      }
  
!     private Block getBlockForNode(Node node, NodeMap<Block> nodeToBlocks) {
          if (nodeToBlocks.isNew(node)) {
!             return null;
          } else {
              Block block = nodeToBlocks.get(node);
              if (block != null) {
!                 return block;
              } else if (node instanceof PhiNode) {
                  return getBlockForNode(((PhiNode) node).merge(), nodeToBlocks);
              }
          }
          return null;