[GR-12667] Nodes report polymorphism.

PullRequest: graalpython/301

Author: boris-spas

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "9a364f9b9ae34629919679b5edefb803ad27fbb7",
+  overlay: "3cf78c3623442ad827eed58a1780784a6eb95676",
 
   // ======================================================================================================
   // 

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

@@ -47,12 +47,14 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Shape;
 
 @ImportStatic({PGuards.class, PythonOptions.class})
+@ReportPolymorphism
 public abstract class ReadAttributeFromDynamicObjectNode extends ObjectAttributeNode {
     public static ReadAttributeFromDynamicObjectNode create() {
         return ReadAttributeFromDynamicObjectNodeGen.create();

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

@@ -47,6 +47,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.FinalLocationException;
@@ -55,6 +56,7 @@
 import com.oracle.truffle.api.object.Shape;
 
 @ImportStatic(PythonOptions.class)
+@ReportPolymorphism
 public abstract class WriteAttributeToDynamicObjectNode extends ObjectAttributeNode {
 
     public abstract boolean execute(Object primary, Object key, Object value);

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

@@ -37,11 +37,13 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 
 @ImportStatic(PythonOptions.class)
+@ReportPolymorphism
 public abstract class CallDispatchNode extends Node {
 
     protected static InvokeNode createInvokeNode(PythonCallable callee) {

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

@@ -214,7 +214,7 @@ public abstract class InvokeNode extends AbstractInvokeNode {
 
     protected InvokeNode(CallTarget callTarget, Arity calleeArity, PythonObject globals, PCell[] closure, boolean isBuiltin, boolean isGenerator) {
         this.callNode = Truffle.getRuntime().createDirectCallNode(callTarget);
-        if (isBuiltin) {
+        if (isBuiltin && PythonOptions.getEnableForcedSplits()) {
             callNode.cloneCallTarget();
         }
         if (isGenerator && shouldInlineGenerators()) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/CallSpecialMethodNode.java

@@ -52,11 +52,13 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.nodes.Node;
 
 @TypeSystemReference(PythonTypes.class)
 @ImportStatic(PythonOptions.class)
+@ReportPolymorphism
 abstract class CallSpecialMethodNode extends Node {
     /**
      * Returns a new instanceof the builtin if it's a subclass of the given class, and null

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonBuiltinBaseNode.java

@@ -48,9 +48,7 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.dsl.ImportStatic;
-import com.oracle.truffle.api.dsl.ReportPolymorphism;
 
-@ReportPolymorphism
 @ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, BuiltinNames.class, NativeConversions.class})
 public abstract class PythonBuiltinBaseNode extends PNodeWithContext {
 }

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

@@ -116,6 +116,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.DEBUG, help = "Minimal size of string, when lazy strings are used. Default 20") //
     public static final OptionKey<Integer> MinLazyStringLength = new OptionKey<>(20);
 
+    @Option(category = OptionCategory.EXPERT, help = "Enable forced splitting (of builtins). Default true.") //
+    public static final OptionKey<Boolean> EnableForcedSplits = new OptionKey<>(true);
+
     public static OptionDescriptors createDescriptors() {
         return new PythonOptionsOptionDescriptors();
     }
@@ -163,4 +166,8 @@ public static int getMinLazyStringLength() {
     public static boolean isWithThread() {
         return getOption(PythonLanguage.getContextRef().get(), WithThread);
     }
+
+    public static boolean getEnableForcedSplits() {
+        return getOption(PythonLanguage.getContextRef().get(), EnableForcedSplits);
+    }
 }

mx.graalpython/mx_graalpython.py

@@ -38,7 +38,7 @@
 from mx_gate import Task
 from mx_graalpython_bench_param import PATH_MESO, BENCHMARKS
 from mx_graalpython_benchmark import PythonBenchmarkSuite, python_vm_registry, CPythonVm, PyPyVm, GraalPythonVm, \
-    CONFIGURATION_DEFAULT
+    CONFIGURATION_DEFAULT, CONFIGURATION_EXPERIMENTAL_SPLITTING
 from mx_unittest import unittest
 
 SUITE = mx.suite('graalpython')
@@ -826,6 +826,10 @@ def _register_vms(namespace):
     python_vm_registry.add_vm(CPythonVm(CONFIGURATION_DEFAULT), SUITE)
     python_vm_registry.add_vm(PyPyVm(CONFIGURATION_DEFAULT), SUITE)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DEFAULT), SUITE, 10)
+    python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_EXPERIMENTAL_SPLITTING, extra_vm_args=[
+        '-Dgraal.TruffleExperimentalSplitting=true',
+        '-Dgraal.TruffleExperimentalSplittingAllowForcedSplits=false'
+    ]), SUITE, 10)
 
 
 def _register_bench_suites(namespace):

mx.graalpython/mx_graalpython_benchmark.py

@@ -54,6 +54,7 @@
 SUBGROUP_GRAAL_PYTHON = "graalpython"
 PYTHON_VM_REGISTRY_NAME = "Python"
 CONFIGURATION_DEFAULT = "default"
+CONFIGURATION_EXPERIMENTAL_SPLITTING = "experimental_splitting"
 
 DEFAULT_ITERATIONS = 10
 
@@ -186,12 +187,13 @@ def name(self):
 
 class GraalPythonVm(GuestVm):
     def __init__(self, config_name=CONFIGURATION_DEFAULT, distributions=None, cp_suffix=None, cp_prefix=None,
-                 host_vm=None):
+                 host_vm=None, extra_vm_args=None):
         super(GraalPythonVm, self).__init__(host_vm=host_vm)
         self._config_name = config_name
         self._distributions = distributions
         self._cp_suffix = cp_suffix
         self._cp_prefix = cp_prefix
+        self._extra_vm_args = extra_vm_args
 
     def hosting_registry(self):
         return java_vm_registry
@@ -215,6 +217,8 @@ def run(self, cwd, args):
                 dists.append('SULONG_MANAGED')
 
         vm_args = mx.get_runtime_jvm_args(dists, cp_suffix=self._cp_suffix, cp_prefix=self._cp_prefix)
+        if isinstance(self._extra_vm_args, list):
+            vm_args += self._extra_vm_args
         vm_args += [
             "-Dpython.home=%s" % join(SUITE.dir, "graalpython"),
             "com.oracle.graal.python.shell.GraalPythonMain"