mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
GH-131798: Optimize away isinstance calls in the JIT (GH-134369)
This commit is contained in:
parent
fade146cfb
commit
484e00379b
9 changed files with 312 additions and 61 deletions
91
Include/internal/pycore_uop_ids.h
generated
91
Include/internal/pycore_uop_ids.h
generated
|
@ -265,75 +265,80 @@ extern "C" {
|
|||
#define _MONITOR_JUMP_BACKWARD 483
|
||||
#define _MONITOR_RESUME 484
|
||||
#define _NOP NOP
|
||||
#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 485
|
||||
#define _POP_CALL 485
|
||||
#define _POP_CALL_LOAD_CONST_INLINE_BORROW 486
|
||||
#define _POP_CALL_ONE 487
|
||||
#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 488
|
||||
#define _POP_CALL_TWO 489
|
||||
#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 490
|
||||
#define _POP_EXCEPT POP_EXCEPT
|
||||
#define _POP_JUMP_IF_FALSE 486
|
||||
#define _POP_JUMP_IF_TRUE 487
|
||||
#define _POP_JUMP_IF_FALSE 491
|
||||
#define _POP_JUMP_IF_TRUE 492
|
||||
#define _POP_TOP POP_TOP
|
||||
#define _POP_TOP_LOAD_CONST_INLINE 488
|
||||
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 489
|
||||
#define _POP_TWO 490
|
||||
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 491
|
||||
#define _POP_TOP_LOAD_CONST_INLINE 493
|
||||
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 494
|
||||
#define _POP_TWO 495
|
||||
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 496
|
||||
#define _PUSH_EXC_INFO PUSH_EXC_INFO
|
||||
#define _PUSH_FRAME 492
|
||||
#define _PUSH_FRAME 497
|
||||
#define _PUSH_NULL PUSH_NULL
|
||||
#define _PUSH_NULL_CONDITIONAL 493
|
||||
#define _PY_FRAME_GENERAL 494
|
||||
#define _PY_FRAME_KW 495
|
||||
#define _QUICKEN_RESUME 496
|
||||
#define _REPLACE_WITH_TRUE 497
|
||||
#define _PUSH_NULL_CONDITIONAL 498
|
||||
#define _PY_FRAME_GENERAL 499
|
||||
#define _PY_FRAME_KW 500
|
||||
#define _QUICKEN_RESUME 501
|
||||
#define _REPLACE_WITH_TRUE 502
|
||||
#define _RESUME_CHECK RESUME_CHECK
|
||||
#define _RETURN_GENERATOR RETURN_GENERATOR
|
||||
#define _RETURN_VALUE RETURN_VALUE
|
||||
#define _SAVE_RETURN_OFFSET 498
|
||||
#define _SEND 499
|
||||
#define _SEND_GEN_FRAME 500
|
||||
#define _SAVE_RETURN_OFFSET 503
|
||||
#define _SEND 504
|
||||
#define _SEND_GEN_FRAME 505
|
||||
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
|
||||
#define _SET_ADD SET_ADD
|
||||
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
|
||||
#define _SET_UPDATE SET_UPDATE
|
||||
#define _START_EXECUTOR 501
|
||||
#define _STORE_ATTR 502
|
||||
#define _STORE_ATTR_INSTANCE_VALUE 503
|
||||
#define _STORE_ATTR_SLOT 504
|
||||
#define _STORE_ATTR_WITH_HINT 505
|
||||
#define _START_EXECUTOR 506
|
||||
#define _STORE_ATTR 507
|
||||
#define _STORE_ATTR_INSTANCE_VALUE 508
|
||||
#define _STORE_ATTR_SLOT 509
|
||||
#define _STORE_ATTR_WITH_HINT 510
|
||||
#define _STORE_DEREF STORE_DEREF
|
||||
#define _STORE_FAST 506
|
||||
#define _STORE_FAST_0 507
|
||||
#define _STORE_FAST_1 508
|
||||
#define _STORE_FAST_2 509
|
||||
#define _STORE_FAST_3 510
|
||||
#define _STORE_FAST_4 511
|
||||
#define _STORE_FAST_5 512
|
||||
#define _STORE_FAST_6 513
|
||||
#define _STORE_FAST_7 514
|
||||
#define _STORE_FAST 511
|
||||
#define _STORE_FAST_0 512
|
||||
#define _STORE_FAST_1 513
|
||||
#define _STORE_FAST_2 514
|
||||
#define _STORE_FAST_3 515
|
||||
#define _STORE_FAST_4 516
|
||||
#define _STORE_FAST_5 517
|
||||
#define _STORE_FAST_6 518
|
||||
#define _STORE_FAST_7 519
|
||||
#define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST
|
||||
#define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST
|
||||
#define _STORE_GLOBAL STORE_GLOBAL
|
||||
#define _STORE_NAME STORE_NAME
|
||||
#define _STORE_SLICE 515
|
||||
#define _STORE_SUBSCR 516
|
||||
#define _STORE_SUBSCR_DICT 517
|
||||
#define _STORE_SUBSCR_LIST_INT 518
|
||||
#define _STORE_SLICE 520
|
||||
#define _STORE_SUBSCR 521
|
||||
#define _STORE_SUBSCR_DICT 522
|
||||
#define _STORE_SUBSCR_LIST_INT 523
|
||||
#define _SWAP SWAP
|
||||
#define _TIER2_RESUME_CHECK 519
|
||||
#define _TO_BOOL 520
|
||||
#define _TIER2_RESUME_CHECK 524
|
||||
#define _TO_BOOL 525
|
||||
#define _TO_BOOL_BOOL TO_BOOL_BOOL
|
||||
#define _TO_BOOL_INT TO_BOOL_INT
|
||||
#define _TO_BOOL_LIST 521
|
||||
#define _TO_BOOL_LIST 526
|
||||
#define _TO_BOOL_NONE TO_BOOL_NONE
|
||||
#define _TO_BOOL_STR 522
|
||||
#define _TO_BOOL_STR 527
|
||||
#define _UNARY_INVERT UNARY_INVERT
|
||||
#define _UNARY_NEGATIVE UNARY_NEGATIVE
|
||||
#define _UNARY_NOT UNARY_NOT
|
||||
#define _UNPACK_EX UNPACK_EX
|
||||
#define _UNPACK_SEQUENCE 523
|
||||
#define _UNPACK_SEQUENCE_LIST 524
|
||||
#define _UNPACK_SEQUENCE_TUPLE 525
|
||||
#define _UNPACK_SEQUENCE_TWO_TUPLE 526
|
||||
#define _UNPACK_SEQUENCE 528
|
||||
#define _UNPACK_SEQUENCE_LIST 529
|
||||
#define _UNPACK_SEQUENCE_TUPLE 530
|
||||
#define _UNPACK_SEQUENCE_TWO_TUPLE 531
|
||||
#define _WITH_EXCEPT_START WITH_EXCEPT_START
|
||||
#define _YIELD_VALUE YIELD_VALUE
|
||||
#define MAX_UOP_ID 526
|
||||
#define MAX_UOP_ID 531
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
26
Include/internal/pycore_uop_metadata.h
generated
26
Include/internal/pycore_uop_metadata.h
generated
|
@ -303,9 +303,14 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
|
|||
[_LOAD_CONST_INLINE] = HAS_PURE_FLAG,
|
||||
[_POP_TOP_LOAD_CONST_INLINE] = HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
|
||||
[_LOAD_CONST_INLINE_BORROW] = HAS_PURE_FLAG,
|
||||
[_POP_TOP_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
|
||||
[_POP_TWO_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
|
||||
[_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
|
||||
[_POP_CALL] = HAS_ESCAPES_FLAG,
|
||||
[_POP_CALL_ONE] = HAS_ESCAPES_FLAG,
|
||||
[_POP_CALL_TWO] = HAS_ESCAPES_FLAG,
|
||||
[_POP_TOP_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG,
|
||||
[_POP_TWO_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG,
|
||||
[_POP_CALL_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG,
|
||||
[_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG,
|
||||
[_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW] = HAS_ESCAPES_FLAG,
|
||||
[_LOAD_CONST_UNDER_INLINE] = 0,
|
||||
[_LOAD_CONST_UNDER_INLINE_BORROW] = 0,
|
||||
[_CHECK_FUNCTION] = HAS_DEOPT_FLAG,
|
||||
|
@ -557,6 +562,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
|
|||
[_MAYBE_EXPAND_METHOD] = "_MAYBE_EXPAND_METHOD",
|
||||
[_MAYBE_EXPAND_METHOD_KW] = "_MAYBE_EXPAND_METHOD_KW",
|
||||
[_NOP] = "_NOP",
|
||||
[_POP_CALL] = "_POP_CALL",
|
||||
[_POP_CALL_LOAD_CONST_INLINE_BORROW] = "_POP_CALL_LOAD_CONST_INLINE_BORROW",
|
||||
[_POP_CALL_ONE] = "_POP_CALL_ONE",
|
||||
[_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW] = "_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW",
|
||||
[_POP_CALL_TWO] = "_POP_CALL_TWO",
|
||||
[_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW] = "_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW",
|
||||
[_POP_EXCEPT] = "_POP_EXCEPT",
|
||||
[_POP_TOP] = "_POP_TOP",
|
||||
|
@ -1194,10 +1204,20 @@ int _PyUop_num_popped(int opcode, int oparg)
|
|||
return 1;
|
||||
case _LOAD_CONST_INLINE_BORROW:
|
||||
return 0;
|
||||
case _POP_CALL:
|
||||
return 2;
|
||||
case _POP_CALL_ONE:
|
||||
return 3;
|
||||
case _POP_CALL_TWO:
|
||||
return 4;
|
||||
case _POP_TOP_LOAD_CONST_INLINE_BORROW:
|
||||
return 1;
|
||||
case _POP_TWO_LOAD_CONST_INLINE_BORROW:
|
||||
return 2;
|
||||
case _POP_CALL_LOAD_CONST_INLINE_BORROW:
|
||||
return 2;
|
||||
case _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW:
|
||||
return 3;
|
||||
case _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW:
|
||||
return 4;
|
||||
case _LOAD_CONST_UNDER_INLINE:
|
||||
|
|
|
@ -2002,7 +2002,10 @@ class TestUopsOptimization(unittest.TestCase):
|
|||
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)
|
||||
self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)
|
||||
|
||||
def test_call_list_append(self):
|
||||
def testfunc(n):
|
||||
|
@ -2035,7 +2038,10 @@ class TestUopsOptimization(unittest.TestCase):
|
|||
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)
|
||||
self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)
|
||||
|
||||
def test_call_isinstance_is_false(self):
|
||||
def testfunc(n):
|
||||
|
@ -2053,7 +2059,10 @@ class TestUopsOptimization(unittest.TestCase):
|
|||
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)
|
||||
self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)
|
||||
|
||||
def test_call_isinstance_subclass(self):
|
||||
def testfunc(n):
|
||||
|
@ -2071,7 +2080,10 @@ class TestUopsOptimization(unittest.TestCase):
|
|||
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)
|
||||
self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW", uops)
|
||||
self.assertNotIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops)
|
||||
|
||||
def test_call_isinstance_unknown_object(self):
|
||||
def testfunc(n):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Optimize ``_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW``.
|
|
@ -5287,18 +5287,54 @@ dummy_func(
|
|||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
}
|
||||
|
||||
tier2 pure op (_POP_TOP_LOAD_CONST_INLINE_BORROW, (ptr/4, pop -- value)) {
|
||||
tier2 op(_POP_CALL, (callable, null --)) {
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
DEAD(null);
|
||||
PyStackRef_CLOSE(callable);
|
||||
}
|
||||
|
||||
tier2 op(_POP_CALL_ONE, (callable, null, pop --)) {
|
||||
PyStackRef_CLOSE(pop);
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
DEAD(null);
|
||||
PyStackRef_CLOSE(callable);
|
||||
}
|
||||
|
||||
tier2 op(_POP_CALL_TWO, (callable, null, pop1, pop2 --)) {
|
||||
PyStackRef_CLOSE(pop2);
|
||||
PyStackRef_CLOSE(pop1);
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
DEAD(null);
|
||||
PyStackRef_CLOSE(callable);
|
||||
}
|
||||
|
||||
tier2 op(_POP_TOP_LOAD_CONST_INLINE_BORROW, (ptr/4, pop -- value)) {
|
||||
PyStackRef_CLOSE(pop);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
}
|
||||
|
||||
tier2 pure op(_POP_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, pop1, pop2 -- value)) {
|
||||
tier2 op(_POP_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, pop1, pop2 -- value)) {
|
||||
PyStackRef_CLOSE(pop2);
|
||||
PyStackRef_CLOSE(pop1);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
}
|
||||
|
||||
tier2 pure op(_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, pop1, pop2 -- value)) {
|
||||
tier2 op(_POP_CALL_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null -- value)) {
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
DEAD(null);
|
||||
PyStackRef_CLOSE(callable);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
}
|
||||
|
||||
tier2 op(_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, pop -- value)) {
|
||||
PyStackRef_CLOSE(pop);
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
DEAD(null);
|
||||
PyStackRef_CLOSE(callable);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
}
|
||||
|
||||
tier2 op(_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, pop1, pop2 -- value)) {
|
||||
PyStackRef_CLOSE(pop2);
|
||||
PyStackRef_CLOSE(pop1);
|
||||
(void)null; // Silence compiler warnings about unused variables
|
||||
|
|
110
Python/executor_cases.c.h
generated
110
Python/executor_cases.c.h
generated
|
@ -7030,6 +7030,69 @@
|
|||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL: {
|
||||
_PyStackRef null;
|
||||
_PyStackRef callable;
|
||||
null = stack_pointer[-1];
|
||||
callable = stack_pointer[-2];
|
||||
(void)null;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(callable);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_ONE: {
|
||||
_PyStackRef pop;
|
||||
_PyStackRef null;
|
||||
_PyStackRef callable;
|
||||
pop = stack_pointer[-1];
|
||||
null = stack_pointer[-2];
|
||||
callable = stack_pointer[-3];
|
||||
stack_pointer += -1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(pop);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
(void)null;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(callable);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_TWO: {
|
||||
_PyStackRef pop2;
|
||||
_PyStackRef pop1;
|
||||
_PyStackRef null;
|
||||
_PyStackRef callable;
|
||||
pop2 = stack_pointer[-1];
|
||||
pop1 = stack_pointer[-2];
|
||||
null = stack_pointer[-3];
|
||||
callable = stack_pointer[-4];
|
||||
stack_pointer += -1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(pop2);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
stack_pointer += -1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(pop1);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
(void)null;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(callable);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_TOP_LOAD_CONST_INLINE_BORROW: {
|
||||
_PyStackRef pop;
|
||||
_PyStackRef value;
|
||||
|
@ -7071,6 +7134,53 @@
|
|||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_LOAD_CONST_INLINE_BORROW: {
|
||||
_PyStackRef null;
|
||||
_PyStackRef callable;
|
||||
_PyStackRef value;
|
||||
null = stack_pointer[-1];
|
||||
callable = stack_pointer[-2];
|
||||
PyObject *ptr = (PyObject *)CURRENT_OPERAND0();
|
||||
(void)null;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(callable);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
stack_pointer[0] = value;
|
||||
stack_pointer += 1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW: {
|
||||
_PyStackRef pop;
|
||||
_PyStackRef null;
|
||||
_PyStackRef callable;
|
||||
_PyStackRef value;
|
||||
pop = stack_pointer[-1];
|
||||
null = stack_pointer[-2];
|
||||
callable = stack_pointer[-3];
|
||||
PyObject *ptr = (PyObject *)CURRENT_OPERAND0();
|
||||
stack_pointer += -1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(pop);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
(void)null;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyStackRef_CLOSE(callable);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
value = PyStackRef_FromPyObjectBorrow(ptr);
|
||||
stack_pointer[0] = value;
|
||||
stack_pointer += 1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW: {
|
||||
_PyStackRef pop2;
|
||||
_PyStackRef pop1;
|
||||
|
|
|
@ -552,11 +552,13 @@ const uint16_t op_without_push[MAX_UOP_ID + 1] = {
|
|||
[_POP_TOP_LOAD_CONST_INLINE] = _POP_TOP,
|
||||
[_POP_TOP_LOAD_CONST_INLINE_BORROW] = _POP_TOP,
|
||||
[_POP_TWO_LOAD_CONST_INLINE_BORROW] = _POP_TWO,
|
||||
[_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW] = _POP_CALL_TWO,
|
||||
};
|
||||
|
||||
const bool op_skip[MAX_UOP_ID + 1] = {
|
||||
[_NOP] = true,
|
||||
[_CHECK_VALIDITY] = true,
|
||||
[_SET_IP] = true,
|
||||
};
|
||||
|
||||
const uint16_t op_without_pop[MAX_UOP_ID + 1] = {
|
||||
|
@ -565,6 +567,15 @@ const uint16_t op_without_pop[MAX_UOP_ID + 1] = {
|
|||
[_POP_TOP_LOAD_CONST_INLINE_BORROW] = _LOAD_CONST_INLINE_BORROW,
|
||||
[_POP_TWO] = _POP_TOP,
|
||||
[_POP_TWO_LOAD_CONST_INLINE_BORROW] = _POP_TOP_LOAD_CONST_INLINE_BORROW,
|
||||
[_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW] = _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW,
|
||||
[_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW] = _POP_CALL_LOAD_CONST_INLINE_BORROW,
|
||||
[_POP_CALL_TWO] = _POP_CALL_ONE,
|
||||
[_POP_CALL_ONE] = _POP_CALL,
|
||||
};
|
||||
|
||||
const uint16_t op_without_pop_null[MAX_UOP_ID + 1] = {
|
||||
[_POP_CALL] = _POP_TOP,
|
||||
[_POP_CALL_LOAD_CONST_INLINE_BORROW] = _POP_TOP_LOAD_CONST_INLINE_BORROW,
|
||||
};
|
||||
|
||||
|
||||
|
@ -601,19 +612,29 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)
|
|||
// _LOAD_FAST + _POP_TWO_LOAD_CONST_INLINE_BORROW + _POP_TOP
|
||||
// ...becomes:
|
||||
// _NOP + _POP_TOP + _NOP
|
||||
while (op_without_pop[opcode]) {
|
||||
while (op_without_pop[opcode] || op_without_pop_null[opcode]) {
|
||||
_PyUOpInstruction *last = &buffer[pc - 1];
|
||||
while (op_skip[last->opcode]) {
|
||||
last--;
|
||||
}
|
||||
if (!op_without_push[last->opcode]) {
|
||||
break;
|
||||
if (op_without_push[last->opcode]) {
|
||||
last->opcode = op_without_push[last->opcode];
|
||||
opcode = buffer[pc].opcode = op_without_pop[opcode];
|
||||
if (op_without_pop[last->opcode]) {
|
||||
opcode = last->opcode;
|
||||
pc = last - buffer;
|
||||
}
|
||||
}
|
||||
last->opcode = op_without_push[last->opcode];
|
||||
opcode = buffer[pc].opcode = op_without_pop[opcode];
|
||||
if (op_without_pop[last->opcode]) {
|
||||
opcode = last->opcode;
|
||||
pc = last - buffer;
|
||||
else if (last->opcode == _PUSH_NULL) {
|
||||
// Handle _POP_CALL and _POP_CALL_LOAD_CONST_INLINE_BORROW separately.
|
||||
// This looks for a preceding _PUSH_NULL instruction and
|
||||
// simplifies to _POP_TOP(_LOAD_CONST_INLINE_BORROW).
|
||||
last->opcode = _NOP;
|
||||
opcode = buffer[pc].opcode = op_without_pop_null[opcode];
|
||||
assert(opcode);
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* _PUSH_FRAME doesn't escape or error, but it
|
||||
|
|
|
@ -551,6 +551,14 @@ dummy_func(void) {
|
|||
value = sym_new_const(ctx, ptr);
|
||||
}
|
||||
|
||||
op(_POP_CALL_LOAD_CONST_INLINE_BORROW, (ptr/4, unused, unused -- value)) {
|
||||
value = sym_new_const(ctx, ptr);
|
||||
}
|
||||
|
||||
op(_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW, (ptr/4, unused, unused, unused -- value)) {
|
||||
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);
|
||||
}
|
||||
|
|
38
Python/optimizer_cases.c.h
generated
38
Python/optimizer_cases.c.h
generated
|
@ -2601,6 +2601,24 @@
|
|||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL: {
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_ONE: {
|
||||
stack_pointer += -3;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_TWO: {
|
||||
stack_pointer += -4;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_TOP_LOAD_CONST_INLINE_BORROW: {
|
||||
JitOptSymbol *value;
|
||||
PyObject *ptr = (PyObject *)this_instr->operand0;
|
||||
|
@ -2618,6 +2636,26 @@
|
|||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_LOAD_CONST_INLINE_BORROW: {
|
||||
JitOptSymbol *value;
|
||||
PyObject *ptr = (PyObject *)this_instr->operand0;
|
||||
value = sym_new_const(ctx, ptr);
|
||||
stack_pointer[-2] = value;
|
||||
stack_pointer += -1;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW: {
|
||||
JitOptSymbol *value;
|
||||
PyObject *ptr = (PyObject *)this_instr->operand0;
|
||||
value = sym_new_const(ctx, ptr);
|
||||
stack_pointer[-3] = value;
|
||||
stack_pointer += -2;
|
||||
assert(WITHIN_STACK_BOUNDS());
|
||||
break;
|
||||
}
|
||||
|
||||
case _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW: {
|
||||
JitOptSymbol *value;
|
||||
PyObject *ptr = (PyObject *)this_instr->operand0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue