tweak inlining options for generator inlining and lookup in MRO cache, replace PIC when we go large

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java

@@ -43,12 +43,15 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PBaseNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 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.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
+@ImportStatic(PythonOptions.class)
 public abstract class LookupAttributeInMRONode extends PBaseNode {
 
     public abstract static class Dynamic extends PBaseNode {
@@ -132,7 +135,7 @@ protected PythonClassAssumptionPair findAttrClassAndAssumptionInMRO(PythonClass
         return new PythonClassAssumptionPair(attrAssumption, PNone.NO_VALUE);
     }
 
-    @Specialization(guards = {"klass == cachedKlass"}, limit = "5", assumptions = {"cachedClassInMROInfo.assumption"})
+    @Specialization(guards = {"klass == cachedKlass"}, limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", assumptions = {"cachedClassInMROInfo.assumption"})
     protected Object lookupConstantMROCached(@SuppressWarnings("unused") PythonClass klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonClass cachedKlass,
                     @Cached("findAttrClassAndAssumptionInMRO(cachedKlass)") PythonClassAssumptionPair cachedClassInMROInfo) {
@@ -147,7 +150,7 @@ protected ReadAttributeFromObjectNode[] create(int size) {
         return nodes;
     }
 
-    @Specialization(guards = {"klass == cachedKlass", "mroLength < 32"}, limit = "5", assumptions = "lookupStable")
+    @Specialization(guards = {"klass == cachedKlass", "mroLength < 32"}, limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", assumptions = "lookupStable")
     @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.FULL_EXPLODE_UNTIL_RETURN)
     protected Object lookupConstantMRO(@SuppressWarnings("unused") PythonClass klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonClass cachedKlass,
@@ -165,7 +168,7 @@ protected Object lookupConstantMRO(@SuppressWarnings("unused") PythonClass klass
         return PNone.NO_VALUE;
     }
 
-    @Specialization
+    @Specialization(replaces = {"lookupConstantMROCached", "lookupConstantMRO"})
     protected Object lookup(PythonClass klass,
                     @Cached("create()") ReadAttributeFromObjectNode readAttrNode) {
         return lookupSlow(klass, key, readAttrNode);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.function.Arity;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -41,6 +42,7 @@
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.argument.ApplyKeywordsNode;
 import com.oracle.graal.python.nodes.argument.ArityCheckNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -59,6 +61,10 @@ abstract class AbstractInvokeNode extends Node {
 
     private final ConditionProfile needsFrameProfile = ConditionProfile.createBinaryProfile();
 
+    protected static boolean shouldInlineGenerators() {
+        return PythonOptions.getOption(PythonLanguage.getContextRef().get(), PythonOptions.ForceInlineGeneratorCalls);
+    }
+
     @TruffleBoundary
     protected static RootCallTarget getCallTarget(PythonCallable callee) {
         RootCallTarget callTarget;
@@ -151,7 +157,7 @@ protected CallTargetInvokeNode(CallTarget callTarget, boolean isBuiltin, boolean
         if (isBuiltin) {
             callNode.cloneCallTarget();
         }
-        if (isGenerator) {
+        if (isGenerator && shouldInlineGenerators()) {
             this.callNode.forceInlining();
         }
         this.isBuiltin = isBuiltin;
@@ -209,7 +215,7 @@ protected InvokeNode(CallTarget callTarget, Arity calleeArity, PythonObject glob
         if (isBuiltin) {
             callNode.cloneCallTarget();
         }
-        if (isGenerator) {
+        if (isGenerator && shouldInlineGenerators()) {
             this.callNode.forceInlining();
         }
         this.arity = calleeArity;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -50,10 +50,10 @@ private PythonOptions() {
     public static final OptionKey<Boolean> IntrinsifyBuiltinCalls = new OptionKey<>(true);
 
     @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Integer> AttributeAccessInlineCacheMaxDepth = new OptionKey<>(4);
+    public static final OptionKey<Integer> AttributeAccessInlineCacheMaxDepth = new OptionKey<>(3);
 
     @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Integer> CallSiteInlineCacheMaxDepth = new OptionKey<>(4);
+    public static final OptionKey<Integer> CallSiteInlineCacheMaxDepth = new OptionKey<>(3);
 
     @Option(category = OptionCategory.DEBUG, help = "") //
     public static final OptionKey<Integer> VariableArgumentReadUnrollingLimit = new OptionKey<>(5);
@@ -62,7 +62,7 @@ private PythonOptions() {
     public static final OptionKey<Integer> VariableArgumentInlineCacheLimit = new OptionKey<>(3);
 
     @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Boolean> InlineGeneratorCalls = new OptionKey<>(true);
+    public static final OptionKey<Boolean> ForceInlineGeneratorCalls = new OptionKey<>(false);
 
     @Option(category = OptionCategory.DEBUG, help = "") //
     public static final OptionKey<Boolean> CatchGraalPythonExceptionForUnitTesting = new OptionKey<>(false);