[GR-11651] Improve performance for calling native class methods.

PullRequest: graalpython/196

Author: fangerer

graalpython/benchmarks/src/micro/c-call-classmethod.py

@@ -0,0 +1,143 @@
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+code = """
+#include "Python.h"
+
+typedef struct {
+    PyObject_HEAD;
+} NativeCustomObject;
+
+PyObject* nc_classmethod(PyObject* class, PyObject* args) {
+    return PyTuple_GET_ITEM(args, 0);
+}
+
+static struct PyMethodDef nc_methods[] = {
+    {"customClassMethod", nc_classmethod, METH_VARARGS | METH_CLASS, ""},
+    {NULL, NULL, 0, NULL}
+};
+
+static PyTypeObject NativeCustomType = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+        "NativeCustomType.NativeCustomType",
+    sizeof(NativeCustomObject),       /* tp_basicsize */
+    0,                          /* tp_itemsize */
+    0,                          /* tp_dealloc */
+    0,
+    0,
+    0,
+    0,                          /* tp_reserved */
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    Py_TPFLAGS_DEFAULT,
+    "",
+    0,                          /* tp_traverse */
+    0,                          /* tp_clear */
+    0,                          /* tp_richcompare */
+    0,                          /* tp_weaklistoffset */
+    0,                          /* tp_iter */
+    0,                          /* tp_iternext */
+    nc_methods,                 /* tp_methods */
+    NULL,                       /* tp_members */
+    0,                          /* tp_getset */
+    0,                          /* tp_base */
+    0,                          /* tp_dict */
+    0,                          /* tp_descr_get */
+    0,                          /* tp_descr_set */
+    0,                          /* tp_dictoffset */
+    0,                          /* tp_init */
+    PyType_GenericAlloc,        /* tp_alloc */
+    PyType_GenericNew,          /* tp_new */
+    PyObject_Del,               /* tp_free */
+};
+
+static PyModuleDef c_classmethod_module = {
+    PyModuleDef_HEAD_INIT,
+    "c_classmethod_module",
+    "",
+    -1,
+    NULL, NULL, NULL, NULL, NULL
+};
+
+PyMODINIT_FUNC
+PyInit_c_classmethod(void)
+{
+    PyObject* m;
+
+    if (PyType_Ready(&NativeCustomType) < 0)
+        return NULL;
+
+    m = PyModule_Create(&c_classmethod_module);
+    if (m == NULL)
+        return NULL;
+
+    Py_INCREF(&NativeCustomType);
+    PyModule_AddObject(m, "NativeCustomType", (PyObject *)&NativeCustomType);
+    return m;
+}
+
+"""
+
+
+ccompile("c_classmethod", code)
+from c_classmethod import NativeCustomType
+
+def count(num):
+    total = 0
+    for i in range(num):
+        total += NativeCustomType.customClassMethod(i)
+    return total
+
+
+def measure(num):
+    result = count(num)
+    print("result = " + str(result))
+
+
+def __benchmark__(num=1000000):
+    measure(num)
+

graalpython/benchmarks/src/micro/call-classmethod.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+class CustomType:
+    @classmethod
+    def customClassMethod(clazz, *args):
+        return args[0]
+
+def count(num):
+    total = 0
+    for i in range(num):
+        total += CustomType.customClassMethod(i)
+    return total
+
+
+def measure(num):
+    result = count(num)
+    print("result = " + str(result))
+
+
+def __benchmark__(num=1000000):
+    measure(num)
+

graalpython/com.oracle.graal.python.cext/include/truffle.h

@@ -52,6 +52,7 @@ void *truffle_managed_from_handle(void *nativeHandle);
 bool truffle_is_handle_to_managed(void *nativeHandle);
 void *truffle_assign_managed(void *dst, void *managed);
 void *truffle_deref_handle_for_managed(void *managed);
+bool truffle_cannot_be_handle(void *nativeHandle);
 
 /*
  * All function below here are deprecated and will be removed in a future release.

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

@@ -66,74 +66,74 @@ int PyNumber_Check(PyObject *o) {
 }
 
 UPCALL_ID(PyNumber_UnaryOp);
-static PyObject * do_unaryop(PyObject *v, UnaryOp unaryop, char *unaryop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_UnaryOp, native_to_java(v), unaryop, polyglot_from_string(unaryop_name, SRC_CS));
+static PyObject * do_unaryop(PyObject *v, UnaryOp unaryop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_UnaryOp, native_to_java(v), unaryop);
 }
 
 UPCALL_ID(PyNumber_BinOp);
-static PyObject * do_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_BinOp, native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
+static PyObject * do_binop(PyObject *v, PyObject *w, BinOp binop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_BinOp, native_to_java(v), native_to_java(w), binop);
 }
 
 UPCALL_ID(PyNumber_InPlaceBinOp);
-static PyObject * do_inplace_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_InPlaceBinOp, native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
+static PyObject * do_inplace_binop(PyObject *v, PyObject *w, BinOp binop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_InPlaceBinOp, native_to_java(v), native_to_java(w), binop);
 }
 
 PyObject * PyNumber_Add(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, ADD, "+");
+	return do_binop(o1, o2, ADD);
 }
 
 PyObject * PyNumber_Subtract(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, SUB, "-");
+	return do_binop(o1, o2, SUB);
 }
 
 PyObject * PyNumber_Multiply(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, MUL, "*");
+	return do_binop(o1, o2, MUL);
 }
 
 PyObject * PyNumber_TrueDivide(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, TRUEDIV, "/");
+	return do_binop(o1, o2, TRUEDIV);
 }
 
 PyObject * PyNumber_FloorDivide(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, FLOORDIV, "//");
+	return do_binop(o1, o2, FLOORDIV);
 }
 
 PyObject * PyNumber_Remainder(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, MOD, "%");
+	return do_binop(o1, o2, MOD);
 }
 
 PyObject * PyNumber_Lshift(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, LSHIFT, "<<");
+	return do_binop(o1, o2, LSHIFT);
 }
 
 PyObject * PyNumber_Rshift(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, RSHIFT, ">>");
+	return do_binop(o1, o2, RSHIFT);
 }
 
 PyObject * PyNumber_Or(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, OR, "|");
+	return do_binop(o1, o2, OR);
 }
 
 PyObject * PyNumber_And(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, AND, "&");
+	return do_binop(o1, o2, AND);
 }
 
 PyObject * PyNumber_Xor(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, XOR, "^");
+	return do_binop(o1, o2, XOR);
 }
 
 PyObject * PyNumber_Positive(PyObject *o) {
-	return do_unaryop(o, POS, "+");
+	return do_unaryop(o, POS);
 }
 
 PyObject * PyNumber_Negative(PyObject *o) {
-	return do_unaryop(o, NEG, "-");
+	return do_unaryop(o, NEG);
 }
 
 PyObject * PyNumber_Invert(PyObject *o) {
-	return do_unaryop(o, INVERT, "~");
+	return do_unaryop(o, INVERT);
 }
 
 UPCALL_ID(PyNumber_Index);
@@ -145,7 +145,7 @@ PyObject * PyNumber_Index(PyObject *o) {
 }
 
 PyObject * PyNumber_InPlaceTrueDivide(PyObject *o1, PyObject *o2) {
-    return do_inplace_binop(o1, o2, TRUEDIV, "/");
+    return do_inplace_binop(o1, o2, TRUEDIV);
 }
 
 Py_ssize_t PyNumber_AsSsize_t(PyObject *item, PyObject *err) {

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

@@ -53,10 +53,7 @@ uint64_t (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
 double (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
 void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 
-typedef void* (*cache_t)(uint64_t);
-static cache_t cache;
-
-#define resolve_handle(__cache__, __addr__) (__cache__)(__addr__)
+cache_t cache;
 
 __attribute__((constructor (__COUNTER__)))
 static void initialize_upcall_functions() {
@@ -198,28 +195,6 @@ static void initialize_capi() {
     initialize_bufferprocs();
 }
 
-// Heuristic to test if some value is a pointer object
-// TODO we need a reliable solution for that
-#define IS_POINTER(__val__) (polyglot_is_value(__val__) && !polyglot_fits_in_i64(__val__))
-
-MUST_INLINE
-void* native_to_java(PyObject* obj) {
-    if (obj == NULL) {
-        return Py_NoValue;
-    } else if (obj == Py_None) {
-        return Py_None;
-    } else if (polyglot_is_string(obj)) {
-        return obj;
-    } else if (truffle_is_handle_to_managed(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
-    } else if (truffle_is_handle_to_managed(obj->ob_refcnt)) {
-        return truffle_managed_from_handle(obj->ob_refcnt);
-    } else if (IS_POINTER(obj->ob_refcnt)) {
-        return obj->ob_refcnt;
-    }
-    return obj;
-}
-
 void* native_to_java_exported(PyObject* obj) {
     return native_to_java(obj);
 }
@@ -240,12 +215,12 @@ PyObject* to_sulong(void *o) {
 /** to be used from Java code only; reads native 'ob_type' field */
 void* get_ob_type(PyObject* obj) {
     PyTypeObject*  type = obj->ob_type;
-    if (truffle_is_handle_to_managed(type)) {
+    if (!truffle_cannot_be_handle(type)) {
         return resolve_handle(cache, (uint64_t)type);
     } else {
         // we have stored a handle to the Java class in ob_refcnt
         void* handle = (void*)((PyObject*)type)->ob_refcnt;
-        if (truffle_is_handle_to_managed(handle)) {
+        if (!truffle_cannot_be_handle(handle)) {
             return resolve_handle(cache, (uint64_t)handle);
         } else {
             // assume handle is a TruffleObject
@@ -273,15 +248,15 @@ uint64_t PyTruffle_Wchar_Size() {
 }
 
 void* PyObjectHandle_ForJavaObject(void* cobj, unsigned long flags) {
-    if (!truffle_is_handle_to_managed(cobj)) {
+    if (truffle_cannot_be_handle(cobj)) {
         return truffle_deref_handle_for_managed(cobj);
     }
     return cobj;
 }
 
 /** to be used from Java code only; only creates the deref handle */
 void* PyObjectHandle_ForJavaType(void* ptype) {
-    if (!truffle_is_handle_to_managed(ptype)) {
+    if (truffle_cannot_be_handle(ptype)) {
         return truffle_deref_handle_for_managed(ptype);
     }
     return ptype;