Build time option to override uncached interpreter limit

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -441,6 +441,9 @@ public void setMetadata(BytecodeDSLCodeUnit co, ParserCallbacksImpl parserErrorC
         }
         instrumentationDataIndex = co.instrumentationDataIndex;
         yieldFromGeneratorIndex = co.yieldFromGeneratorIndex;
+        if (PythonOptions.UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT != -1) {
+            getBytecodeNode().setUncachedThreshold(PythonOptions.UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT);
+        }
     }
 
     @Override

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

@@ -88,6 +88,9 @@ public final class PythonOptions {
      * bytecode interpreter.
      */
     public static final boolean ENABLE_BYTECODE_DSL_INTERPRETER;
+    public static final int UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT;
+    private static final OptionType<TruffleString> TS_OPTION_TYPE = new OptionType<>("graal.python.TruffleString", PythonUtils::toTruffleStringUncached);
+
     static {
         String prop = System.getProperty("python.EnableBytecodeDSLInterpreter");
         if (prop != null) {
@@ -104,9 +107,18 @@ public final class PythonOptions {
         } else {
             ENABLE_BYTECODE_DSL_INTERPRETER = true;
         }
-    }
 
-    private static final OptionType<TruffleString> TS_OPTION_TYPE = new OptionType<>("graal.python.TruffleString", PythonUtils::toTruffleStringUncached);
+        if (Boolean.getBoolean("python.ForceUncachedInterpreter")) {
+            UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT = Integer.MIN_VALUE;
+        } else {
+            String uncachedLimitStr = System.getProperty("python.UncachedInterpreterLimit");
+            if (uncachedLimitStr != null) {
+                UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT = Integer.parseInt(uncachedLimitStr);
+            } else {
+                UNCACHED_BYTECODE_DSL_INTERPRETER_LIMIT = -1;
+            }
+        }
+    }
 
     private PythonOptions() {
         // no instances

mx.graalpython/mx_graalpython.py

@@ -284,6 +284,10 @@ def github_ci_build_args():
 def libpythonvm_build_args():
     build_args = bytecode_dsl_build_args()
 
+    if limit := os.environ.get('GRAALPY_UncachedInterpreterLimit'):
+        mx.log(f"Uncached interpreter limit explicitly set to {limit}")
+        build_args += [f'-Dpython.UncachedInterpreterLimit={limit}']
+
     if os.environ.get("GITHUB_CI"):
         build_args += github_ci_build_args()