[SOT] Python version macro definition optimization (#69072)

gouzil · web-flow · commit b9ff39cad17e · 2024-10-31T18:00:50.000+08:00
diff --git a/paddle/fluid/pybind/sot/cpython_internals.c b/paddle/fluid/pybind/sot/cpython_internals.c
@@ -18,13 +18,13 @@ limitations under the License. */
 
 #if SOT_IS_SUPPORTED
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 #include <internal/pycore_code.h>
 #include <internal/pycore_frame.h>
 #define Py_BUILD_CORE       // internal/pycore_opcode.h need this macro
 #define NEED_OPCODE_TABLES  // To get _PyOpcode_Caches and _PyOpcode_Deopt
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
 // see https://github.com/python/cpython/issues/105268#issuecomment-1678256123
 #undef _PyGC_FINALIZED
 #include <internal/pycore_runtime.h>
@@ -53,7 +53,7 @@ static int Internal_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame,
   for (_Py_CODEUNIT *instruction = _PyCode_CODE(frame->f_code);
        instruction < frame->prev_instr;
        instruction++) {
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
     int check_opcode = _PyOpcode_Deopt[instruction->op.code];
     check_oparg |= instruction->op.arg;
 #else
@@ -73,7 +73,7 @@ static int Internal_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame,
   return 0;
 }
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
 void Internal_PyObject_VirtualFree(void *obj, size_t size) {
   Internal_PyObject_Arena.free(Internal_PyObject_Arena.ctx, obj, size);
 }
@@ -465,7 +465,7 @@ PyFrameObject *Internal_PyFrame_MakeAndSetFrameObject(
     _PyInterpreterFrame *frame) {
   assert(frame->frame_obj == NULL);
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   PyObject *exc = PyErr_GetRaisedException();
 #else
   PyObject *error_type, *error_value, *error_traceback;
@@ -474,7 +474,7 @@ PyFrameObject *Internal_PyFrame_MakeAndSetFrameObject(
 
   PyFrameObject *f = Internal_PyFrame_New_NoTrack(frame->f_code);
   if (f == NULL) {
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
     Py_XDECREF(exc);
 #else
     Py_XDECREF(error_type);
@@ -483,7 +483,7 @@ PyFrameObject *Internal_PyFrame_MakeAndSetFrameObject(
 #endif
     return NULL;
   }
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   PyErr_SetRaisedException(exc);
 #else
   PyErr_Restore(error_type, error_value, error_traceback);
@@ -525,7 +525,7 @@ static inline PyFrameObject *Internal_PyFrame_GetFrameObject(
 
 static void Internal_take_ownership(PyFrameObject *f,
                                     _PyInterpreterFrame *frame) {
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   assert(frame->owner != FRAME_OWNED_BY_CSTACK);
 #endif
 
@@ -534,7 +534,7 @@ static void Internal_take_ownership(PyFrameObject *f,
   Py_ssize_t size =
       ((char *)&frame->localsplus[frame->stacktop]) - (char *)frame;
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   Py_INCREF(frame->f_code);
 #endif
 
@@ -551,7 +551,7 @@ static void Internal_take_ownership(PyFrameObject *f,
   assert(!_PyFrame_IsIncomplete(frame));
   assert(f->f_back == NULL);
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   _PyInterpreterFrame *prev = _PyFrame_GetFirstComplete(frame->previous);
   frame->previous = NULL;
 #else
@@ -562,7 +562,7 @@ static void Internal_take_ownership(PyFrameObject *f,
 #endif
 
   if (prev) {
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
     assert(prev->owner != FRAME_OWNED_BY_CSTACK);
 #endif
     /* Link PyFrameObjects.f_back and remove link through
@@ -576,7 +576,7 @@ static void Internal_take_ownership(PyFrameObject *f,
     } else {
       f->f_back = (PyFrameObject *)Py_NewRef(back);
     }
-#if PY_VERSION_HEX < 0x030c0000
+#if PY_VERSION_HEX < PY_3_12_0_HEX
     frame->previous = NULL;
 #endif
   }
@@ -586,7 +586,7 @@ static void Internal_take_ownership(PyFrameObject *f,
 }
 
 // Call on 3.11 _PyFrame_Clear is called on 3.12+ _PyFrame_ClearExceptCode
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
 void Internal_PyFrame_ClearExceptCode(_PyInterpreterFrame *frame) {
 #else
 void Internal_PyFrame_Clear(_PyInterpreterFrame *frame) {
@@ -615,7 +615,7 @@ void Internal_PyFrame_Clear(_PyInterpreterFrame *frame) {
   Py_XDECREF(frame->frame_obj);
   Py_XDECREF(frame->f_locals);
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   Py_DECREF(frame->f_funcobj);
 #else
   Py_DECREF(frame->f_func);
diff --git a/paddle/fluid/pybind/sot/cpython_internals.h b/paddle/fluid/pybind/sot/cpython_internals.h
@@ -23,11 +23,11 @@ extern "C" {
 
 #if SOT_IS_SUPPORTED
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 #include <internal/pycore_frame.h>
 #endif
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 int Internal_PyInterpreterFrame_GetLine(_PyInterpreterFrame *frame);
 static int Internal_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame,
                                          int opcode,
@@ -42,7 +42,7 @@ static void Internal_take_ownership(PyFrameObject *f,
                                     _PyInterpreterFrame *frame);
 void Internal_PyFrame_Clear(_PyInterpreterFrame *frame);
 
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
 void Internal_PyEvalFrameClearAndPop(PyThreadState *tstate,
                                      _PyInterpreterFrame *frame);
 _PyInterpreterFrame *Internal_PyThreadState_PushFrame(PyThreadState *tstate,
diff --git a/paddle/fluid/pybind/sot/eval_frame.c b/paddle/fluid/pybind/sot/eval_frame.c
@@ -22,19 +22,19 @@ limitations under the License. */
 #include <Python.h>
 #include <frameobject.h>
 
-#if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x3090000
+#if PY_3_8_PLUS && PY_VERSION_HEX < PY_3_9_0_HEX
 #define Py_BUILD_CORE  // internal/pycore_pymem.h need this macro
 #include <internal/pycore_pystate.h>
 #undef Py_BUILD_CORE
 #endif
-#if PY_VERSION_HEX < 0x030b0000
+#if PY_VERSION_HEX < PY_3_11_0_HEX
 #include <code.h>
 #endif
 
 #include <object.h>
 #include <pystate.h>
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 // To avoid the error: undefined symbol: _PyFrame_GetFrameObject, all we need is
 // to redefine this function based source code in python3.11. The advantage is
 // that we don't need any modification in eval_frame functions.
@@ -146,7 +146,7 @@ inline static void eval_frame_callback_set(PyObject *obj) {
 inline static PyObject *eval_frame_default(PyThreadState *tstate,
                                            FrameObject *frame,
                                            int throw_flag) {
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_3_9_PLUS
   if (tstate == NULL) {
     tstate = PyThreadState_GET();
   }
@@ -156,15 +156,15 @@ inline static PyObject *eval_frame_default(PyThreadState *tstate,
 #endif
 }
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 
 inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
                                                     FrameObject *frame,
                                                     PyCodeObject *code,
                                                     int throw_flag) {
   Py_ssize_t nlocalsplus_new = code->co_nlocalsplus;
   Py_ssize_t nlocalsplus_old = frame->f_code->co_nlocalsplus;
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   int size = code->co_framesize;
 #else
   // Create a new PyInterpreterFrame. Refer to CALL.
@@ -173,7 +173,7 @@ inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
   int size = nlocalsplus_new + code->co_stacksize + FRAME_SPECIALS_SIZE;
 #endif
   CALL_STAT_INC(frames_pushed);
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   _PyInterpreterFrame *shadow = Internal_PyThreadState_PushFrame(tstate, size);
 #else
   _PyInterpreterFrame *shadow =
@@ -187,7 +187,7 @@ inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
   PyFunctionObject *func =
       (PyFunctionObject *)PyFunction_New((PyObject *)code, frame->f_globals);
   Py_INCREF(func);
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   Py_XINCREF(((PyFunctionObject *)frame->f_funcobj)->func_closure);
   func->func_closure = ((PyFunctionObject *)frame->f_funcobj)->func_closure;
   _PyFrame_Initialize(shadow, func, NULL, code, 0);
@@ -228,7 +228,7 @@ inline static PyObject *eval_custom_code_py311_plus(PyThreadState *tstate,
   }
 
   PyObject *result = eval_frame_default(tstate, shadow, throw_flag);
-#if PY_VERSION_HEX >= 0x030c0000
+#if PY_3_12_PLUS
   // In Python 3.12+ believes that eval will be cleaned up, but we did not pass
   // in the frame to _PyEval_EvalFrameDefault, so we need to clean it up.
   // elaborate on see:
@@ -290,7 +290,7 @@ inline static PyObject *eval_custom_code(PyThreadState *tstate,
                                          FrameObject *frame,
                                          PyCodeObject *code,
                                          int throw_flag) {
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
   return eval_custom_code_py311_plus(tstate, frame, code, throw_flag);
 #else
   return eval_custom_code_py310_minus(tstate, frame, code, throw_flag);
@@ -306,7 +306,7 @@ static PyObject *_custom_eval_frame(PyThreadState *tstate,
 
 // https://peps.python.org/pep-0558/#fast-locals-proxy-implementation-details
 // https://devguide.python.org/internals/interpreter/#all-sorts-of-variables
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
   if (frame->owner == FRAME_OWNED_BY_GENERATOR) {
     out = eval_frame_default(tstate, frame, throw_flag);
     eval_frame_callback_set(callback);
@@ -361,15 +361,15 @@ static PyObject *_custom_eval_frame(PyThreadState *tstate,
     disable_eval_frame = Py_False;
   } else {
     /* should calculate guards here if we want */
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
     PyObject *args = Py_BuildValue("(O)", PyInterpreterFrameProxy_New(frame));
 #else
     PyObject *args = Py_BuildValue("(O)", frame);
 #endif
     PyObject *result = PyObject_CallObject(callback, args);
     Py_DECREF(args);
     if (result == NULL) {
-#if PY_VERSION_HEX >= 0x030C0000
+#if PY_3_12_PLUS
       Internal_PyEvalFrameClearAndPop(tstate, frame);
 #endif
       return NULL;
@@ -426,7 +426,7 @@ static PyObject *_custom_eval_frame_shim(PyThreadState *tstate,
   return _custom_eval_frame(tstate, frame, throw_flag, callback);
 }
 
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_3_9_PLUS
 static PyObject *custom_eval_frame_shim(PyThreadState *tstate,
                                         FrameObject *frame,
                                         int throw_flag) {
@@ -446,7 +446,7 @@ static PyObject *set_eval_frame(PyObject *new_callback, PyThreadState *tstate) {
   //  NOTE: Cache is not supported now
   PyObject *old_callback = eval_frame_callback_get();
 
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_3_9_PLUS
   _PyFrameEvalFunction old_eval_frame =
       _PyInterpreterState_GetEvalFrameFunc(tstate->interp);
 #else
@@ -458,7 +458,7 @@ static PyObject *set_eval_frame(PyObject *new_callback, PyThreadState *tstate) {
   if (old_callback != Py_None && new_callback == Py_None) {
     if (old_eval_frame != &_PyEval_EvalFrameDefault) {
       // VLOG(7) << "set _PyEval_EvalFrameDefault";
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_3_9_PLUS
       _PyInterpreterState_SetEvalFrameFunc(tstate->interp,
                                            &_PyEval_EvalFrameDefault);
 #else
@@ -468,7 +468,7 @@ static PyObject *set_eval_frame(PyObject *new_callback, PyThreadState *tstate) {
   } else if (old_callback == Py_None && new_callback != Py_None) {
     if (old_eval_frame != &custom_eval_frame_shim) {
       // VLOG(7) << "set custom_eval_frame_shim";
-#if PY_VERSION_HEX >= 0x03090000
+#if PY_3_9_PLUS
       _PyInterpreterState_SetEvalFrameFunc(tstate->interp,
                                            &custom_eval_frame_shim);
 #else
@@ -499,7 +499,7 @@ PyMODINIT_FUNC PyInit__eval_frame() {
   Py_INCREF(Py_None);
   eval_frame_callback_set(Py_None);
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
   if (PyType_Ready(&PyInterpreterFrameProxyType) < 0) {
     // VLOG(7) << "PyInterpreterFrameProxyType has not been ready!";
   }
diff --git a/paddle/fluid/pybind/sot/eval_frame_tools.cc b/paddle/fluid/pybind/sot/eval_frame_tools.cc
@@ -220,7 +220,7 @@ int need_skip(FrameObject* frame) {
     return 0;
   }
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
   const char* filename = pystr_to_cstr(co_filename);
   PyObject* _filename = NULL;
   if (memcmp(filename, "<frozen", 7) == 0) {
@@ -235,7 +235,7 @@ int need_skip(FrameObject* frame) {
 
   int result = skip_info.in_skip_path(co_filename);
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
   if (_filename != NULL) Py_DECREF(_filename);
 #endif
   return result;
diff --git a/paddle/fluid/pybind/sot/eval_frame_tools.h b/paddle/fluid/pybind/sot/eval_frame_tools.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #if SOT_IS_SUPPORTED
 
-#if PY_VERSION_HEX >= 0x030b0000
+#if PY_3_11_PLUS
 #include <internal/pycore_frame.h>
 typedef _PyInterpreterFrame FrameObject;
 #else
diff --git a/paddle/fluid/pybind/sot/macros.h b/paddle/fluid/pybind/sot/macros.h
@@ -20,7 +20,21 @@ extern "C" {
 
 #include <Python.h>
 
-#define SOT_NOT_SUPPORTED_VERSION 0x030d0000
+#define PY_3_8_0_HEX 0x03080000
+#define PY_3_9_0_HEX 0x03090000
+#define PY_3_10_0_HEX 0x030A0000
+#define PY_3_11_0_HEX 0x030B0000
+#define PY_3_12_0_HEX 0x030C0000
+#define PY_3_13_0_HEX 0x030D0000
+
+#define PY_3_8_PLUS PY_VERSION_HEX >= PY_3_8_0_HEX
+#define PY_3_9_PLUS PY_VERSION_HEX >= PY_3_9_0_HEX
+#define PY_3_10_PLUS PY_VERSION_HEX >= PY_3_10_0_HEX
+#define PY_3_11_PLUS PY_VERSION_HEX >= PY_3_11_0_HEX
+#define PY_3_12_PLUS PY_VERSION_HEX >= PY_3_12_0_HEX
+#define PY_3_13_PLUS PY_VERSION_HEX >= PY_3_13_0_HEX
+
+#define SOT_NOT_SUPPORTED_VERSION PY_3_13_0_HEX
 #define SOT_IS_SUPPORTED PY_VERSION_HEX < SOT_NOT_SUPPORTED_VERSION
 
 #ifdef __cplusplus
