[GR-35958] Use field instead of assumption for single context.

PullRequest: graalpython/2079

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2015, Regents of the University of California
  *
  * All rights reserved.
@@ -185,6 +185,12 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     public final Assumption singleContextAssumption = Truffle.getRuntime().createAssumption("Only a single context is active");
 
+    @CompilationFinal private boolean singleContext = true;
+
+    public boolean isSingleContext() {
+        return singleContext;
+    }
+
     /**
      * This assumption will be valid if all contexts are single-threaded. Hence, it will be
      * invalidated as soon as at least one context has been initialized for multi-threading.
@@ -727,6 +733,7 @@ private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) th
     protected void initializeMultipleContexts() {
         super.initializeMultipleContexts();
         singleContextAssumption.invalidate();
+        singleContext = false;
     }
 
     private final ConcurrentHashMap<String, CallTarget> cachedCode = new ConcurrentHashMap<>();

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

@@ -1656,19 +1656,11 @@ private void checkExcessArgs(Object type, Object[] varargs, PKeyword[] kwargs) {
                 }
                 if (profileNew == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    if (getLanguage().singleContextAssumption.isValid()) {
-                        profileNew = ValueProfile.createIdentityProfile();
-                    } else {
-                        profileNew = ValueProfile.createClassProfile();
-                    }
+                    profileNew = createValueIdentityProfile();
                 }
                 if (profileInit == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    if (getLanguage().singleContextAssumption.isValid()) {
-                        profileInit = ValueProfile.createIdentityProfile();
-                    } else {
-                        profileInit = ValueProfile.createClassProfile();
-                    }
+                    profileInit = createValueIdentityProfile();
                 }
                 if (profileNewFactory == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();

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

@@ -219,7 +219,6 @@
 import com.oracle.graal.python.util.CharsetMapping;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -1766,7 +1765,6 @@ public abstract static class PrintNode extends PythonBuiltinNode {
         private static final String DEFAULT_END = "\n";
         private static final String DEFAULT_SEPARATOR = " ";
         @Child private ReadAttributeFromObjectNode readStdout;
-        @CompilationFinal private Assumption singleContextAssumption;
         @CompilationFinal private PythonModule cachedSys;
 
         @Specialization
@@ -1844,12 +1842,8 @@ PNone printGeneric(VirtualFrame frame, Object[] values, Object sepIn, Object end
         }
 
         private Object getStdout() {
-            if (singleContextAssumption == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                singleContextAssumption = singleContextAssumption();
-            }
             PythonModule sys;
-            if (singleContextAssumption.isValid()) {
+            if (getLanguage().isSingleContext()) {
                 if (cachedSys == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     cachedSys = getContext().lookupBuiltinModule("sys");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -168,7 +168,7 @@ public abstract static class GetMagic extends PythonBuiltinNode {
         @Child private IntBuiltins.ToBytesNode toBytesNode = IntBuiltins.ToBytesNode.create();
         @Child private PythonBufferAccessLibrary bufferLib = PythonBufferAccessLibrary.getFactory().createDispatched(1);
 
-        @Specialization(assumptions = "singleContextAssumption()")
+        @Specialization(guards = "isSingleContext()")
         public PBytes runCachedSingleContext(@SuppressWarnings("unused") VirtualFrame frame,
                         @Cached(value = "getMagicNumberPBytes(frame)", weak = true) PBytes magicBytes) {
             return magicBytes;

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

@@ -1748,7 +1748,7 @@ static PyCFunctionDecorator decorate(Object fun0, Object fun1) {
     @ImportStatic(PythonOptions.class)
     abstract static class PyType_IsSubtype extends PythonBinaryBuiltinNode {
 
-        @Specialization(guards = {"a == cachedA", "b == cachedB"}, assumptions = "singleContextAssumption()")
+        @Specialization(guards = {"isSingleContext()", "a == cachedA", "b == cachedB"})
         static int doCached(@SuppressWarnings("unused") VirtualFrame frame, @SuppressWarnings("unused") PythonNativeWrapper a, @SuppressWarnings("unused") PythonNativeWrapper b,
                         @Cached(value = "a", weak = true) @SuppressWarnings("unused") PythonNativeWrapper cachedA,
                         @Cached(value = "b", weak = true) @SuppressWarnings("unused") PythonNativeWrapper cachedB,
@@ -2127,7 +2127,7 @@ static Object doGeneric(String key) {
     abstract static class PyTruffleTraceMallocTrack extends PythonBuiltinNode {
         private static final TruffleLogger LOGGER = PythonLanguage.getLogger(PyTruffleTraceMallocTrack.class);
 
-        @Specialization(guards = {"domain == cachedDomain"}, limit = "3", assumptions = "singleContextAssumption()")
+        @Specialization(guards = {"isSingleContext()", "domain == cachedDomain"}, limit = "3")
         int doCachedDomainIdx(VirtualFrame frame, @SuppressWarnings("unused") long domain, Object pointerObject, long size,
                         @Cached GetThreadStateNode getThreadStateNode,
                         @Cached("domain") @SuppressWarnings("unused") long cachedDomain,
@@ -2159,7 +2159,7 @@ int lookupDomain(long domain) {
     abstract static class PyTruffleTraceMallocUntrack extends PythonBinaryBuiltinNode {
         private static final TruffleLogger LOGGER = PythonLanguage.getLogger(PyTruffleTraceMallocUntrack.class);
 
-        @Specialization(guards = {"domain == cachedDomain"}, limit = "3", assumptions = "singleContextAssumption()")
+        @Specialization(guards = {"isSingleContext()", "domain == cachedDomain"}, limit = "3")
         int doCachedDomainIdx(@SuppressWarnings("unused") long domain, Object pointerObject,
                         @Cached("domain") @SuppressWarnings("unused") long cachedDomain,
                         @Cached("lookupDomain(domain)") int cachedDomainIdx) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -120,7 +120,6 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -161,14 +160,6 @@ public abstract class PythonAbstractObject extends DynamicObject implements Truf
     protected static final SpecialMethodSlot Iter = SpecialMethodSlot.Iter;
     protected static final SpecialMethodSlot Next = SpecialMethodSlot.Next;
 
-    public static final Assumption singleContextAssumption() {
-        return PythonLanguage.get(null).singleContextAssumption;
-    }
-
-    public static final Assumption singleContextAssumption(Node node) {
-        return PythonLanguage.get(node).singleContextAssumption;
-    }
-
     protected static final Shape ABSTRACT_SHAPE = Shape.newBuilder().build();
 
     protected PythonAbstractObject(Shape shape) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/CellBuiltins.java

@@ -52,7 +52,6 @@
 
 import java.util.List;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -64,18 +63,17 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.util.PythonUtils;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PCell)
@@ -298,16 +296,11 @@ Object set(PCell self, Object ref) {
         }
     }
 
-    public abstract static class GetRefNode extends Node {
+    public abstract static class GetRefNode extends PNodeWithContext {
         public abstract Object execute(PCell self);
 
-        protected Assumption singleContextAssumption() {
-            return PythonLanguage.get(this).singleContextAssumption;
-        }
-
-        @Specialization(guards = "self == cachedSelf", assumptions = {"cachedSelf.isEffectivelyFinalAssumption()", "singleContextAssumption"}, limit = "1")
+        @Specialization(guards = {"isSingleContext()", "self == cachedSelf"}, assumptions = {"cachedSelf.isEffectivelyFinalAssumption()"}, limit = "1")
         Object cached(@SuppressWarnings("unused") PCell self,
-                        @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                         @SuppressWarnings("unused") @Cached("self") PCell cachedSelf,
                         @Cached("self.getRef()") Object ref) {
             return ref;