[GR-62791] Simplify CallDispatchNode

PullRequest: graalpython/3714

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_strptime.txt

@@ -35,7 +35,8 @@ test.test_strptime.StrptimeTests.test_percent @ darwin-arm64,darwin-x86_64,linux
 test.test_strptime.StrptimeTests.test_second @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_strptime.StrptimeTests.test_strptime_exception_context @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_strptime.StrptimeTests.test_time @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_strptime.StrptimeTests.test_timezone @ darwin-arm64,darwin-x86_64,win32-AMD64
+# Seems to be dependent on the actual time/date/timezone of the machine, at least on GraalPy. Needs investigation
+!test.test_strptime.StrptimeTests.test_timezone
 test.test_strptime.StrptimeTests.test_unconverteddata @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_strptime.StrptimeTests.test_year @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_strptime.TimeRETests.test_blankpattern @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -632,6 +632,10 @@ public RootCallTarget getRootCallTarget() {
         return callTarget;
     }
 
+    public RootCallTarget getRootCallTargetOrNull() {
+        return callTarget;
+    }
+
     @TruffleBoundary
     synchronized RootCallTarget initializeCallTarget() {
         assert PythonContext.get(null).ownsGil(); // otherwise this is racy

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -25,15 +25,11 @@
  */
 package com.oracle.graal.python.nodes.call;
 
-import com.oracle.graal.python.builtins.objects.code.CodeNodes.GetCodeCallTargetNode;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.nodes.builtins.FunctionNodes.GetCallTargetNode;
-import com.oracle.graal.python.nodes.builtins.FunctionNodes.GetFunctionCodeNode;
 import com.oracle.graal.python.runtime.PythonOptions;
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -46,6 +42,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 
 @ImportStatic(PythonOptions.class)
 @GenerateUncached
@@ -101,38 +98,25 @@ protected static Object callFunctionCached(VirtualFrame frame, @SuppressWarnings
         return invoke.execute(frame, arguments);
     }
 
-    // We only have a single context and this function changed its code before, but now it's
-    // constant
-    protected PCode getCode(Node inliningTarget, GetFunctionCodeNode getFunctionCodeNode, PFunction function) {
-        return getFunctionCodeNode.execute(inliningTarget, function);
-    }
-
-    @Specialization(guards = {"isSingleContext()", "callee == cachedCallee", "getCode(inliningTarget, getFunctionCodeNode, callee) == cachedCode"}, //
-                    replaces = "callFunctionCached", limit = "getCallSiteInlineCacheMaxDepth()")
-    protected static Object callFunctionCachedCode(VirtualFrame frame, @SuppressWarnings("unused") PFunction callee, Object[] arguments,
-                    @SuppressWarnings("unused") @Bind("this") Node inliningTarget,
-                    @SuppressWarnings("unused") @Cached("callee") PFunction cachedCallee,
-                    @SuppressWarnings("unused") @Cached GetFunctionCodeNode getFunctionCodeNode,
-                    @SuppressWarnings("unused") @Cached("getCode(inliningTarget, getFunctionCodeNode, callee)") PCode cachedCode,
-                    @Cached("createInvokeNode(cachedCallee)") FunctionInvokeNode invoke) {
-        return invoke.execute(frame, arguments);
-    }
-
-    protected static RootCallTarget getCallTargetUncached(PFunction callee) {
-        CompilerAsserts.neverPartOfCompilation();
-        return GetCallTargetNode.getUncached().execute(callee);
-    }
-
     // We have multiple contexts, don't cache the objects so that contexts can be cleaned up
-    @Specialization(guards = {"getCt.execute(inliningTarget, callee.getCode()) == ct"}, limit = "getCallSiteInlineCacheMaxDepth()", replaces = "callFunctionCachedCode")
+    @Specialization(guards = {"getCallTarget(inliningTarget, code, initializeCodeProfile) == ct"}, limit = "getCallSiteInlineCacheMaxDepth()", replaces = "callFunctionCached")
     protected static Object callFunctionCachedCt(VirtualFrame frame, PFunction callee, Object[] arguments,
                     @SuppressWarnings("unused") @Bind("this") Node inliningTarget,
-                    @SuppressWarnings("unused") @Cached("getCallTargetUncached(callee)") RootCallTarget ct,
-                    @SuppressWarnings("unused") @Cached GetCodeCallTargetNode getCt,
+                    @SuppressWarnings("unused") @Bind("callee.getCode()") PCode code,
+                    @SuppressWarnings("unused") @Cached InlinedBranchProfile initializeCodeProfile,
+                    @SuppressWarnings("unused") @Cached("code.getRootCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(callee)") CallTargetInvokeNode invoke) {
         return invoke.execute(frame, callee, callee.getGlobals(), callee.getClosure(), arguments);
     }
 
+    protected static RootCallTarget getCallTarget(Node inliningTarget, PCode code, InlinedBranchProfile initializeCodeProfile) {
+        if (code.getRootCallTargetOrNull() == null) {
+            initializeCodeProfile.enter(inliningTarget);
+            return code.getRootCallTarget();
+        }
+        return code.getRootCallTargetOrNull();
+    }
+
     @Specialization(guards = {"isSingleContext()", "callee == cachedCallee"}, limit = "getCallSiteInlineCacheMaxDepth()")
     protected static Object callBuiltinFunctionCached(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction callee, Object[] arguments,
                     @SuppressWarnings("unused") @Cached("callee") PBuiltinFunction cachedCallee,
@@ -147,7 +131,7 @@ protected static Object callBuiltinFunctionCachedCt(VirtualFrame frame, @Suppres
         return invoke.execute(frame, null, null, null, arguments);
     }
 
-    @Specialization(replaces = {"callFunctionCached", "callFunctionCachedCode", "callFunctionCachedCt"})
+    @Specialization(replaces = {"callFunctionCached", "callFunctionCachedCt"})
     @Megamorphic
     protected static Object callFunctionUncached(Frame frame, PFunction callee, Object[] arguments,
                     @Shared @Cached GenericInvokeNode invoke) {