Test optimize_load_fast as part of OptimizeCfg

Author: mpage

Include/internal/pycore_flowgraph.h

@@ -41,9 +41,6 @@ PyAPI_FUNC(PyObject*) _PyCompile_OptimizeCfg(
         PyObject *consts,
         int nlocals);
 
-// Export for '_testinternalcapi' shared extension
-PyAPI_FUNC(PyObject*) _PyCompile_OptimizeLoadFast(PyObject *instructions);
-
 #ifdef __cplusplus
 }
 #endif

Lib/test/test_peepholer.py

@@ -2435,9 +2435,9 @@ def test_list_to_tuple_get_iter(self):
         ]
         expected_insts = [
             ("BUILD_LIST", 0, 1),
-            ("LOAD_FAST", 0, 2),
+            ("LOAD_FAST_BORROW", 0, 2),
             ("LIST_EXTEND", 1, 3),
-            ("LOAD_FAST", 1, 4),
+            ("LOAD_FAST_BORROW", 1, 4),
             ("LIST_EXTEND", 1, 5),
             ("NOP", None, 6),  # ("CALL_INTRINSIC_1", INTRINSIC_LIST_TO_TUPLE, 6),
             ("GET_ITER", None, 7),
@@ -2463,15 +2463,24 @@ def test_list_to_tuple_get_iter_is_safe(self):
         self.assertEqual(items, [])
 
 
-@unittest.skipIf(_testinternalcapi is None, "requires _testinternalcapi")
-class OptimizeLoadFastTestCase(CompilationStepTestCase):
-    def check(self, insts, expected_insts):
-        self.check_instructions(insts)
-        self.check_instructions(expected_insts)
-        seq = self.seq_from_insts(insts)
-        opt_insts = _testinternalcapi.optimize_load_fast(seq)
-        expected_insts = self.seq_from_insts(expected_insts).get_instructions()
-        self.assertInstructionsMatch(opt_insts, expected_insts)
+class OptimizeLoadFastTestCase(DirectCfgOptimizerTests):
+    def make_bb(self, insts):
+        last_loc = insts[-1][2]
+        maxconst = 0
+        for op, arg, _ in insts:
+            if op == "LOAD_CONST":
+                maxconst = max(maxconst, arg)
+        consts = [None for _ in range(maxconst + 1)]
+        return insts + [
+            ("LOAD_CONST", 0, last_loc + 1),
+            ("RETURN_VALUE", None, last_loc + 2),
+        ], consts
+
+    def check(self, insts, expected_insts, consts=None):
+        insts_bb, insts_consts = self.make_bb(insts)
+        expected_insts_bb, exp_consts = self.make_bb(expected_insts)
+        self.cfg_optimization_test(insts_bb, expected_insts_bb,
+                                   consts=insts_consts, expected_consts=exp_consts)
 
     def test_optimized(self):
         insts = [
@@ -2518,7 +2527,12 @@ def test_unoptimized_if_unconsumed(self):
             ("COPY", 1, 2),
             ("POP_TOP", None, 3),
         ]
-        self.check(insts, insts)
+        expected = [
+            ("LOAD_FAST", 0, 1),
+            ("NOP", None, 2),
+            ("NOP", None, 3),
+        ]
+        self.check(insts, expected)
 
     def test_unoptimized_if_support_killed(self):
         insts = [

Modules/_testinternalcapi.c

@@ -751,23 +751,6 @@ _testinternalcapi_optimize_cfg_impl(PyObject *module, PyObject *instructions,
     return _PyCompile_OptimizeCfg(instructions, consts, nlocals);
 }
 
-/*[clinic input]
-
-_testinternalcapi.optimize_load_fast -> object
-
-  instructions: object
-
-Optimize LOAD_FAST{_LOAD_FAST} instructions.
-[clinic start generated code]*/
-
-static PyObject *
-_testinternalcapi_optimize_load_fast_impl(PyObject *module,
-                                          PyObject *instructions)
-/*[clinic end generated code: output=6f975349c976d017 input=c59f3eac68308c01]*/
-{
-    return _PyCompile_OptimizeLoadFast(instructions);
-}
-
 static int
 get_nonnegative_int_from_dict(PyObject *dict, const char *key) {
     PyObject *obj = PyDict_GetItemString(dict, key);
@@ -2043,7 +2026,6 @@ static PyMethodDef module_functions[] = {
     _TESTINTERNALCAPI_NEW_INSTRUCTION_SEQUENCE_METHODDEF
     _TESTINTERNALCAPI_COMPILER_CODEGEN_METHODDEF
     _TESTINTERNALCAPI_OPTIMIZE_CFG_METHODDEF
-    _TESTINTERNALCAPI_OPTIMIZE_LOAD_FAST_METHODDEF
     _TESTINTERNALCAPI_ASSEMBLE_CODE_OBJECT_METHODDEF
     {"get_interp_settings", get_interp_settings, METH_VARARGS, NULL},
     {"clear_extension", clear_extension, METH_VARARGS, NULL},

Modules/clinic/_testinternalcapi.c.h

@@ -2717,7 +2717,7 @@ load_fast_push_block(basicblock ***sp, basicblock *target,
  *
  * 2. Locals live until they are either killed by an instruction
  *    (e.g. STORE_FAST) or the frame is unwound. Any local that is overwritten
- *    via `f_locals` is added to a list owned by the frame object.
+ *    via `f_locals` is added to a tuple owned by the frame object.
  *
  * To simplify the problem of detecting which supporting references in the
  * frame are killed by instructions that overwrite locals, we only allow
@@ -3965,38 +3965,18 @@ _PyCompile_OptimizeCfg(PyObject *seq, PyObject *consts, int nlocals)
                                 nparams, firstlineno) < 0) {
         goto error;
     }
-    res = cfg_to_instruction_sequence(g);
-error:
-    Py_DECREF(const_cache);
-    _PyCfgBuilder_Free(g);
-    return res;
-}
-
-PyObject *
-_PyCompile_OptimizeLoadFast(PyObject *seq)
-{
-    if (!_PyInstructionSequence_Check(seq)) {
-        PyErr_SetString(PyExc_ValueError, "expected an instruction sequence");
-        return NULL;
-    }
-
-    cfg_builder *g =
-        _PyCfg_FromInstructionSequence((_PyInstructionSequence *)seq);
-    if (g == NULL) {
-        return NULL;
-    }
 
     if (calculate_stackdepth(g) == ERROR) {
-        _PyCfgBuilder_Free(g);
-        return NULL;
+        goto error;
     }
 
     if (optimize_load_fast(g) != SUCCESS) {
-        _PyCfgBuilder_Free(g);
-        return NULL;
+        goto error;
     }
 
-    PyObject *res = cfg_to_instruction_sequence(g);
+    res = cfg_to_instruction_sequence(g);
+error:
+    Py_DECREF(const_cache);
     _PyCfgBuilder_Free(g);
     return res;
 }