Add _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW

python · brandtbucher · May 19, 2025 · May 19, 2025 · May 19, 2025 · May 19, 2025
commit 96236997a8d9f956c554ef81ab2988b3c2f9eb05
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
@@ -1955,9 +1955,10 @@ def testfunc(n):
        self.assertEqual(res, TIER2_THRESHOLD)
        self.assertIsNotNone(ex)
        uops = get_opnames(ex)
-        self.assertIn("_CALL_ISINSTANCE", uops)
+        self.assertNotIn("_CALL_ISINSTANCE", uops)
        self.assertNotIn("_GUARD_THIRD_NULL", uops)
        self.assertNotIn("_GUARD_CALLABLE_ISINSTANCE", uops)
+        self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)

    def test_call_isinstance_is_true(self):
        def testfunc(n):
@@ -1972,9 +1973,10 @@ def testfunc(n):
        self.assertEqual(res, TIER2_THRESHOLD)
        self.assertIsNotNone(ex)
        uops = get_opnames(ex)
-        self.assertIn("_CALL_ISINSTANCE", uops)
+        self.assertNotIn("_CALL_ISINSTANCE", uops)
        self.assertNotIn("_TO_BOOL_BOOL", uops)
        self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
+        self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)

    def test_call_isinstance_is_false(self):
        def testfunc(n):
@@ -1989,9 +1991,10 @@ def testfunc(n):
        self.assertEqual(res, TIER2_THRESHOLD)
        self.assertIsNotNone(ex)
        uops = get_opnames(ex)
-        self.assertIn("_CALL_ISINSTANCE", uops)
+        self.assertNotIn("_CALL_ISINSTANCE", uops)
        self.assertNotIn("_TO_BOOL_BOOL", uops)
        self.assertNotIn("_GUARD_IS_FALSE_POP", uops)
+        self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)

    def test_call_isinstance_subclass(self):
        def testfunc(n):
@@ -2006,9 +2009,10 @@ def testfunc(n):
        self.assertEqual(res, TIER2_THRESHOLD)
        self.assertIsNotNone(ex)
        uops = get_opnames(ex)
-        self.assertIn("_CALL_ISINSTANCE", uops)
+        self.assertNotIn("_CALL_ISINSTANCE", uops)
        self.assertNotIn("_TO_BOOL_BOOL", uops)
        self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
+        self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)

    def test_call_isinstance_unknown_object(self):
        def testfunc(n):

@@ -5327,6 +5327,14 @@ dummy_func(
            value = PyStackRef_FromPyObjectImmortal(ptr);
        }

+        tier2 pure op(_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, pop1, pop2 -- value)) {
+            PyStackRef_CLOSE(pop2);
+            PyStackRef_CLOSE(pop1);
+            PyStackRef_CLOSE(null);
+            PyStackRef_CLOSE(callable);
+            value = PyStackRef_FromPyObjectImmortal(ptr);
+        }
+
        tier2 op(_CHECK_FUNCTION, (func_version/2 -- )) {
            assert(PyStackRef_FunctionCheck(frame->f_funcobj));
            PyFunctionObject *func = (PyFunctionObject *)PyStackRef_AsPyObjectBorrow(frame->f_funcobj);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
@@ -550,6 +550,10 @@ dummy_func(void) {
        value = sym_new_const(ctx, ptr);
    }

+    op(_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, unused, unused, unused, unused -- value)) {
+        value = sym_new_const(ctx, ptr);
+    }
+
    op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
        assert(oparg > 0);
        top = bottom;
@@ -903,9 +907,11 @@ dummy_func(void) {
            // The below check is equivalent to PyObject_TypeCheck(inst, cls)
            if (inst_type == cls_o || PyType_IsSubtype(inst_type, cls_o)) {
                sym_set_const(res, Py_True);
+                REPLACE_OP(this_instr, _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)Py_True);
            }
            else {
                sym_set_const(res, Py_False);
+                REPLACE_OP(this_instr, _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)Py_False);
            }
        }
    }

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h