gh-148235: remove duplicate uops _INSERT_1_LOAD_CONST_INLINE(_BORROW) in JIT

Author: NekoAsakura

Include/internal/pycore_uop_ids.h

@@ -1846,7 +1846,7 @@ def testfunc(n):
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertNotIn("_UNARY_INVERT", uops)
-        self.assertIn("_INSERT_1_LOAD_CONST_INLINE_BORROW", uops)
+        self.assertIn("_LOAD_CONST_INLINE_BORROW", uops)
 
     def test_compare_op_pop_two_load_const_inline_borrow(self):
         def testfunc(n):
@@ -4009,8 +4009,6 @@ class A:
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertNotIn("_REPLACE_WITH_TRUE", uops)
-        self.assertIn("_INSERT_1_LOAD_CONST_INLINE_BORROW", uops)
-        self.assertEqual(count_ops(ex, "_POP_TOP_NOP"), 1)
 
     def test_attr_promotion_failure(self):
         # We're not testing for any specific uops here, just

Include/internal/pycore_uop_metadata.h

@@ -5924,18 +5924,6 @@ dummy_func(
             value = PyStackRef_FromPyObjectBorrow(ptr);
         }
 
-        tier2 op(_INSERT_1_LOAD_CONST_INLINE, (ptr/4, left -- res, l)) {
-            res = PyStackRef_FromPyObjectNew(ptr);
-            l = left;
-            INPUTS_DEAD();
-        }
-
-        tier2 op(_INSERT_1_LOAD_CONST_INLINE_BORROW, (ptr/4, left -- res, l)) {
-            res = PyStackRef_FromPyObjectBorrow(ptr);
-            l = left;
-            INPUTS_DEAD();
-        }
-
         tier2 op(_INSERT_2_LOAD_CONST_INLINE_BORROW, (ptr/4, left, right -- res, l, r)) {
             res = PyStackRef_FromPyObjectBorrow(ptr);
             l = left;

Lib/test/test_capi/test_opt.py

@@ -177,9 +177,9 @@ convert_global_to_const(_PyUOpInstruction *inst, PyObject *obj, bool pop, bool i
     }
     if (insert) {
         if (_Py_IsImmortal(res)) {
-            inst->opcode = _INSERT_1_LOAD_CONST_INLINE_BORROW;
+            inst->opcode = _LOAD_CONST_UNDER_INLINE_BORROW;
         } else {
-            inst->opcode = _INSERT_1_LOAD_CONST_INLINE;
+            inst->opcode = _LOAD_CONST_UNDER_INLINE;
         }
     } else {
         if (_Py_IsImmortal(res)) {
@@ -341,7 +341,7 @@ optimize_to_bool(
     if (truthiness >= 0) {
         PyObject *load = truthiness ? Py_True : Py_False;
         int opcode = insert_mode ?
-            _INSERT_1_LOAD_CONST_INLINE_BORROW :
+            _LOAD_CONST_UNDER_INLINE_BORROW :
             _POP_TOP_LOAD_CONST_INLINE_BORROW;
         ADD_OP(opcode, 0, (uintptr_t)load);
         *result_ptr = sym_new_const(ctx, load);

Python/bytecodes.c

@@ -1610,7 +1610,7 @@ dummy_func(void) {
     }
 
     op(_REPLACE_WITH_TRUE, (value -- res, v)) {
-        ADD_OP(_INSERT_1_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)Py_True);
+        ADD_OP(_LOAD_CONST_UNDER_INLINE_BORROW, 0, (uintptr_t)Py_True);
         res = sym_new_const(ctx, Py_True);
         v = value;
     }

Python/executor_cases.c.h

@@ -242,7 +242,7 @@ def replace_opcode_if_evaluates_pure(
                     0: "_POP_TOP_LOAD_CONST_INLINE_BORROW",
                     # (left -- res, left)
                     # usually for unary ops with passthrough references
-                    1: "_INSERT_1_LOAD_CONST_INLINE_BORROW",
+                    1: "_LOAD_CONST_UNDER_INLINE_BORROW",
                 },
                 2: {
                     # (a. b -- res), usually for binary ops