opt GIL: DynamicObjectNativeWrapper, PythonNativeWrapper

Author: cosminbasca

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

@@ -20,7 +20,7 @@
  *
  * 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
+ * use, sell, offer for sale, import, export, have made, and have sold the// skip GIL
  * Software and the Larger Work(s), and to sublicense the foregoing rights on
  * either these or other terms.
  *
@@ -213,13 +213,8 @@ public DynamicObjectStorage getNativeMemberStore() {
 
     @ExportMessage
     protected boolean isNull(
-                    @CachedLibrary("this") PythonNativeWrapperLibrary lib, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return lib.getDelegate(this) == PNone.NO_VALUE;
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @CachedLibrary("this") PythonNativeWrapperLibrary lib) {
+        return lib.getDelegate(this) == PNone.NO_VALUE;
     }
 
     // READ
@@ -235,13 +230,8 @@ protected boolean isMemberReadable(@SuppressWarnings("unused") String member) {
     }
 
     @ExportMessage
-    protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return new InteropArray(new String[]{DynamicObjectNativeWrapper.GP_OBJECT});
-        } finally {
-            gil.release(mustRelease);
-        }
+    protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal) {
+        return new InteropArray(new String[]{DynamicObjectNativeWrapper.GP_OBJECT});
     }
 
     @ExportMessage(name = "readMember")
@@ -1356,13 +1346,8 @@ protected boolean isMemberModifiable(String member) {
     }
 
     @ExportMessage
-    protected boolean isMemberInsertable(@SuppressWarnings("unused") String member, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return false;
-        } finally {
-            gil.release(mustRelease);
-        }
+    protected boolean isMemberInsertable(@SuppressWarnings("unused") String member) {
+        return false;
     }
 
     @ExportMessage
@@ -1378,33 +1363,18 @@ protected void writeMember(String member, Object value,
     }
 
     @ExportMessage
-    protected boolean isMemberRemovable(@SuppressWarnings("unused") String member, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return false;
-        } finally {
-            gil.release(mustRelease);
-        }
+    protected boolean isMemberRemovable(@SuppressWarnings("unused") String member) {
+        return false;
     }
 
     @ExportMessage
-    protected void removeMember(@SuppressWarnings("unused") String member, @Exclusive @Cached GilNode gil) throws UnsupportedMessageException {
-        boolean mustRelease = gil.acquire();
-        try {
-            throw UnsupportedMessageException.create();
-        } finally {
-            gil.release(mustRelease);
-        }
+    protected void removeMember(@SuppressWarnings("unused") String member) throws UnsupportedMessageException {
+        throw UnsupportedMessageException.create();
     }
 
     @ExportMessage
-    protected boolean isExecutable(@Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return true;
-        } finally {
-            gil.release(mustRelease);
-        }
+    protected boolean isExecutable() {
+        return true;
     }
 
     @ExportMessage
@@ -1563,25 +1533,15 @@ abstract static class IsMemberReadable {
             @Specialization(guards = {"stringEquals(cachedName, name, stringProfile)", "isValid(cachedName)"})
             static boolean isReadableNativeMembers(PythonObjectNativeWrapper receiver, String name,
                             @Cached("createBinaryProfile()") ConditionProfile stringProfile,
-                            @Cached(value = "name", allowUncached = true) String cachedName, @Exclusive @Cached GilNode gil) {
-                boolean mustRelease = gil.acquire();
-                try {
-                    return true;
-                } finally {
-                    gil.release(mustRelease);
-                }
+                            @Cached(value = "name", allowUncached = true) String cachedName) {
+                return true;
             }
 
             @SuppressWarnings("unused")
             @Specialization(guards = "stringEquals(GP_OBJECT, name, stringProfile)")
             static boolean isReadableCachedGP(PythonObjectNativeWrapper receiver, String name,
-                            @Cached("createBinaryProfile()") ConditionProfile stringProfile, @Exclusive @Cached GilNode gil) {
-                boolean mustRelease = gil.acquire();
-                try {
-                    return true;
-                } finally {
-                    gil.release(mustRelease);
-                }
+                            @Cached("createBinaryProfile()") ConditionProfile stringProfile) {
+                return true;
             }
 
             static boolean isPyTimeMemberReadable(PythonObjectNativeWrapper receiver, PythonNativeWrapperLibrary lib, PythonObjectLibrary plib, GetNameNode getNameNode) {
@@ -1593,28 +1553,18 @@ static boolean isPyTimeMemberReadable(PythonObjectNativeWrapper receiver, Python
             static boolean isReadablePyTime(PythonObjectNativeWrapper receiver, String name,
                             @CachedLibrary("receiver") PythonNativeWrapperLibrary lib,
                             @CachedLibrary(limit = "4") PythonObjectLibrary plib,
-                            @Cached GetNameNode getNameNode, @Exclusive @Cached GilNode gil) {
-                boolean mustRelease = gil.acquire();
-                try {
-                    return true;
-                } finally {
-                    gil.release(mustRelease);
-                }
+                            @Cached GetNameNode getNameNode) {
+                return true;
             }
 
             @Specialization
             @TruffleBoundary
             static boolean isReadableFallback(PythonObjectNativeWrapper receiver, String name,
                             @CachedLibrary("receiver") PythonNativeWrapperLibrary lib,
                             @CachedLibrary(limit = "4") PythonObjectLibrary plib,
-                            @Cached GetNameNode getNameNode, @Exclusive @Cached GilNode gil) {
-                boolean mustRelease = gil.acquire();
-                try {
-                    return DynamicObjectNativeWrapper.GP_OBJECT.equals(name) || NativeMember.isValid(name) ||
+                            @Cached GetNameNode getNameNode) {
+                return DynamicObjectNativeWrapper.GP_OBJECT.equals(name) || NativeMember.isValid(name) ||
                                     ReadObjectNativeMemberNode.isPyDateTimeCAPIType(getNameNode.execute(plib.getLazyPythonClass(lib.getDelegate(receiver))));
-                } finally {
-                    gil.release(mustRelease);
-                }
             }
         }
 
@@ -1627,13 +1577,8 @@ abstract static class IsMemberModifiable {
             static boolean isModifiableCached(PythonObjectNativeWrapper receiver, String name,
                             @Cached("createBinaryProfile()") ConditionProfile stringProfile,
                             @Cached(value = "name", allowUncached = true) String cachedName,
-                            @Cached(value = "isValid(name)", allowUncached = true) boolean isValid, @Exclusive @Cached GilNode gil) {
-                boolean mustRelease = gil.acquire();
-                try {
-                    return isValid;
-                } finally {
-                    gil.release(mustRelease);
-                }
+                            @Cached(value = "isValid(name)", allowUncached = true) boolean isValid) {
+                return isValid;
             }
         }
     }
@@ -1896,73 +1841,48 @@ protected static boolean isObType(String key) {
 
         @ExportMessage
         @TruffleBoundary
-        int identityHashCode(@Exclusive @Cached GilNode gil) {
-            boolean mustRelease = gil.acquire();
-            try {
-                int val = Byte.hashCode(state) ^ Long.hashCode(value);
-                if (Double.isNaN(dvalue)) {
-                    return val;
-                } else {
-                    return val ^ Double.hashCode(dvalue);
-                }
-            } finally {
-                gil.release(mustRelease);
+        int identityHashCode() {
+            int val = Byte.hashCode(state) ^ Long.hashCode(value);
+            if (Double.isNaN(dvalue)) {
+                return val;
+            } else {
+                return val ^ Double.hashCode(dvalue);
             }
         }
 
         @ExportMessage
-        TriState isIdenticalOrUndefined(Object obj, @Exclusive @Cached GilNode gil) {
-            boolean mustRelease = gil.acquire();
-            try {
-                if (obj instanceof PrimitiveNativeWrapper) {
-                    // This basically emulates singletons for boxed values. However, we need to do
-                    // so to
-                    // preserve the invariant that storing an object into a list and getting it out
-                    // (in
-                    // the same critical region) returns the same object.
-                    PrimitiveNativeWrapper other = (PrimitiveNativeWrapper) obj;
-                    return TriState.valueOf(other.state == state && other.value == value &&
-                                    (other.dvalue == dvalue || Double.isNaN(dvalue) && Double.isNaN(other.dvalue)));
-                } else {
-                    return TriState.UNDEFINED;
-                }
-            } finally {
-                gil.release(mustRelease);
+        TriState isIdenticalOrUndefined(Object obj) {
+            if (obj instanceof PrimitiveNativeWrapper) {
+                // This basically emulates singletons for boxed values. However, we need to do
+                // so to
+                // preserve the invariant that storing an object into a list and getting it out
+                // (in
+                // the same critical region) returns the same object.
+                PrimitiveNativeWrapper other = (PrimitiveNativeWrapper) obj;
+                return TriState.valueOf(other.state == state && other.value == value &&
+                                (other.dvalue == dvalue || Double.isNaN(dvalue) && Double.isNaN(other.dvalue)));
+            } else {
+                return TriState.UNDEFINED;
             }
         }
     }
 
     @ExportMessage
     protected boolean isPointer(
-                    @Cached IsPointerNode pIsPointerNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return pIsPointerNode.execute(this);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Cached IsPointerNode pIsPointerNode) {
+        return pIsPointerNode.execute(this);
     }
 
     @ExportMessage
     protected long asPointer(
-                    @Cached PAsPointerNode pAsPointerNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return pAsPointerNode.execute(this);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Cached PAsPointerNode pAsPointerNode) {
+        return pAsPointerNode.execute(this);
     }
 
     @ExportMessage
     protected void toNative(
-                    @Cached ToNativeNode toNativeNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            toNativeNode.execute(this);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Cached ToNativeNode toNativeNode) {
+        toNativeNode.execute(this);
     }
 
     @ExportMessage
@@ -1972,12 +1892,7 @@ protected boolean hasNativeType() {
 
     @ExportMessage
     protected Object getNativeType(
-                    @Cached PGetDynamicTypeNode getDynamicTypeNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return getDynamicTypeNode.execute(this);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Cached PGetDynamicTypeNode getDynamicTypeNode) {
+        return getDynamicTypeNode.execute(this);
     }
 }

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

@@ -38,17 +38,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+// skip GIL
 package com.oracle.graal.python.builtins.objects.cext.capi;
 
 import com.oracle.graal.python.PythonLanguage;
-import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.library.ExportLibrary;
@@ -183,32 +181,21 @@ public void setNativePointer(Object nativePointer) {
     protected static class IsNative {
         @Specialization(guards = {"cachedWrapper == wrapper", "nativePointer != null"}, assumptions = {"singleContextAssumption()", "cachedAssumption"})
         protected static boolean isCachedNative(@SuppressWarnings("unused") PythonNativeWrapper wrapper,
-                        @Exclusive @Cached GilNode gil,
-                        @Bind("gil.acquire()") boolean mustRelease,
                         @SuppressWarnings("unused") @Cached(value = "wrapper", weak = true) PythonNativeWrapper cachedWrapper,
                         @SuppressWarnings("unused") @Cached("wrapper.getHandleValidAssumption()") Assumption cachedAssumption,
                         @SuppressWarnings("unused") @Cached(value = "wrapper.getNativePointerPrivate()", weak = true) Object nativePointer) {
-            try {
-                return true;
-            } finally {
-                gil.release(mustRelease);
-            }
+            return true;
         }
 
         @Specialization(replaces = "isCachedNative")
         protected static boolean isNative(PythonNativeWrapper wrapper,
-                        @Cached ConditionProfile hasNativePointerProfile, @Exclusive @Cached GilNode gil) {
-            boolean mustRelease = gil.acquire();
-            try {
-                if (hasNativePointerProfile.profile(wrapper.nativePointer != null)) {
-                    Assumption handleValidAssumption = wrapper.getHandleValidAssumption();
-                    // If an assumption exists, it must be valid
-                    return handleValidAssumption == null || isValid(handleValidAssumption);
-                }
-                return false;
-            } finally {
-                gil.release(mustRelease);
+                        @Cached ConditionProfile hasNativePointerProfile) {
+            if (hasNativePointerProfile.profile(wrapper.nativePointer != null)) {
+                Assumption handleValidAssumption = wrapper.getHandleValidAssumption();
+                // If an assumption exists, it must be valid
+                return handleValidAssumption == null || isValid(handleValidAssumption);
             }
+            return false;
         }
     }
 }