Avoid temporary arg tuples in PyObject_Call and related

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/object.c

@@ -199,76 +199,65 @@ PyObject * PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwar
     return _Py_CheckFunctionResult(callable, result, NULL);
 }
 
+typedef PyObject *(*call_fun_t)(PyObject *, PyObject *, PyObject *);
+UPCALL_TYPED_ID(PyObject_Call, call_fun_t);
 PyObject* PyObject_Call(PyObject* callable, PyObject* args, PyObject* kwargs) {
-    return polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_Call", native_to_java(callable), native_to_java(args), native_to_java(kwargs));
+	return _jls_PyObject_Call(native_to_java(callable), native_to_java(args), native_to_java(kwargs));
 }
 
 PyObject* PyObject_CallObject(PyObject* callable, PyObject* args) {
-    return PyObject_Call(callable, args, PyDict_New());
+	return _jls_PyObject_Call(native_to_java(callable), native_to_java(args), NULL);
 }
 
-NO_INLINE
 PyObject* PyObject_CallFunction(PyObject* callable, const char* fmt, ...) {
     if (fmt == NULL || fmt[0] == '\0') {
-        return PyObject_CallObject(callable, NULL);
+	    return _jls_PyObject_Call(native_to_java(callable), NULL, NULL);
     }
-
     va_list va;
     va_start(va, fmt);
     PyObject* args = Py_VaBuildValue(fmt, va);
     va_end(va);
 
-    if (strlen(fmt) < 2) {
+    if (strlen(fmt) == 1) {
         PyObject* singleArg = args;
-        args = PyTuple_New(strlen(fmt));
-        if (strlen(fmt) == 1) {
-            Py_XINCREF(singleArg);
-            PyTuple_SetItem(args, 0, singleArg);
-        }
+        args = PyTuple_New(1);
+        Py_XINCREF(singleArg);
+        PyTuple_SetItem(args, 0, singleArg);
     }
-    return PyObject_CallObject(callable, args);
+	return _jls_PyObject_Call(native_to_java(callable), native_to_java(args), NULL);
 }
 
-NO_INLINE
 PyObject* _PyObject_CallFunction_SizeT(PyObject* callable, const char* fmt, ...) {
     if (fmt == NULL || fmt[0] == '\0') {
-        return PyObject_CallObject(callable, NULL);
+	    return _jls_PyObject_Call(native_to_java(callable), NULL, NULL);
     }
 
     va_list va;
     va_start(va, fmt);
     PyObject* args = Py_VaBuildValue(fmt, va);
     va_end(va);
 
-    if (strlen(fmt) < 2) {
+    if (strlen(fmt) == 1) {
         PyObject* singleArg = args;
-        args = PyTuple_New(strlen(fmt));
-        if (strlen(fmt) == 1) {
-            Py_XINCREF(singleArg);
-            PyTuple_SetItem(args, 0, singleArg);
-        }
+        args = PyTuple_New(1);
+        Py_XINCREF(singleArg);
+        PyTuple_SetItem(args, 0, singleArg);
     }
-    return PyObject_CallObject(callable, args);
+	return _jls_PyObject_Call(native_to_java(callable), native_to_java(args), NULL);
 }
 
-NO_INLINE
+typedef PyObject *(*call_fun_obj_args_t)(PyObject *, void *);
+UPCALL_TYPED_ID(PyObject_CallFunctionObjArgs, call_fun_obj_args_t);
 PyObject* PyObject_CallFunctionObjArgs(PyObject *callable, ...) {
     va_list vargs;
     va_start(vargs, callable);
     // the arguments are given as a variable list followed by NULL
-    int nargs = polyglot_get_array_size(vargs) - 1;
-    PyObject* args = PyTuple_New(nargs);
-    for (int i = 0; i < nargs; i++) {
-        PyObject* arg = (PyObject*) va_arg(vargs, PyObject *);
-        Py_INCREF(arg);
-        PyTuple_SetItem(args, i, arg);
-    }
+    PyObject *result = _jls_PyObject_CallFunctionObjArgs(native_to_java(callable), &vargs);
     va_end(vargs);
-    return PyObject_CallObject(callable, args);
+    return result;
 }
 
 UPCALL_ID(PyObject_CallMethod);
-NO_INLINE
 PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char* fmt, ...) {
     PyObject* args;
     if (fmt == NULL || fmt[0] == '\0') {
@@ -282,7 +271,6 @@ PyObject* PyObject_CallMethod(PyObject* object, const char* method, const char*
     return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(object), polyglot_from_string(method, SRC_CS), native_to_java(args));
 }
 
-NO_INLINE
 PyObject* PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) {
     va_list vargs;
     va_start(vargs, name);
@@ -298,7 +286,6 @@ PyObject* PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) {
     return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(callable), native_to_java(name), native_to_java(args));
 }
 
-NO_INLINE
 PyObject* _PyObject_CallMethod_SizeT(PyObject* object, const char* method, const char* fmt, ...) {
     PyObject* args;
     if (fmt == NULL || fmt[0] == '\0') {
@@ -312,16 +299,10 @@ PyObject* _PyObject_CallMethod_SizeT(PyObject* object, const char* method, const
     return UPCALL_CEXT_O(_jls_PyObject_CallMethod, native_to_java(object), polyglot_from_string(method, SRC_CS), native_to_java(args));
 }
 
+typedef PyObject *(*fast_call_dict_fun_t)(PyObject *, void *, PyObject *);
+UPCALL_TYPED_ID(PyObject_FastCallDict, fast_call_dict_fun_t);
 PyObject * _PyObject_FastCallDict(PyObject *func, PyObject *const *args, size_t nargs, PyObject *kwargs) {
-	PyObject* targs = PyTuple_New(nargs);
-	Py_ssize_t i;
-	PyObject* arg;
-	for(i=0; i < nargs; i++) {
-	    arg = args[i];
-	    Py_XINCREF(arg);
-		PyTuple_SetItem(targs, i, arg);
-	}
-    return polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_Call", native_to_java(func), native_to_java(targs), native_to_java(kwargs));
+	return _jls_PyObject_FastCallDict(native_to_java(func), polyglot_from_PyObjectPtr_array(args, nargs), native_to_java(kwargs));
 }
 
 PyObject* PyObject_Type(PyObject* obj) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -3261,9 +3261,9 @@ protected static boolean isMappingOrSequence(Object obj) {
         }
     }
 
+    // directly called without landing function
     @Builtin(name = "PyObject_Call", parameterNames = {"callee", "args", "kwargs"})
     @GenerateNodeFactory
-    @ReportPolymorphism
     abstract static class PyObjectCallNode extends PythonTernaryBuiltinNode {
 
         @Specialization
@@ -3288,7 +3288,108 @@ static Object doGeneric(VirtualFrame frame, Object callableObj, Object argsObj,
                 return nullToSulongNode.execute(getNativeNullNode.execute());
             }
         }
+    }
+
+    // directly called without landing function
+    @Builtin(name = "PyObject_CallFunctionObjArgs", parameterNames = {"callable", "va_list"})
+    @GenerateNodeFactory
+    abstract static class PyObjectCallFunctionObjArgsNode extends PythonBinaryBuiltinNode {
+
+        @Specialization(limit = "1")
+        static Object doGeneric(VirtualFrame frame, Object callableObj, Object vaList,
+                        @CachedLibrary("vaList") InteropLibrary argsArrayLib,
+                        @CachedLibrary(limit = "2") InteropLibrary argLib,
+                        @Cached AsPythonObjectNode asPythonObjectNode,
+                        @Cached CallNode callNode,
+                        @Cached ToNewRefNode toNewRefNode,
+                        @Cached GetNativeNullNode getNativeNullNode,
+                        @Cached CExtNodes.ToSulongNode nullToSulongNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            if (argsArrayLib.hasArrayElements(vaList)) {
+                try {
+                    try {
+                        /*
+                         * Function 'PyObject_CallFunctionObjArgs' expects a va_list that contains
+                         * just 'PyObject *' and is terminated by 'NULL'. Hence, we allocate an
+                         * argument array with one element less than the va_list object says (since
+                         * the last element is expected to be 'NULL'; this is best effort). However,
+                         * we must also stop at the first 'NULL' element we encounter since a user
+                         * could pass several 'NULL'.
+                         */
+                        long arraySize = argsArrayLib.getArraySize(vaList);
+                        Object[] args = new Object[PInt.intValueExact(arraySize) - 1];
+                        for (int i = 0; i < args.length; i++) {
+                            try {
+                                Object object = argsArrayLib.readArrayElement(vaList, i);
+                                if (argLib.isNull(object)) {
+                                    break;
+                                }
+                                args[i] = asPythonObjectNode.execute(object);
+                            } catch (InvalidArrayIndexException e) {
+                                throw CompilerDirectives.shouldNotReachHere();
+                            }
+                        }
+                        Object callable = asPythonObjectNode.execute(callableObj);
+                        return toNewRefNode.execute(callNode.execute(frame, callable, args, PKeyword.EMPTY_KEYWORDS));
+                    } catch (UnsupportedMessageException | OverflowException e) {
+                        // I think we can just assume that there won't be more than
+                        // Integer.MAX_VALUE arguments.
+                        throw CompilerDirectives.shouldNotReachHere();
+                    }
+                } catch (PException e) {
+                    // transformExceptionToNativeNode acts as a branch profile
+                    transformExceptionToNativeNode.execute(frame, e);
+                    return nullToSulongNode.execute(getNativeNullNode.execute());
+                }
+            }
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+    }
+
+    // directly called without landing function
+    @Builtin(name = "PyObject_FastCallDict", parameterNames = {"callable", "argsArray", "kwargs"})
+    @GenerateNodeFactory
+    abstract static class PyObjectFastCallDictNode extends PythonTernaryBuiltinNode {
 
+        @Specialization(limit = "1")
+        static Object doGeneric(VirtualFrame frame, Object callableObj, Object argsArray, Object kwargsObj,
+                        @CachedLibrary("argsArray") InteropLibrary argsArrayLib,
+                        @Cached AsPythonObjectNode asPythonObjectNode,
+                        @Cached CastKwargsNode castKwargsNode,
+                        @Cached CallNode callNode,
+                        @Cached ToNewRefNode toNewRefNode,
+                        @Cached GetNativeNullNode getNativeNullNode,
+                        @Cached CExtNodes.ToSulongNode nullToSulongNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            if (argsArrayLib.hasArrayElements(argsArray)) {
+                try {
+                    try {
+                        // consume all arguments of the va_list
+                        long arraySize = argsArrayLib.getArraySize(argsArray);
+                        Object[] args = new Object[PInt.intValueExact(arraySize)];
+                        for (int i = 0; i < args.length; i++) {
+                            try {
+                                args[i] = asPythonObjectNode.execute(argsArrayLib.readArrayElement(argsArray, i));
+                            } catch (InvalidArrayIndexException e) {
+                                throw CompilerDirectives.shouldNotReachHere();
+                            }
+                        }
+                        Object callable = asPythonObjectNode.execute(callableObj);
+                        PKeyword[] keywords = castKwargsNode.execute(kwargsObj);
+                        return toNewRefNode.execute(callNode.execute(frame, callable, args, keywords));
+                    } catch (UnsupportedMessageException | OverflowException e) {
+                        // I think we can just assume that there won't be more than
+                        // Integer.MAX_VALUE arguments.
+                        throw CompilerDirectives.shouldNotReachHere();
+                    }
+                } catch (PException e) {
+                    // transformExceptionToNativeNode acts as a branch profile
+                    transformExceptionToNativeNode.execute(frame, e);
+                    return nullToSulongNode.execute(getNativeNullNode.execute());
+                }
+            }
+            throw CompilerDirectives.shouldNotReachHere();
+        }
     }
 
     @ReportPolymorphism