[GR-12287] Improve performance of native instance checks (part 2).

PullRequest: graalpython/273

Author: fangerer

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

@@ -183,6 +183,16 @@ inline void* native_to_java(PyObject* obj) {
     }
 }
 
+__attribute__((always_inline))
+inline void* native_type_to_java(PyTypeObject* type) {
+	if (IS_POINTER(((PyObject*)type)->ob_refcnt)) {
+		return (void*)((PyObject*)type)->ob_refcnt;
+	} else if (!truffle_cannot_be_handle(((PyObject*)type)->ob_refcnt)) {
+		return resolve_handle(cache, ((PyObject*)type)->ob_refcnt);
+	}
+	return (void*)type;
+}
+
 extern void* to_java(PyObject* obj);
 extern void* to_java_type(PyTypeObject* cls);
 extern PyObject* to_sulong(void *o);

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

@@ -54,7 +54,7 @@ PyTypeObject PySuper_Type = PY_TRUFFLE_TYPE("super", &PyType_Type, Py_TPFLAGS_DE
 
 UPCALL_ID(PyType_IsSubtype);
 int PyType_IsSubtype(PyTypeObject* a, PyTypeObject* b) {
-    return UPCALL_CEXT_I(_jls_PyType_IsSubtype, native_to_java((PyObject*)a), native_to_java((PyObject*)b));
+    return ((int (*)(void* a, void* b))_jls_PyType_IsSubtype)(native_type_to_java(a), native_type_to_java(b));
 }
 
 static int add_subclass(PyTypeObject *base, PyTypeObject *type) {

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

@@ -117,6 +117,7 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.GetTypeFlagsNode;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PGuards;
@@ -1313,18 +1314,19 @@ Object tbHere(PTraceback next, PFrame frame) {
     @GenerateNodeFactory
     abstract static class PyTruffle_GetTpFlags extends NativeBuiltin {
 
+        @Child private GetTypeFlagsNode getTypeFlagsNode;
         @Child private GetClassNode getClassNode;
 
         @Specialization
         long doPythonObject(PythonNativeWrapper nativeWrapper) {
             PythonClass pclass = getClassNode().execute(nativeWrapper.getDelegate());
-            return pclass.getFlags();
+            return getTypeFlagsNode().execute(pclass);
         }
 
         @Specialization
         long doPythonObject(PythonAbstractObject object) {
             PythonClass pclass = getClassNode().execute(object);
-            return pclass.getFlags();
+            return getTypeFlagsNode().execute(pclass);
         }
 
         private GetClassNode getClassNode() {
@@ -1334,6 +1336,14 @@ private GetClassNode getClassNode() {
             }
             return getClassNode;
         }
+
+        private GetTypeFlagsNode getTypeFlagsNode() {
+            if (getTypeFlagsNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getTypeFlagsNode = insert(GetTypeFlagsNode.create());
+            }
+            return getTypeFlagsNode;
+        }
     }
 
     @Builtin(name = "PyTruffle_Set_SulongType", fixedNumOfPositionalArgs = 2)
@@ -2029,14 +2039,37 @@ long doGeneric(Object n) {
     @Builtin(name = "PyType_IsSubtype", fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     abstract static class PyType_IsSubtype extends PythonBinaryBuiltinNode {
+
         @Child private IsSubtypeNode isSubtypeNode = IsSubtypeNode.create();
+        @Child private CExtNodes.AsPythonObjectNode asPythonObjectNode = CExtNodes.AsPythonObjectNode.create();
+        @Child private CExtNodes.ToJavaNode toJavaNode;
+
+        @Specialization(guards = {"a == cachedA", "b == cachedB"})
+        int doCached(@SuppressWarnings("unused") PythonNativeWrapper a, @SuppressWarnings("unused") PythonNativeWrapper b,
+                        @Cached("a") @SuppressWarnings("unused") PythonNativeWrapper cachedA,
+                        @Cached("b") @SuppressWarnings("unused") PythonNativeWrapper cachedB,
+                        @Cached("isNativeSubtype(a, b)") int result) {
+            return result;
+        }
 
-        @Specialization
-        int doI(PythonClass a, PythonClass b) {
-            if (isSubtypeNode.execute(a, b)) {
-                return 1;
+        @Specialization(replaces = "doCached")
+        int doUncached(PythonNativeWrapper a, PythonNativeWrapper b) {
+            return isNativeSubtype(a, b);
+        }
+
+        @Fallback
+        int doGeneric(Object a, Object b) {
+            if (toJavaNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                toJavaNode = insert(CExtNodes.ToJavaNode.create());
             }
-            return 0;
+            return isSubtypeNode.execute(toJavaNode.execute(a), toJavaNode.execute(b)) ? 1 : 0;
+        }
+
+        protected int isNativeSubtype(PythonNativeWrapper a, PythonNativeWrapper b) {
+            assert a instanceof PythonClassNativeWrapper || a instanceof PythonClassInitNativeWrapper;
+            assert b instanceof PythonClassNativeWrapper || b instanceof PythonClassInitNativeWrapper;
+            return isSubtypeNode.execute(asPythonObjectNode.execute(a), asPythonObjectNode.execute(b)) ? 1 : 0;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -86,6 +86,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.type.GetTypeFlagsNode;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -329,8 +330,9 @@ Object doObFval(Object object, @SuppressWarnings("unused") String key,
         }
 
         @Specialization(guards = "eq(TP_FLAGS, key)")
-        long doTpFlags(PythonClass object, @SuppressWarnings("unused") String key) {
-            return object.getFlags();
+        long doTpFlags(PythonClass object, @SuppressWarnings("unused") String key,
+                        @Cached("create()") GetTypeFlagsNode getTypeFlagsNode) {
+            return getTypeFlagsNode.execute(object);
         }
 
         @Specialization(guards = "eq(TP_NAME, key)")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/GetTypeFlagsNode.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+package com.oracle.graal.python.builtins.objects.type;
+
+import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.truffle.api.dsl.Specialization;
+
+public abstract class GetTypeFlagsNode extends PNodeWithContext {
+
+    public abstract long execute(PythonClass clazz);
+
+    @Specialization(guards = "isInitialized(clazz)")
+    long doInitialized(PythonClass clazz) {
+        return clazz.getFlagsContainer().flags;
+    }
+
+    @Specialization
+    long doGeneric(PythonClass clazz) {
+        if (!isInitialized(clazz)) {
+            return clazz.getFlags();
+        }
+        return clazz.getFlagsContainer().flags;
+    }
+
+    protected static boolean isInitialized(PythonClass clazz) {
+        return clazz.getFlagsContainer().initialDominantBase == null;
+    }
+
+    public static GetTypeFlagsNode create() {
+        return GetTypeFlagsNodeGen.create();
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java

@@ -299,13 +299,17 @@ public void setFlags(long flags) {
         this.flags.setValue(flags);
     }
 
+    FlagsContainer getFlagsContainer() {
+        return flags;
+    }
+
     /**
      * Flags are copied from the initial dominant base class. However, classes may already be
      * created before the C API was initialized, i.e., flags were not set.
      */
-    private static final class FlagsContainer {
-        private PythonClass initialDominantBase;
-        private long flags;
+    static final class FlagsContainer {
+        PythonClass initialDominantBase;
+        long flags;
 
         public FlagsContainer(PythonClass superClass) {
             this.initialDominantBase = superClass;