tweak node costs

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadIndexedArgumentNode.java

@@ -28,32 +28,39 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.PNode;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.nodes.InvalidAssumptionException;
 import com.oracle.truffle.api.profiles.ValueProfile;
 
-public class ReadIndexedArgumentNode extends PNode {
-    protected final int index;
-    private final BranchProfile wasOffBounds = BranchProfile.create();
+public abstract class ReadIndexedArgumentNode extends PNode {
+    private final int index;
     private final ValueProfile profile = ValueProfile.createClassProfile();
 
     ReadIndexedArgumentNode(int index) {
         this.index = index;
     }
 
     public static ReadIndexedArgumentNode create(int idx) {
-        return new ReadIndexedArgumentNode(idx);
+        return ReadIndexedArgumentNodeGen.create(idx);
     }
 
-    @Override
-    public Object execute(VirtualFrame frame) {
+    @Specialization(rewriteOn = InvalidAssumptionException.class)
+    Object readArg(VirtualFrame frame) throws InvalidAssumptionException {
+        Object argumentAt = PArguments.getArgument(frame, index);
+        if (argumentAt == null) {
+            throw new InvalidAssumptionException();
+        }
+        return profile.profile(argumentAt);
+    }
+
+    @Specialization(replaces = "readArg")
+    Object readArgOffBounds(VirtualFrame frame) {
         Object argumentAt = PArguments.getArgument(frame, index);
         if (argumentAt == null) {
-            wasOffBounds.enter();
             return PNone.NO_VALUE;
-        } else {
-            return profile.profile(argumentAt);
         }
+        return profile.profile(argumentAt);
     }
 
     public int getIndex() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarArgsNode.java

@@ -26,21 +26,24 @@
 package com.oracle.graal.python.nodes.argument;
 
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
-public abstract class ReadVarArgsNode extends ReadIndexedArgumentNode {
+public abstract class ReadVarArgsNode extends PNode {
+    private final int index;
+
     /**
      * Controls if the varargs are wrapped in a tuple
      */
     private final boolean builtin;
 
     ReadVarArgsNode(int paramIndex, boolean isBuiltin) {
-        super(paramIndex);
+        index = paramIndex;
         builtin = isBuiltin;
     }
 
@@ -115,4 +118,8 @@ private Object output(Object[] varArgs) {
     public boolean isBuiltin() {
         return builtin;
     }
+
+    public int getIndex() {
+        return index;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadVariableNode.java

@@ -29,13 +29,18 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.UnboundLocalError;
 
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.profiles.BranchProfile;
 
 public abstract class ReadVariableNode extends FrameSlotNode implements ReadLocalNode {
+    private final BranchProfile unboundLocal = BranchProfile.create();
+    @CompilationFinal private NodeCost nodeCost = NodeCost.NONE;
 
     @Child private ReadVariableFromFrameNode readLocalNode;
 
@@ -53,22 +58,25 @@ public final Object doWrite(VirtualFrame frame, Object value) {
 
     @Override
     public final NodeCost getCost() {
-        // the actual reading is done in a child node
-        return NodeCost.NONE;
+        return nodeCost;
     }
 
     @Override
     public final Object execute(VirtualFrame frame) {
         Object value = readLocalNode.execute(getAccessingFrame(frame));
-
         if (value == null) {
+            if (nodeCost == NodeCost.NONE) {
+                // acts as branch profile
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                nodeCost = NodeCost.MONOMORPHIC;
+            }
             if (frameSlot.getIdentifier().equals(RETURN_SLOT_ID)) {
                 value = PNone.NONE;
             } else {
+                unboundLocal.enter();
                 throw raise(UnboundLocalError, "local variable '%s' referenced before assignment", frameSlot.getIdentifier());
             }
         }
-
         return value;
     }