Inline binary funcs when calling unary and min args is 1.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallSpecialMethodNode.java

@@ -180,6 +180,23 @@ protected static boolean takesSelfArg(Object func) {
         return true;
     }
 
+    /**
+     * Determines the minimum number of positional arguments accepted by the given built-in function
+     * or method.
+     */
+    protected static int getMinArgs(Object func) {
+        CompilerAsserts.neverPartOfCompilation();
+        if (func instanceof PBuiltinFunction) {
+            RootNode functionRootNode = ((PBuiltinFunction) func).getFunctionRootNode();
+            if (functionRootNode instanceof BuiltinFunctionRootNode) {
+                return ((BuiltinFunctionRootNode) functionRootNode).getBuiltin().minNumOfPositionalArgs();
+            }
+        } else if (func instanceof PBuiltinMethod) {
+            return getMinArgs(((PBuiltinMethod) func).getFunction());
+        }
+        return 0;
+    }
+
     protected static RootCallTarget getCallTarget(PMethod meth) {
         return getCallTargetOfFunction(meth.getFunction());
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallUnaryMethodNode.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.call.special;
 
+import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
@@ -220,8 +221,39 @@ Object callSelfMethod(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMe
         return builtinNode.call(frame, func.getSelf(), arg);
     }
 
+    @Specialization(guards = { //
+                    "func == cachedFunc", //
+                    "builtinNode != null", //
+                    "!takesSelfArg", //
+                    "minArgs == 1", //
+                    "frame != null || unusedFrame"}, //
+                    limit = "getCallSiteInlineCacheMaxDepth()", //
+                    assumptions = "singleContextAssumption()")
+    static Object callBinaryMethodSingleContext(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object receiver,
+                    @SuppressWarnings("unused") @Cached("func") PBuiltinMethod cachedFunc,
+                    @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
+                    @SuppressWarnings("unused") @Cached("getMinArgs(func)") int minArgs,
+                    @Cached("getBinary(frame, func.getFunction())") PythonBinaryBuiltinNode builtinNode,
+                    @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
+        return builtinNode.call(frame, receiver, PNone.NO_VALUE);
+    }
+
+    /**
+     * In case the function takes at least 1 argument (so is <it>at least</it> unary) we also try
+     * higher orders.
+     */
+    @Specialization(guards = {"builtinNode != null", "minArgs == 1", "getCallTarget(func) == ct", "!takesSelfArg", "frame != null || unusedFrame"}, limit = "getCallSiteInlineCacheMaxDepth()")
+    static Object callBinaryMethod(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinMethod func, Object arg,
+                    @SuppressWarnings("unused") @Cached("getCallTarget(func)") RootCallTarget ct,
+                    @SuppressWarnings("unused") @Cached("takesSelfArg(func)") boolean takesSelfArg,
+                    @SuppressWarnings("unused") @Cached("getMinArgs(func)") int minArgs,
+                    @Cached("getBinary(frame, func.getFunction())") PythonBinaryBuiltinNode builtinNode,
+                    @SuppressWarnings("unused") @Cached("frameIsUnused(builtinNode)") boolean unusedFrame) {
+        return builtinNode.call(frame, arg, PNone.NO_VALUE);
+    }
+
     @Specialization(replaces = {"callIntSingle", "callInt", "callLongSingle", "callLong", "callDoubleSingle", "callDouble", "callBoolSingle", "callBool", "callObjectSingleContext",
-                    "callMethodSingleContext", "callSelfMethodSingleContext", "callMethod", "callSelfMethod"})
+                    "callMethodSingleContext", "callSelfMethodSingleContext", "callMethod", "callSelfMethod", "callBinaryMethodSingleContext", "callBinaryMethod"})
     static Object call(VirtualFrame frame, Object func, Object receiver,
                     @Cached("create()") CallNode callNode,
                     @Cached ConditionProfile isBoundProfile) {