[SOT][3.14] fix func_closure lose、fix CALL_FUNCTION_EX kwargs_variable is NullVariable、add MF.MF_HAS_ANNOTATE、add LOAD_COMMON_CONSTANT opcode (#76451)

Author: gouzil

paddle/fluid/pybind/sot/cpython_internals.c

@@ -817,6 +817,15 @@ void Internal_PyFrame_ClearLocals(_PyInterpreterFrame *frame) {
 }
 #endif
 
+#if PY_3_14_PLUS
+static inline PyGenObject *_PyGen_GetGeneratorFromFrame(
+    _PyInterpreterFrame *frame) {
+  assert(frame->owner == FRAME_OWNED_BY_GENERATOR);
+  size_t offset_in_gen = offsetof(PyGenObject, gi_iframe);
+  return (PyGenObject *)(((char *)frame) - offset_in_gen);
+}
+#endif
+
 // Call on 3.11 _PyFrame_Clear is called on 3.12+ _PyFrame_ClearExceptCode
 #if PY_3_12_PLUS
 void Internal_PyFrame_ClearExceptCode(_PyInterpreterFrame *frame) {
@@ -825,8 +834,13 @@ void Internal_PyFrame_Clear(_PyInterpreterFrame *frame) {
 #endif
   /* It is the responsibility of the owning generator/coroutine
    * to have cleared the enclosing generator, if any. */
+#if PY_3_14_PLUS
+  assert(frame->owner != FRAME_OWNED_BY_GENERATOR ||
+         _PyGen_GetGeneratorFromFrame(frame)->gi_frame_state == FRAME_CLEARED);
+#else
   assert(frame->owner != FRAME_OWNED_BY_GENERATOR ||
          _PyFrame_GetGenerator(frame)->gi_frame_state == FRAME_CLEARED);
+#endif
   // GH-99729: Clearing this frame can expose the stack (via finalizers). It's
   // crucial that this frame has been unlinked, and is no longer visible:
 #if PY_3_13_PLUS

paddle/fluid/pybind/sot/eval_frame.c

@@ -102,9 +102,9 @@ inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
   Py_INCREF(func);
 
 #if PY_3_14_PLUS
-  func->func_closure =
+  func->func_closure = Py_XNewRef(
       ((PyFunctionObject *)PyStackRef_AsPyObjectBorrow((frame)->f_funcobj))
-          ->func_closure;
+          ->func_closure);
   _PyStackRef func_stackref = PyStackRef_FromPyObjectSteal((PyObject *)func);
   _PyFrame_Initialize(
       tstate, shadow, func_stackref, NULL, code, 0, frame->previous);
@@ -151,7 +151,12 @@ inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
       continue;
     }
 #if PY_3_14_PLUS
-    fastlocals_new[PyLong_AsSize_t(index)] = PyStackRef_DUP(fastlocals_old[i]);
+    if (PyStackRef_IsNull(fastlocals_old[i])) {
+      fastlocals_new[PyLong_AsSize_t(index)] = PyStackRef_NULL;
+    } else {
+      fastlocals_new[PyLong_AsSize_t(index)] =
+          PyStackRef_DUP(fastlocals_old[i]);
+    }
 #else
     Py_XINCREF(fastlocals_old[i]);
     fastlocals_new[PyLong_AsSize_t(index)] = fastlocals_old[i];

python/paddle/jit/sot/opcode_translator/executor/instr_flag.py

@@ -32,7 +32,9 @@ class CONVERT_VALUE_FLAG:
     CV_ASCII = 3
 
 
+# https://github.com/python/cpython/blob/3.14/Include/internal/pycore_opcode_utils.h#L63-L68
 class MAKE_FUNCTION_FLAG:
+    MF_HAS_ANNOTATE = 0x10
     MF_HAS_CLOSURE = 0x08
     MF_HAS_ANNOTATION = 0x04
     MF_HAS_KWDEFAULTS = 0x02
@@ -57,3 +59,14 @@ class IntrinsicsUnaryFunctions(Enum):
     INTRINSIC_TYPEVARTUPLE = 9  # no support, PEP 695
     INTRINSIC_SUBSCRIPT_GENERIC = 10  # no support, PEP 695
     INTRINSIC_TYPEALIAS = 11  # no support, PEP 695
+
+
+# https://github.com/python/cpython/blob/3.14/Include/internal/pycore_opcode_utils.h#L70-L76
+# All are attributes of 'builtins'
+LOAD_COMMON_CONSTANT_FLAG = (
+    "AssertionError",
+    "NotImplementedError",
+    "tuple",
+    "all",
+    "any",
+)

python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py

@@ -75,6 +75,7 @@
     CALL_FUNCTION_EX_FLAG as CFE,
     CONVERT_VALUE_FLAG as CV,
     FORMAT_VALUE_FLAG as FV,
+    LOAD_COMMON_CONSTANT_FLAG as LCC,
     MAKE_FUNCTION_FLAG as MF,
     IntrinsicsUnaryFunctions,
 )
@@ -965,6 +966,11 @@ def LOAD_CONST(self, instr: Instruction):
         var = self.vframe.consts[instr.arg]
         self.stack.push(var)
 
+    def LOAD_COMMON_CONSTANT(self, instr: Instruction):
+        assert isinstance(instr.arg, int)
+        const_var = self.vframe.builtins[LCC[instr.arg]]
+        self.stack.push(const_var)
+
     def MAKE_CELL(self, instr: Instruction):
         self.vframe.locals[instr.argval] = self.vframe.cells[instr.argval]
 
@@ -1395,8 +1401,12 @@ def CALL_FUNCTION_KW(self, instr: Instruction):
     @call_break_graph_decorator(push_n=1)
     def CALL_FUNCTION_EX(self, instr: Instruction):
         flag = instr.arg
-        if flag & CFE.CFE_HAS_KWARGS:
+        if sys.version_info >= (3, 14) or flag & CFE.CFE_HAS_KWARGS:
             kwargs_variable = self.stack.pop()
+            if isinstance(kwargs_variable, NullVariable):
+                kwargs_variable = DictVariable(
+                    {}, self._graph, DummyTracker([])
+                )
             assert isinstance(kwargs_variable, DictVariable)
             kwargs = kwargs_variable.get_wrapped_items()
         else:
@@ -1599,7 +1609,7 @@ def attach_new_attribute(self, flag, related_list):
         else:
             closure = ()
 
-        if flag & MF.MF_HAS_ANNOTATION:
+        if flag & MF.MF_HAS_ANNOTATION or flag & MF.MF_HAS_ANNOTATE:
             # can not set annotation in python env, skip it
             related_list.append(self.stack.pop())
 

python/paddle/jit/sot/opcode_translator/executor/pycode_generator.py

@@ -813,6 +813,8 @@ def gen_subscribe(self):
         return self.add_instr("BINARY_OP", arg=BINARY_OP_ARG_MAP["NB_SUBSCR"])
 
     def gen_build_tuple(self, count):
+        if sys.version_info >= (3, 14) and count == 0:
+            return self.gen_load_const(())
         return self.add_instr("BUILD_TUPLE", arg=count, argval=count)
 
     def gen_build_list(self, count):

python/paddle/jit/sot/opcode_translator/instruction_utils/opcode_info.py

@@ -29,7 +29,7 @@
 if sys.version_info >= (3, 11):
     UNCONDITIONAL_JUMP.add("JUMP_BACKWARD")
 RETURN = {"RETURN_VALUE"}
-if sys.version_info >= (3, 12):
+if (3, 12) <= sys.version_info < (3, 14):
     RETURN.add("RETURN_CONST")
 
 

test/sot/test_24_exceptions.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import sys
 import unittest
 
 from test_case_base import (
@@ -961,9 +962,13 @@ def foo_mod(x):
             0,
         )
         self.assert_results(foo_mod, 10)
+        if sys.version_info >= (3, 14):
+            zero_mod_msg = "division by zero"
+        else:
+            zero_mod_msg = "integer (.)*modulo by zero"
         self.assert_exceptions(
             ZeroDivisionError,
-            "integer (.)*modulo by zero",
+            zero_mod_msg,
             foo_mod,
             0,
         )