reduce diff

Co-Authored-By: Jules <57632293+JuliaPoo@users.noreply.github.com> Co-Authored-By: Guido van Rossum <gvanrossum@users.noreply.github.com>
Fidget-Spinner · Feb 13, 2024 · Feb 6, 2024 · Feb 6, 2024 · Feb 6, 2024 · Feb 6, 2024
commit e8a8b78962999874510863ae92bf80686f9563c5
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
@@ -16,21 +16,21 @@ extern const char * const _PyOpcode_uop_name[MAX_UOP_ID+1];
 
 #ifdef NEED_OPCODE_METADATA
 const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
-    [_NOP] = HAS_PURE_FLAG,
+    [_NOP] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_RESUME_CHECK] = HAS_DEOPT_FLAG,
     [_LOAD_FAST_CHECK] = HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_ERROR_FLAG,
-    [_LOAD_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_PURE_FLAG,
+    [_LOAD_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_LOAD_FAST_AND_CLEAR] = HAS_ARG_FLAG | HAS_LOCAL_FLAG,
     [_LOAD_FAST_LOAD_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG,
-    [_LOAD_CONST] = HAS_ARG_FLAG | HAS_CONST_FLAG | HAS_PURE_FLAG,
+    [_LOAD_CONST] = HAS_ARG_FLAG | HAS_CONST_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_STORE_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG,
     [_STORE_FAST_LOAD_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG,
     [_STORE_FAST_STORE_FAST] = HAS_ARG_FLAG | HAS_LOCAL_FLAG,
-    [_POP_TOP] = HAS_PURE_FLAG,
-    [_PUSH_NULL] = HAS_PURE_FLAG,
-    [_END_SEND] = HAS_PURE_FLAG,
+    [_POP_TOP] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_PUSH_NULL] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_END_SEND] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_UNARY_NEGATIVE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
-    [_UNARY_NOT] = HAS_PURE_FLAG,
+    [_UNARY_NOT] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_TO_BOOL] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_TO_BOOL_BOOL] = HAS_DEOPT_FLAG,
     [_TO_BOOL_INT] = HAS_DEOPT_FLAG,
@@ -40,15 +40,15 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_TO_BOOL_ALWAYS_TRUE] = HAS_DEOPT_FLAG,
     [_UNARY_INVERT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_GUARD_BOTH_INT] = HAS_DEOPT_FLAG,
-    [_BINARY_OP_MULTIPLY_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
-    [_BINARY_OP_ADD_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
-    [_BINARY_OP_SUBTRACT_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
+    [_BINARY_OP_MULTIPLY_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_BINARY_OP_ADD_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_BINARY_OP_SUBTRACT_INT] = HAS_ERROR_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_GUARD_BOTH_FLOAT] = HAS_DEOPT_FLAG,
-    [_BINARY_OP_MULTIPLY_FLOAT] = HAS_PURE_FLAG,
-    [_BINARY_OP_ADD_FLOAT] = HAS_PURE_FLAG,
-    [_BINARY_OP_SUBTRACT_FLOAT] = HAS_PURE_FLAG,
+    [_BINARY_OP_MULTIPLY_FLOAT] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_BINARY_OP_ADD_FLOAT] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_BINARY_OP_SUBTRACT_FLOAT] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_GUARD_BOTH_UNICODE] = HAS_DEOPT_FLAG,
-    [_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
+    [_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_BINARY_SUBSCR] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_BINARY_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@@ -168,7 +168,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_CHECK_PEP_523] = HAS_DEOPT_FLAG,
     [_CHECK_FUNCTION_EXACT_ARGS] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
     [_CHECK_STACK_SPACE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
-    [_INIT_CALL_PY_EXACT_ARGS] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
+    [_INIT_CALL_PY_EXACT_ARGS] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_PUSH_FRAME] = HAS_ESCAPES_FLAG,
     [_CALL_TYPE_1] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
     [_CALL_STR_1] = HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@@ -190,9 +190,9 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_CONVERT_VALUE] = HAS_ARG_FLAG | HAS_ERROR_FLAG,
     [_FORMAT_SIMPLE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_FORMAT_WITH_SPEC] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
-    [_COPY] = HAS_ARG_FLAG | HAS_PURE_FLAG,
+    [_COPY] = HAS_ARG_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_BINARY_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG,
-    [_SWAP] = HAS_ARG_FLAG | HAS_PURE_FLAG,
+    [_SWAP] = HAS_ARG_FLAG | HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_GUARD_IS_TRUE_POP] = HAS_DEOPT_FLAG,
     [_GUARD_IS_FALSE_POP] = HAS_DEOPT_FLAG,
     [_GUARD_IS_NONE_POP] = HAS_DEOPT_FLAG,
@@ -204,10 +204,10 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_JUMP_ABSOLUTE] = HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG,
     [_JUMP_ABSOLUTE_HEADER] = 0,
     [_CHECK_VALIDITY] = HAS_DEOPT_FLAG,
-    [_LOAD_CONST_INLINE] = HAS_PURE_FLAG,
-    [_LOAD_CONST_INLINE_BORROW] = HAS_PURE_FLAG,
-    [_LOAD_CONST_INLINE_WITH_NULL] = HAS_PURE_FLAG,
-    [_LOAD_CONST_INLINE_BORROW_WITH_NULL] = HAS_PURE_FLAG,
+    [_LOAD_CONST_INLINE] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_LOAD_CONST_INLINE_BORROW] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_LOAD_CONST_INLINE_WITH_NULL] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
+    [_LOAD_CONST_INLINE_BORROW_WITH_NULL] = HAS_PURE_FLAG | HAS_PASSTHROUGH_FLAG,
     [_CHECK_GLOBALS] = HAS_DEOPT_FLAG,
     [_CHECK_BUILTINS] = HAS_DEOPT_FLAG,
     [_INTERNAL_INCREMENT_OPT_COUNTER] = 0,

@@ -222,26 +222,8 @@ static PyMethodDef executor_methods[] = {
 ///////////////////// Experimental UOp Optimizer /////////////////////
 
 
-static void
-clear_strong_refs_in_uops(_PyUOpInstruction *trace, Py_ssize_t uop_len)
-{
-    for (Py_ssize_t i = 0; i < uop_len; i++) {
-        if (trace[i].opcode == _LOAD_CONST_INLINE ||
-            trace[i].opcode == _LOAD_CONST_INLINE_WITH_NULL) {
-            PyObject *c = (PyObject*)trace[i].operand;
-            Py_CLEAR(c);
-        }
-        if (trace[i].opcode == _JUMP_ABSOLUTE ||
-            trace[i].opcode == _JUMP_TO_TOP ||
-            trace[i].opcode == _EXIT_TRACE) {
-            return;
-        }
-    }
-}
-
 static void
 uop_dealloc(_PyExecutorObject *self) {
-    clear_strong_refs_in_uops(&self->trace[0], Py_SIZE(self));
     _Py_ExecutorClear(self);
 #ifdef _Py_JIT
     _PyJIT_Free(self);

@@ -884,9 +884,8 @@ uop_abstract_interpret(
     while (curr < end && !op_is_end(curr->opcode)) {
 
         if (!(_PyUop_Flags[curr->opcode] & HAS_PURE_FLAG) &&
-            !(_PyUop_Flags[curr->opcode] & HAS_SPECIAL_OPT_FLAG) &&
             !op_is_bookkeeping(curr->opcode) &&
-            !(_PyUop_Flags[curr->opcode] & HAS_GUARD_FLAG)) {
+            !(_PyUop_Flags[curr->opcode] & HAS_PASSTHROUGH_FLAG)) {
             DPRINTF(3, "Impure %s\n", _PyOpcode_uop_name[curr->opcode]);
             if (needs_clear_locals) {
                 if (clear_locals_type_info(&ctx) < 0) {

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1252,7 +1252,7 @@ init_interp_main(PyThreadState *tstate)
         if (_Py_get_xoption(&config->xoptions, L"uops") != NULL) {
             enabled = 1;
         }
-        // enabled = 1; // TEMPORARY: always enable
+        enabled = 1; // TEMPORARY: always enable
         if (enabled) {
 #else
         // Always enable tier two for JIT builds (ignoring the environment

diff --git a/Python/tier2_redundancy_eliminator_bytecodes.c b/Python/tier2_redundancy_eliminator_bytecodes.c
@@ -8,30 +8,6 @@ typedef struct _Py_UOpsSymType _Py_UOpsSymType;
 typedef struct _Py_UOpsAbstractInterpContext _Py_UOpsAbstractInterpContext;
 typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
 
-extern _Py_UOpsSymType *get_local(_Py_UOpsAbstractFrame *frame, int index);
-extern void set_local(_Py_UOpsAbstractFrame *frame, int index, _Py_UOpsSymType *value);
-
-extern _Py_UOpsSymType *new_constant(PyObject *k, _Py_UOpsAbstractInterpContext *ctx);
-extern _Py_UOpsSymType *new_null(_Py_UOpsAbstractInterpContext *ctx);
-extern PyObject *get_constant(_Py_UOpsSymType *o);
-extern PyTypeObject *get_type(_Py_UOpsSymType *o);
-
-extern int is_constant(_Py_UOpsSymType *o);
-extern int is_int(_Py_UOpsSymType *o);
-extern int is_bool(_Py_UOpsSymType *o);
-extern int is_float(_Py_UOpsSymType *o);
-
-extern int is_not_none(_Py_UOpsSymType *o);
-extern int is_none(_Py_UOpsSymType *o);
-
-extern _Py_UOpsSymType *new_unknown(_Py_UOpsAbstractInterpContext *ctx);
-
-extern void promote_to_const(_Py_UOpsSymType *o, PyObject *k);
-extern void promote_to_type(_Py_UOpsSymType *o, PyTypeObject *t);
-
-extern SpecializerSpace *initialize_space(void *memory, int size);
-
-
 static int
 dummy_func(void) {
 
@@ -46,8 +22,8 @@ dummy_func(void) {
     _Py_UOpsSymType *top;
     _Py_UOpsSymType *bottom;
     _Py_UOpsAbstractFrame *frame;
-    SpecializerSpace *space;
-    _PyUOpInstruction *this_instr;
+    _Py_UOpsAbstractInterpContext *ctx;
+    _PyUOpInstruction *inst;
     _PyBloomFilter *dependencies;
     int modified;
 

diff --git a/Tools/cases_generator/generators_common.py b/Tools/cases_generator/generators_common.py
@@ -211,6 +211,8 @@ def cflags(p: Properties) -> str:
         flags.append("HAS_ESCAPES_FLAG")
     if p.pure:
         flags.append("HAS_PURE_FLAG")
+    if p.pure:
+        flags.append("HAS_PASSTHROUGH_FLAG")
     if flags:
         return " | ".join(flags)
     else:

diff --git a/Tools/cases_generator/opcode_metadata_generator.py b/Tools/cases_generator/opcode_metadata_generator.py
@@ -51,8 +51,7 @@
     "ERROR",
     "ESCAPES",
     "PURE",
-    "GUARD",
-    "SPECIAL_OPT",
+    "PASSTHROUGH",
 ]
 
 

diff --git a/Tools/cases_generator/uop_metadata_generator.py b/Tools/cases_generator/uop_metadata_generator.py
@@ -39,6 +39,7 @@ def generate_names_and_flags(analysis: Analysis, out: CWriter) -> None:
     out.emit("};\n")
     out.emit("#endif // NEED_OPCODE_METADATA\n\n")
 
+
 def generate_uop_metadata(
     filenames: list[str], analysis: Analysis, outfile: TextIO
 ) -> None: