[GR-21577] IsNode is slow, after adding check if it is executed in Jython emulation mode.

ppisl · ppisl · commit 2bfe6d19a9b4 · 2020-03-13T09:01:56.000Z
PullRequest: graalpython/837
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -48,6 +48,7 @@
 import com.oracle.graal.python.parser.PythonParserImpl;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.runtime.PythonEngineOptions;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -173,16 +174,7 @@ protected void finalizeContext(PythonContext context) {
 
     @Override
     protected boolean areOptionsCompatible(OptionValues firstOptions, OptionValues newOptions) {
-        // internal sources were marked during context initialization
-        return (firstOptions.get(PythonOptions.ExposeInternalSources).equals(newOptions.get(PythonOptions.ExposeInternalSources)) &&
-                        // we cache WithThread on the language
-                        firstOptions.get(PythonOptions.WithThread).equals(newOptions.get(PythonOptions.WithThread)) &&
-                        // we cache JythonEmulation on nodes
-                        firstOptions.get(PythonOptions.EmulateJython).equals(newOptions.get(PythonOptions.EmulateJython)) &&
-                        // we cache CatchAllExceptions hard on TryExceptNode
-                        firstOptions.get(PythonOptions.CatchAllExceptions).equals(newOptions.get(PythonOptions.CatchAllExceptions)) &&
-                        // we cache BuiltinsInliningMaxCallerSize on the language
-                        firstOptions.get(PythonOptions.BuiltinsInliningMaxCallerSize).equals(newOptions.get(PythonOptions.BuiltinsInliningMaxCallerSize)));
+        return PythonEngineOptions.fromOptionValues(firstOptions).equals(PythonEngineOptions.fromOptionValues(newOptions));
     }
 
     private boolean areOptionsCompatibleWithPreinitializedContext(OptionValues firstOptions, OptionValues newOptions) {
@@ -497,7 +489,7 @@ public static Source newSource(PythonContext ctxt, TruffleFile src, String name)
 
     private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) throws IOException {
         boolean coreIsInitialized = ctxt.getCore().isInitialized();
-        boolean internal = !coreIsInitialized && !PythonOptions.getOption(ctxt, PythonOptions.ExposeInternalSources);
+        boolean internal = !coreIsInitialized && !ctxt.areInternalSourcesExposed();
         if (internal) {
             srcBuilder.internal(true);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1107,7 +1107,7 @@ boolean isInstance(VirtualFrame frame, Object instance, PTuple clsTuple,
         protected boolean emulateJython() {
             if (emulateJython == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                emulateJython = PythonOptions.getFlag(getContext(), PythonOptions.EmulateJython);
+                emulateJython = getContext().isJythonEmulated();
             }
             return emulateJython;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -270,7 +270,7 @@ private void ensureCapiWasLoaded() {
                 Object capi = null;
                 try {
                     SourceBuilder capiSrcBuilder = Source.newBuilder(LLVM_LANGUAGE, capiFile);
-                    if (!PythonOptions.getOption(context, PythonOptions.ExposeInternalSources)) {
+                    if (!context.areInternalSourcesExposed()) {
                         capiSrcBuilder.internal(true);
                     }
                     capi = context.getEnv().parseInternal(capiSrcBuilder.build()).call();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -196,7 +196,7 @@ public void postInitialize(PythonCore core) {
             sys.setAttribute("executable", PythonOptions.getOption(context, PythonOptions.Executable));
             sys.setAttribute("graal_python_home", context.getLanguage().getHome());
         }
-        sys.setAttribute("graal_python_jython_emulation_enabled", PythonOptions.getOption(context, PythonOptions.EmulateJython));
+        sys.setAttribute("graal_python_jython_emulation_enabled", context.isJythonEmulated());
         sys.setAttribute("graal_python_host_import_enabled", context.getEnv().isHostLookupAllowed());
         sys.setAttribute("graal_python_core_home", coreHome);
         sys.setAttribute("graal_python_stdlib_home", stdlibHome);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallSpecialMethodNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallSpecialMethodNode.java
@@ -111,7 +111,7 @@ private <T extends PythonBuiltinBaseNode> boolean callerExceedsMaxSize(T builtin
             int n = root instanceof PRootNode ? ((PRootNode) root).getNodeCount() : NodeUtil.countNodes(root);
             // nb: option 'BuiltinsInliningMaxCallerSize' is defined as a compatible option, i.e.,
             // ASTs will only we shared between contexts that have the same value for this option.
-            int maxSize = PythonOptions.getOption(lookupContextReference(PythonLanguage.class).get(), PythonOptions.BuiltinsInliningMaxCallerSize);
+            int maxSize = lookupContextReference(PythonLanguage.class).get().getBuiltinsInliningMaxCallerSize();
             if (n >= maxSize || n + NodeUtil.countNodes(builtinNode) >= maxSize) {
                 maxSizeExceeded = true;
                 return true;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/IsExpressionNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/IsExpressionNode.java
@@ -51,7 +51,6 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
@@ -218,7 +217,7 @@ boolean doCode(PCode left, PCode right) {
         @Specialization
         boolean doObjectPNone(Object left, PNone right,
                         @Cached.Shared("ctxt") @CachedContext(PythonLanguage.class) PythonContext ctxt) {
-            if (PythonOptions.getFlag(ctxt, PythonOptions.EmulateJython) && ctxt.getEnv().isHostObject(left) && ctxt.getEnv().asHostObject(left) == null &&
+            if (ctxt.isJythonEmulated() && ctxt.getEnv().isHostObject(left) && ctxt.getEnv().asHostObject(left) == null &&
                             right == PNone.NONE) {
                 return true;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -52,9 +52,7 @@
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.object.GetDictNode;
-import com.oracle.graal.python.nodes.util.ExceptionStateNodes.PassCaughtExceptionNode;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -69,7 +67,6 @@ public abstract class AbstractImportNode extends StatementNode {
 
     @Child private CallNode callNode;
     @Child private GetDictNode getDictNode;
-    @Child private PassCaughtExceptionNode passExceptionNode;
     @CompilationFinal private Boolean emulateJython;
 
     public AbstractImportNode() {
@@ -156,7 +153,7 @@ Object __import__(VirtualFrame frame, String name, Object globals, String[] from
     protected boolean emulateJython() {
         if (emulateJython == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            emulateJython = PythonOptions.getFlag(getContext(), PythonOptions.EmulateJython);
+            emulateJython = getContext().isJythonEmulated();
         }
         return emulateJython;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java
@@ -66,7 +66,7 @@ public void executeVoid(VirtualFrame frame) {
         if (assertionsEnabled == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             PythonContext context = getContext();
-            javaExceptionsFailAssertions = PythonOptions.getOption(context, PythonOptions.CatchAllExceptions);
+            javaExceptionsFailAssertions = context.isCatchingAllExcetptionsEnabled();
             assertionsEnabled = !PythonOptions.getOption(context, PythonOptions.PythonOptimizeFlag);
         }
         if (assertionsEnabled) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -25,9 +25,6 @@
  */
 package com.oracle.graal.python.nodes.statement;
 
-import static com.oracle.graal.python.runtime.PythonOptions.CatchAllExceptions;
-import static com.oracle.graal.python.runtime.PythonOptions.EmulateJython;
-
 import java.util.ArrayList;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -47,7 +44,6 @@
 import com.oracle.graal.python.nodes.util.ExceptionStateNodes.RestoreExceptionStateNode;
 import com.oracle.graal.python.nodes.util.ExceptionStateNodes.SaveExceptionStateNode;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.ExceptionHandledException;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -130,7 +126,7 @@ public void executeVoid(VirtualFrame frame) {
         } catch (Exception e) {
             if (shouldCatchJavaExceptions == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                shouldCatchJavaExceptions = PythonOptions.getOption(getContext(), EmulateJython);
+                shouldCatchJavaExceptions = getContext().isJythonEmulated();
             }
             if (shouldCatchJavaExceptions && getContext().getEnv().isHostException(e)) {
                 if (catchException(frame, (TruffleException) e, exceptionState)) {
@@ -139,7 +135,7 @@ public void executeVoid(VirtualFrame frame) {
             }
             if (shouldCatchAll == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                shouldCatchAll = PythonOptions.getOption(getContext(), CatchAllExceptions);
+                shouldCatchAll = getContext().isCatchingAllExcetptionsEnabled();
             }
             if (shouldCatchAll) {
                 if (e instanceof ControlFlowException) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java
@@ -222,22 +222,19 @@ List<WeakReference<Thread>> getOwners() {
     // compat
     private final ThreadLocal<ArrayDeque<String>> currentImport = new ThreadLocal<>();
 
+    @CompilationFinal private PythonEngineOptions engineOptions;
+
     public PythonContext(PythonLanguage language, TruffleLanguage.Env env, PythonCore core) {
         this.language = language;
         this.core = core;
         this.env = env;
         this.resources = new PosixResources();
         this.handler = new AsyncHandler(language);
-        if (env == null) {
-            this.in = System.in;
-            this.out = System.out;
-            this.err = System.err;
-        } else {
-            this.resources.setEnv(env);
-            this.in = env.in();
-            this.out = env.out();
-            this.err = env.err();
-        }
+        this.engineOptions = PythonEngineOptions.fromOptionValues(env.getOptions());
+        this.resources.setEnv(env);
+        this.in = env.in();
+        this.out = env.out();
+        this.err = env.err();
     }
 
     public ThreadGroup getThreadGroup() {
@@ -293,6 +290,7 @@ public void setEnv(TruffleLanguage.Env newEnv) {
         out = env.out();
         err = env.err();
         resources.setEnv(env);
+        engineOptions = PythonEngineOptions.fromOptionValues(newEnv.getOptions());
     }
 
     /**
@@ -376,6 +374,22 @@ public void patch(Env newEnv) {
         core.postInitialize();
     }
 
+    public boolean isCatchingAllExcetptionsEnabled() {
+        return engineOptions.isCatchingAllExcetptionsEnabled();
+    }
+
+    public boolean areInternalSourcesExposed() {
+        return engineOptions.areInternalSourcesExposed();
+    }
+
+    public boolean isJythonEmulated() {
+        return engineOptions.isJythonEmulated();
+    }
+
+    public int getBuiltinsInliningMaxCallerSize() {
+        return engineOptions.getBuiltinsInliningMaxCallerSize();
+    }
+
     /**
      * During pre-initialization, we're also loading code from the Python standard library. Since
      * some of those modules may be packages, they will have their __path__ attribute set to the
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonEngineOptions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonEngineOptions.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2020, 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.runtime;
+
+import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import org.graalvm.options.OptionKey;
+import org.graalvm.options.OptionValues;
+
+public class PythonEngineOptions {
+    @CompilationFinal private OptionValues optionValues;
+
+    private final int builtinsInliningMaxCallerSize;
+    private final boolean catchAllExceptions;
+    private final boolean emulatedJython;
+    private final boolean exposeInternalSources;
+    private final boolean withThread;
+
+    PythonEngineOptions(OptionValues optionValues) {
+        CompilerAsserts.neverPartOfCompilation();
+        this.optionValues = optionValues;
+        this.builtinsInliningMaxCallerSize = readIntegerOption(PythonOptions.BuiltinsInliningMaxCallerSize);
+        this.catchAllExceptions = readBooleanOption(PythonOptions.CatchAllExceptions);
+        this.emulatedJython = readBooleanOption(PythonOptions.EmulateJython);
+        this.exposeInternalSources = readBooleanOption(PythonOptions.ExposeInternalSources);
+        this.withThread = readBooleanOption(PythonOptions.WithThread);
+    }
+
+    public static PythonEngineOptions fromOptionValues(OptionValues optionValues) {
+        return new PythonEngineOptions(optionValues);
+    }
+
+    private boolean readBooleanOption(OptionKey<Boolean> key) {
+        return key.getValue(optionValues);
+    }
+
+    private int readIntegerOption(OptionKey<Integer> key) {
+        return key.getValue(optionValues);
+    }
+
+    public boolean areInternalSourcesExposed() {
+        return this.exposeInternalSources;
+    }
+
+    public boolean isCatchingAllExcetptionsEnabled() {
+        return this.catchAllExceptions;
+    }
+
+    public boolean isJythonEmulated() {
+        return this.emulatedJython;
+    }
+
+    public boolean isWithThread() {
+        return this.withThread;
+    }
+
+    public int getBuiltinsInliningMaxCallerSize() {
+        return this.builtinsInliningMaxCallerSize;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 53 * hash + this.builtinsInliningMaxCallerSize;
+        hash = 53 * hash + (this.catchAllExceptions ? 1 : 0);
+        hash = 53 * hash + (this.emulatedJython ? 1 : 0);
+        hash = 53 * hash + (this.exposeInternalSources ? 1 : 0);
+        hash = 53 * hash + (this.withThread ? 1 : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final PythonEngineOptions other = (PythonEngineOptions) obj;
+        if (this.builtinsInliningMaxCallerSize != other.builtinsInliningMaxCallerSize) {
+            return false;
+        }
+        if (this.catchAllExceptions != other.catchAllExceptions) {
+            return false;
+        }
+        if (this.emulatedJython != other.emulatedJython) {
+            return false;
+        }
+        if (this.exposeInternalSources != other.exposeInternalSources) {
+            return false;
+        }
+        return this.withThread == other.withThread;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ boolean isInstance(VirtualFrame frame, Object instance, PTuple clsTuple,`
`1107`	`1107`	`protected boolean emulateJython() {`
`1108`	`1108`	`if (emulateJython == null) {`
`1109`	`1109`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`1110`		`- emulateJython = PythonOptions.getFlag(getContext(), PythonOptions.EmulateJython);`
	`1110`	`+ emulateJython = getContext().isJythonEmulated();`
`1111`	`1111`	`}`
`1112`	`1112`	`return emulateJython;`
`1113`	`1113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private void ensureCapiWasLoaded() {`
`270`	`270`	`Object capi = null;`
`271`	`271`	`try {`
`272`	`272`	`SourceBuilder capiSrcBuilder = Source.newBuilder(LLVM_LANGUAGE, capiFile);`
`273`		`- if (!PythonOptions.getOption(context, PythonOptions.ExposeInternalSources)) {`
	`273`	`+ if (!context.areInternalSourcesExposed()) {`
`274`	`274`	`capiSrcBuilder.internal(true);`
`275`	`275`	`}`
`276`	`276`	`capi = context.getEnv().parseInternal(capiSrcBuilder.build()).call();`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public void postInitialize(PythonCore core) {`
`196`	`196`	`sys.setAttribute("executable", PythonOptions.getOption(context, PythonOptions.Executable));`
`197`	`197`	`sys.setAttribute("graal_python_home", context.getLanguage().getHome());`
`198`	`198`	`}`
`199`		`- sys.setAttribute("graal_python_jython_emulation_enabled", PythonOptions.getOption(context, PythonOptions.EmulateJython));`
	`199`	`+ sys.setAttribute("graal_python_jython_emulation_enabled", context.isJythonEmulated());`
`200`	`200`	`sys.setAttribute("graal_python_host_import_enabled", context.getEnv().isHostLookupAllowed());`
`201`	`201`	`sys.setAttribute("graal_python_core_home", coreHome);`
`202`	`202`	`sys.setAttribute("graal_python_stdlib_home", stdlibHome);`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void executeVoid(VirtualFrame frame) {`
`66`	`66`	`if (assertionsEnabled == null) {`
`67`	`67`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`68`	`68`	`PythonContext context = getContext();`
`69`		`- javaExceptionsFailAssertions = PythonOptions.getOption(context, PythonOptions.CatchAllExceptions);`
	`69`	`+ javaExceptionsFailAssertions = context.isCatchingAllExcetptionsEnabled();`
`70`	`70`	`assertionsEnabled = !PythonOptions.getOption(context, PythonOptions.PythonOptimizeFlag);`
`71`	`71`	`}`
`72`	`72`	`if (assertionsEnabled) {`