Add POP_JUMP_IF_NONE, POP_JUMP_IF_NOT_NONE opcodes

This builds on top of python#25090
faster-cpython · Mar 31, 2021 · e8e979f · e8e979f
1 parent 195e532
commit e8e979f
Show file tree

Hide file tree

Showing 9 changed files with 4,654 additions and 4,625 deletions.
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
@@ -314,7 +314,8 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.10a2 3432 (Function annotation for MAKE_FUNCTION is changed from dict to tuple bpo-42202)
 #     Python 3.10a2 3433 (RERAISE restores f_lasti if oparg != 0)
 #     Python 3.10a6 3434 (PEP 634: Structural Pattern Matching)
-#     Python 3.10a7 3435 (super-instructions)
+#     Python 3.10a7 3435 (ADD_INT)
+#     Python 3.10a7 3436 (POP_JUMP_IF_NONE, POP_JUMP_IF_NOT_NONE)
 #
 # MAGIC must change whenever the bytecode emitted by the compiler may no
 # longer be understood by older implementations of the eval loop (usually
@@ -323,7 +324,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3435).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3436).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -172,6 +172,8 @@ def jabs_op(name, op):
 haslocal.append(125)
 def_op('DELETE_FAST', 126)      # Local variable number
 haslocal.append(126)
+jabs_op('POP_JUMP_IF_NONE', 127)
+jabs_op('POP_JUMP_IF_NOT_NONE', 128)
 
 def_op('RAISE_VARARGS', 130)    # Number of raise arguments (1, 2, or 3)
 def_op('CALL_FUNCTION', 131)    # #args

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3811,6 +3811,28 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
             DISPATCH();
         }
 
+        case TARGET(POP_JUMP_IF_NONE): {
+            PyObject *target = POP();
+            if (target == Py_None) {
+                Py_DECREF(target);
+                JUMPTO(oparg);
+                DISPATCH();
+            }
+            Py_DECREF(target);
+            DISPATCH();
+        }
+
+        case TARGET(POP_JUMP_IF_NOT_NONE): {
+            PyObject *target = POP();
+            if (target != Py_None) {
+                Py_DECREF(target);
+                JUMPTO(oparg);
+                DISPATCH();
+            }
+            Py_DECREF(target);
+            DISPATCH();
+        }
+
         case TARGET(JUMP_IF_FALSE_OR_POP): {
             PyObject *cond = TOP();
             int err;

diff --git a/Python/compile.c b/Python/compile.c
@@ -1059,6 +1059,8 @@ stack_effect(int opcode, int oparg, int jump)
 
         case POP_JUMP_IF_FALSE:
         case POP_JUMP_IF_TRUE:
+        case POP_JUMP_IF_NONE:
+        case POP_JUMP_IF_NOT_NONE:
             return -1;
 
         case LOAD_GLOBAL:
@@ -6847,7 +6849,7 @@ optimize_basic_block(basicblock *bb, PyObject *consts)
         }
         switch (inst->i_opcode) {
             /* Remove LOAD_CONST const; conditional jump */
-            /* Also optimize LOAD_CONST(small_int) + BINARY_ADD */
+            /* Also some other sequences starting with LOAD_CONST */
             case LOAD_CONST:
             {
                 PyObject* cnt;
@@ -6890,7 +6892,8 @@ optimize_basic_block(basicblock *bb, PyObject *consts)
                         break;
                     case BINARY_ADD:
                         cnt = PyList_GET_ITEM(consts, oparg);
-                        if (PyLong_CheckExact(cnt) && inst->i_lineno == bb->b_instr[i+1].i_lineno) {
+                        if (PyLong_CheckExact(cnt)
+                            && inst->i_lineno == bb->b_instr[i+1].i_lineno) {
                             int ovf = 0;
                             long val = PyLong_AsLongAndOverflow(cnt, &ovf);
                             // TODO: What about larger values?
@@ -6904,6 +6907,31 @@ optimize_basic_block(basicblock *bb, PyObject *consts)
                             }
                         }
                         break;
+                    case IS_OP:
+                        /* Look for LOAD_CONST(None), IS_OP, POP_JUMP_IF_XXX. */
+                        cnt = PyList_GET_ITEM(consts, oparg);
+                        if (cnt != Py_None
+                            || i+2 >= bb->b_iused
+                            || inst->i_lineno != bb->b_instr[i+1].i_lineno
+                            || inst->i_lineno != bb->b_instr[i+2].i_lineno)
+                        {
+                            break;
+                        }
+                        // IS_OP oparg is 0 for 'is', 1 for 'is not'
+                        int is_op_arg = bb->b_instr[i+1].i_oparg;
+                        int last_opcode = bb->b_instr[i+2].i_opcode;
+                        switch (last_opcode) {
+                        case POP_JUMP_IF_FALSE:
+                        case POP_JUMP_IF_TRUE:
+                            inst->i_opcode = NOP;
+                            bb->b_instr[i+1].i_opcode = NOP;
+                            bb->b_instr[i+2].i_opcode =
+                                is_op_arg ^ (last_opcode == POP_JUMP_IF_TRUE)
+                                ? POP_JUMP_IF_NONE
+                                : POP_JUMP_IF_NOT_NONE;
+                            break;
+                        }
+                        break;
                 }
                 break;
             }