CFG can use Instr[] to build

jruby · Mar 3, 2015 · 5ad4c5c · 5ad4c5c
1 parent ac3bc8a
commit 5ad4c5c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -447,7 +447,7 @@ public CFG buildCFG() {
         }
 
         CFG newCFG = new CFG(this);
-        newCFG.build(getInstrs());
+        newCFG.build(prepareBuildInstructions(getInstrs()));
         // Clear out instruction list after CFG has been built.
         instrList = null;
 
@@ -456,6 +456,19 @@ public CFG buildCFG() {
         return newCFG;
     }
 
+    private Instr[] prepareBuildInstructions(List<Instr> instructions) {
+        int length = instructions.size();
+        Instr[] linearizedInstrArray = instructions.toArray(new Instr[length]);
+        for (int ipc = 0; ipc < length; ipc++) {
+            Instr i = linearizedInstrArray[ipc];
+            i.setIPC(ipc);
+
+            if (i instanceof LabelInstr) ((LabelInstr) i).getLabel().setTargetPC(ipc + 1);
+        }
+
+        return linearizedInstrArray;
+    }
+
     protected void setCFG(CFG cfg) {
         this.cfg = cfg;
     }

diff --git a/core/src/main/java/org/jruby/ir/representations/BasicBlock.java b/core/src/main/java/org/jruby/ir/representations/BasicBlock.java
@@ -36,7 +36,7 @@ public BasicBlock(CFG cfg, Label label) {
     private void initInstrs() {
         instrs = new ArrayList<>();
         if (RubyInstanceConfig.IR_COMPILER_DEBUG || RubyInstanceConfig.IR_VISUALIZER) {
-            IRManager irManager = cfg.getScope().getManager();
+            IRManager irManager = cfg.getManager();
             InstructionsListener listener = irManager.getInstructionsListener();
             if (listener != null) {
                 instrs = new InstructionsListenerDecorator(instrs, listener);

diff --git a/core/src/main/java/org/jruby/ir/representations/CFG.java b/core/src/main/java/org/jruby/ir/representations/CFG.java
@@ -3,6 +3,7 @@
 import org.jruby.dirgra.DirectedGraph;
 import org.jruby.dirgra.Edge;
 import org.jruby.ir.IRClosure;
+import org.jruby.ir.IRManager;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.Operation;
 import org.jruby.ir.instructions.*;
@@ -69,6 +70,10 @@ public int getNextBBID() {
         return nextBBId;
     }
 
+    public IRManager getManager() {
+        return scope.getManager();
+    }
+
     public int getMaxNodeID() {
         return nextBBId;
     }
@@ -152,26 +157,10 @@ public Iterable<Edge<BasicBlock>> getIncomingEdges(BasicBlock block) {
         return graph.findVertexFor(block).getIncomingEdges();
     }
 
-    public BasicBlock getIncomingSource(BasicBlock block) {
-        return graph.findVertexFor(block).getIncomingSourceData();
-    }
-
     public BasicBlock getIncomingSourceOfType(BasicBlock block, Object type) {
         return graph.findVertexFor(block).getIncomingSourceDataOfType(type);
     }
 
-    public Edge<BasicBlock> getIncomingEdgeOfType(BasicBlock block, Object type) {
-        return graph.findVertexFor(block).getIncomingEdgeOfType(type);
-    }
-
-    public Edge<BasicBlock> getOutgoingEdgeOfType(BasicBlock block, Object type) {
-        return graph.findVertexFor(block).getOutgoingEdgeOfType(type);
-    }
-
-    public BasicBlock getOutgoingDestination(BasicBlock block) {
-        return graph.findVertexFor(block).getOutgoingDestinationData();
-    }
-
     public BasicBlock getOutgoingDestinationOfType(BasicBlock block, Object type) {
         return graph.findVertexFor(block).getOutgoingDestinationDataOfType(type);
     }
@@ -192,10 +181,6 @@ public Collection<Edge<BasicBlock>> getOutgoingEdges(BasicBlock block) {
         return graph.findVertexFor(block).getOutgoingEdges();
     }
 
-    public Iterable<Edge<BasicBlock>> getOutgoingEdgesNotOfType(BasicBlock block, Object type) {
-        return graph.findVertexFor(block).getOutgoingEdgesNotOfType(type);
-    }
-
     public BasicBlock getRescuerBBFor(BasicBlock block) {
         return rescuerMap.get(block);
     }
@@ -224,7 +209,7 @@ public void setRescuerBB(BasicBlock block, BasicBlock rescuerBlock) {
     /**
      *  Build the Control Flow Graph
      */
-    public DirectedGraph<BasicBlock> build(List<Instr> instrs) {
+    public DirectedGraph<BasicBlock> build(Instr[] instrs) {
         // Map of label & basic blocks which are waiting for a bb with that label
         Map<Label, List<BasicBlock>> forwardRefs = new HashMap<>();
 
@@ -251,7 +236,7 @@ public DirectedGraph<BasicBlock> build(List<Instr> instrs) {
         BasicBlock newBB;
         boolean bbEnded = false;
         boolean nextBBIsFallThrough = true;
-        for (Instr i : instrs) {
+        for (Instr i: instrs) {
             // System.out.println("Processing: " + i);
             Operation iop = i.getOperation();
             if (iop == Operation.LABEL) {
@@ -422,10 +407,6 @@ public void addBasicBlock(BasicBlock bb) {
         postOrderList = null;
     }
 
-    public void removeEdge(Edge edge) {
-        graph.removeEdge(edge);
-    }
-
     public void removeAllOutgoingEdgesForBB(BasicBlock b) {
         graph.findVertexFor(b).removeAllOutgoingEdges();
     }
@@ -550,7 +531,7 @@ private void optimize(List<BasicBlock> returnBBs) {
         //
         // If a jump intervenes in 'x', skip over it and if merge succeeds,
         // delete the jump.
-        List<Edge> toRemove = new ArrayList<>();
+        List<Edge<BasicBlock>> toRemove = new ArrayList<>();
         for (BasicBlock retBB: returnBBs) {
             List<Instr> rbInstrs = retBB.getInstrs();
             Instr first = rbInstrs.get(0);
@@ -587,7 +568,7 @@ private void optimize(List<BasicBlock> returnBBs) {
                 }
             }
         }
-        for (Edge edge: toRemove) {
+        for (Edge<BasicBlock> edge: toRemove) {
             graph.removeEdge(edge);
         }
 
@@ -615,7 +596,7 @@ private void optimize(List<BasicBlock> returnBBs) {
         }
 
         if (!toRemove.isEmpty()) {
-            for (Edge edge: toRemove) {
+            for (Edge<BasicBlock> edge: toRemove) {
                 graph.removeEdge(edge);
             }
         }

diff --git a/core/src/main/java/org/jruby/ir/representations/CFGLinearizer.java b/core/src/main/java/org/jruby/ir/representations/CFGLinearizer.java
@@ -90,7 +90,7 @@ private static void fixupList(CFG cfg, BasicBlock[] list, int listSize) {
             BasicBlock current = list[i];
 
             if (current.isExitBB()) { // exit not last
-                current.addInstr(new ReturnInstr(cfg.getScope().getManager().getNil()));
+                current.addInstr(new ReturnInstr(cfg.getManager().getNil()));
                 continue;
             }