diff options
| -rw-r--r-- | Include/internal/pycore_uop_ids.h | 283 | ||||
| -rw-r--r-- | Include/internal/pycore_uop_metadata.h | 4 | ||||
| -rw-r--r-- | Python/bytecodes.c | 5 | ||||
| -rw-r--r-- | Python/executor_cases.c.h | 10 | ||||
| -rw-r--r-- | Python/optimizer.c | 12 | ||||
| -rw-r--r-- | Python/optimizer_analysis.c | 19 | ||||
| -rw-r--r-- | Python/optimizer_cases.c.h | 4 |
7 files changed, 148 insertions, 189 deletions
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index daac41b3d28..2b79fffc14b 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -74,77 +74,76 @@ extern "C" { #define _CHECK_STACK_SPACE 347 #define _CHECK_STACK_SPACE_OPERAND 348 #define _CHECK_VALIDITY 349 -#define _CHECK_VALIDITY_AND_SET_IP 350 -#define _COMPARE_OP 351 -#define _COMPARE_OP_FLOAT 352 -#define _COMPARE_OP_INT 353 -#define _COMPARE_OP_STR 354 -#define _CONTAINS_OP 355 +#define _COMPARE_OP 350 +#define _COMPARE_OP_FLOAT 351 +#define _COMPARE_OP_INT 352 +#define _COMPARE_OP_STR 353 +#define _CONTAINS_OP 354 #define _CONTAINS_OP_DICT CONTAINS_OP_DICT #define _CONTAINS_OP_SET CONTAINS_OP_SET #define _CONVERT_VALUE CONVERT_VALUE #define _COPY COPY #define _COPY_FREE_VARS COPY_FREE_VARS -#define _CREATE_INIT_FRAME 356 +#define _CREATE_INIT_FRAME 355 #define _DELETE_ATTR DELETE_ATTR #define _DELETE_DEREF DELETE_DEREF #define _DELETE_FAST DELETE_FAST #define _DELETE_GLOBAL DELETE_GLOBAL #define _DELETE_NAME DELETE_NAME #define _DELETE_SUBSCR DELETE_SUBSCR -#define _DEOPT 357 +#define _DEOPT 356 #define _DICT_MERGE DICT_MERGE #define _DICT_UPDATE DICT_UPDATE -#define _DO_CALL 358 -#define _DO_CALL_FUNCTION_EX 359 -#define _DO_CALL_KW 360 +#define _DO_CALL 357 +#define _DO_CALL_FUNCTION_EX 358 +#define _DO_CALL_KW 359 #define _END_FOR END_FOR #define _END_SEND END_SEND -#define _ERROR_POP_N 361 +#define _ERROR_POP_N 360 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK -#define _EXPAND_METHOD 362 -#define _EXPAND_METHOD_KW 363 -#define _FATAL_ERROR 364 +#define _EXPAND_METHOD 361 +#define _EXPAND_METHOD_KW 362 +#define _FATAL_ERROR 363 #define _FORMAT_SIMPLE FORMAT_SIMPLE #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC -#define _FOR_ITER 365 -#define _FOR_ITER_GEN_FRAME 366 -#define _FOR_ITER_TIER_TWO 367 +#define _FOR_ITER 364 +#define _FOR_ITER_GEN_FRAME 365 +#define _FOR_ITER_TIER_TWO 366 #define _GET_AITER GET_AITER #define _GET_ANEXT GET_ANEXT #define _GET_AWAITABLE GET_AWAITABLE #define _GET_ITER GET_ITER #define _GET_LEN GET_LEN #define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER -#define _GUARD_BINARY_OP_EXTEND 368 -#define _GUARD_DORV_NO_DICT 369 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 370 -#define _GUARD_GLOBALS_VERSION 371 -#define _GUARD_IS_FALSE_POP 372 -#define _GUARD_IS_NONE_POP 373 -#define _GUARD_IS_NOT_NONE_POP 374 -#define _GUARD_IS_TRUE_POP 375 -#define _GUARD_KEYS_VERSION 376 -#define _GUARD_NOS_FLOAT 377 -#define _GUARD_NOS_INT 378 -#define _GUARD_NOS_UNICODE 379 -#define _GUARD_NOT_EXHAUSTED_LIST 380 -#define _GUARD_NOT_EXHAUSTED_RANGE 381 -#define _GUARD_NOT_EXHAUSTED_TUPLE 382 -#define _GUARD_TOS_FLOAT 383 -#define _GUARD_TOS_INT 384 -#define _GUARD_TOS_UNICODE 385 -#define _GUARD_TYPE_VERSION 386 -#define _GUARD_TYPE_VERSION_AND_LOCK 387 +#define _GUARD_BINARY_OP_EXTEND 367 +#define _GUARD_DORV_NO_DICT 368 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 369 +#define _GUARD_GLOBALS_VERSION 370 +#define _GUARD_IS_FALSE_POP 371 +#define _GUARD_IS_NONE_POP 372 +#define _GUARD_IS_NOT_NONE_POP 373 +#define _GUARD_IS_TRUE_POP 374 +#define _GUARD_KEYS_VERSION 375 +#define _GUARD_NOS_FLOAT 376 +#define _GUARD_NOS_INT 377 +#define _GUARD_NOS_UNICODE 378 +#define _GUARD_NOT_EXHAUSTED_LIST 379 +#define _GUARD_NOT_EXHAUSTED_RANGE 380 +#define _GUARD_NOT_EXHAUSTED_TUPLE 381 +#define _GUARD_TOS_FLOAT 382 +#define _GUARD_TOS_INT 383 +#define _GUARD_TOS_UNICODE 384 +#define _GUARD_TYPE_VERSION 385 +#define _GUARD_TYPE_VERSION_AND_LOCK 386 #define _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 388 -#define _INIT_CALL_PY_EXACT_ARGS 389 -#define _INIT_CALL_PY_EXACT_ARGS_0 390 -#define _INIT_CALL_PY_EXACT_ARGS_1 391 -#define _INIT_CALL_PY_EXACT_ARGS_2 392 -#define _INIT_CALL_PY_EXACT_ARGS_3 393 -#define _INIT_CALL_PY_EXACT_ARGS_4 394 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 387 +#define _INIT_CALL_PY_EXACT_ARGS 388 +#define _INIT_CALL_PY_EXACT_ARGS_0 389 +#define _INIT_CALL_PY_EXACT_ARGS_1 390 +#define _INIT_CALL_PY_EXACT_ARGS_2 391 +#define _INIT_CALL_PY_EXACT_ARGS_3 392 +#define _INIT_CALL_PY_EXACT_ARGS_4 393 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -154,163 +153,163 @@ extern "C" { #define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE #define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE #define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE -#define _IS_NONE 395 +#define _IS_NONE 394 #define _IS_OP IS_OP -#define _ITER_CHECK_LIST 396 -#define _ITER_CHECK_RANGE 397 -#define _ITER_CHECK_TUPLE 398 -#define _ITER_JUMP_LIST 399 -#define _ITER_JUMP_RANGE 400 -#define _ITER_JUMP_TUPLE 401 -#define _ITER_NEXT_LIST 402 -#define _ITER_NEXT_LIST_TIER_TWO 403 -#define _ITER_NEXT_RANGE 404 -#define _ITER_NEXT_TUPLE 405 -#define _JUMP_TO_TOP 406 +#define _ITER_CHECK_LIST 395 +#define _ITER_CHECK_RANGE 396 +#define _ITER_CHECK_TUPLE 397 +#define _ITER_JUMP_LIST 398 +#define _ITER_JUMP_RANGE 399 +#define _ITER_JUMP_TUPLE 400 +#define _ITER_NEXT_LIST 401 +#define _ITER_NEXT_LIST_TIER_TWO 402 +#define _ITER_NEXT_RANGE 403 +#define _ITER_NEXT_TUPLE 404 +#define _JUMP_TO_TOP 405 #define _LIST_APPEND LIST_APPEND #define _LIST_EXTEND LIST_EXTEND -#define _LOAD_ATTR 407 -#define _LOAD_ATTR_CLASS 408 +#define _LOAD_ATTR 406 +#define _LOAD_ATTR_CLASS 407 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN -#define _LOAD_ATTR_INSTANCE_VALUE 409 -#define _LOAD_ATTR_METHOD_LAZY_DICT 410 -#define _LOAD_ATTR_METHOD_NO_DICT 411 -#define _LOAD_ATTR_METHOD_WITH_VALUES 412 -#define _LOAD_ATTR_MODULE 413 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 414 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 415 -#define _LOAD_ATTR_PROPERTY_FRAME 416 -#define _LOAD_ATTR_SLOT 417 -#define _LOAD_ATTR_WITH_HINT 418 +#define _LOAD_ATTR_INSTANCE_VALUE 408 +#define _LOAD_ATTR_METHOD_LAZY_DICT 409 +#define _LOAD_ATTR_METHOD_NO_DICT 410 +#define _LOAD_ATTR_METHOD_WITH_VALUES 411 +#define _LOAD_ATTR_MODULE 412 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 413 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 414 +#define _LOAD_ATTR_PROPERTY_FRAME 415 +#define _LOAD_ATTR_SLOT 416 +#define _LOAD_ATTR_WITH_HINT 417 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 419 +#define _LOAD_BYTECODE 418 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL -#define _LOAD_CONST_INLINE 420 -#define _LOAD_CONST_INLINE_BORROW 421 +#define _LOAD_CONST_INLINE 419 +#define _LOAD_CONST_INLINE_BORROW 420 #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL #define _LOAD_DEREF LOAD_DEREF -#define _LOAD_FAST 422 -#define _LOAD_FAST_0 423 -#define _LOAD_FAST_1 424 -#define _LOAD_FAST_2 425 -#define _LOAD_FAST_3 426 -#define _LOAD_FAST_4 427 -#define _LOAD_FAST_5 428 -#define _LOAD_FAST_6 429 -#define _LOAD_FAST_7 430 +#define _LOAD_FAST 421 +#define _LOAD_FAST_0 422 +#define _LOAD_FAST_1 423 +#define _LOAD_FAST_2 424 +#define _LOAD_FAST_3 425 +#define _LOAD_FAST_4 426 +#define _LOAD_FAST_5 427 +#define _LOAD_FAST_6 428 +#define _LOAD_FAST_7 429 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 431 -#define _LOAD_FAST_BORROW_0 432 -#define _LOAD_FAST_BORROW_1 433 -#define _LOAD_FAST_BORROW_2 434 -#define _LOAD_FAST_BORROW_3 435 -#define _LOAD_FAST_BORROW_4 436 -#define _LOAD_FAST_BORROW_5 437 -#define _LOAD_FAST_BORROW_6 438 -#define _LOAD_FAST_BORROW_7 439 +#define _LOAD_FAST_BORROW 430 +#define _LOAD_FAST_BORROW_0 431 +#define _LOAD_FAST_BORROW_1 432 +#define _LOAD_FAST_BORROW_2 433 +#define _LOAD_FAST_BORROW_3 434 +#define _LOAD_FAST_BORROW_4 435 +#define _LOAD_FAST_BORROW_5 436 +#define _LOAD_FAST_BORROW_6 437 +#define _LOAD_FAST_BORROW_7 438 #define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW #define _LOAD_FAST_CHECK LOAD_FAST_CHECK #define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST #define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF #define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS -#define _LOAD_GLOBAL 440 -#define _LOAD_GLOBAL_BUILTINS 441 -#define _LOAD_GLOBAL_MODULE 442 +#define _LOAD_GLOBAL 439 +#define _LOAD_GLOBAL_BUILTINS 440 +#define _LOAD_GLOBAL_MODULE 441 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 443 -#define _LOAD_SMALL_INT_0 444 -#define _LOAD_SMALL_INT_1 445 -#define _LOAD_SMALL_INT_2 446 -#define _LOAD_SMALL_INT_3 447 +#define _LOAD_SMALL_INT 442 +#define _LOAD_SMALL_INT_0 443 +#define _LOAD_SMALL_INT_1 444 +#define _LOAD_SMALL_INT_2 445 +#define _LOAD_SMALL_INT_3 446 #define _LOAD_SPECIAL LOAD_SPECIAL #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD -#define _MAKE_CALLARGS_A_TUPLE 448 +#define _MAKE_CALLARGS_A_TUPLE 447 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_WARM 449 +#define _MAKE_WARM 448 #define _MAP_ADD MAP_ADD #define _MATCH_CLASS MATCH_CLASS #define _MATCH_KEYS MATCH_KEYS #define _MATCH_MAPPING MATCH_MAPPING #define _MATCH_SEQUENCE MATCH_SEQUENCE -#define _MAYBE_EXPAND_METHOD 450 -#define _MAYBE_EXPAND_METHOD_KW 451 -#define _MONITOR_CALL 452 -#define _MONITOR_CALL_KW 453 -#define _MONITOR_JUMP_BACKWARD 454 -#define _MONITOR_RESUME 455 +#define _MAYBE_EXPAND_METHOD 449 +#define _MAYBE_EXPAND_METHOD_KW 450 +#define _MONITOR_CALL 451 +#define _MONITOR_CALL_KW 452 +#define _MONITOR_JUMP_BACKWARD 453 +#define _MONITOR_RESUME 454 #define _NOP NOP #define _POP_EXCEPT POP_EXCEPT -#define _POP_JUMP_IF_FALSE 456 -#define _POP_JUMP_IF_TRUE 457 +#define _POP_JUMP_IF_FALSE 455 +#define _POP_JUMP_IF_TRUE 456 #define _POP_TOP POP_TOP -#define _POP_TOP_LOAD_CONST_INLINE 458 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 459 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 460 +#define _POP_TOP_LOAD_CONST_INLINE 457 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW 458 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW 459 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 461 +#define _PUSH_FRAME 460 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 462 -#define _PY_FRAME_GENERAL 463 -#define _PY_FRAME_KW 464 -#define _QUICKEN_RESUME 465 -#define _REPLACE_WITH_TRUE 466 +#define _PUSH_NULL_CONDITIONAL 461 +#define _PY_FRAME_GENERAL 462 +#define _PY_FRAME_KW 463 +#define _QUICKEN_RESUME 464 +#define _REPLACE_WITH_TRUE 465 #define _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_VALUE RETURN_VALUE -#define _SAVE_RETURN_OFFSET 467 -#define _SEND 468 -#define _SEND_GEN_FRAME 469 +#define _SAVE_RETURN_OFFSET 466 +#define _SEND 467 +#define _SEND_GEN_FRAME 468 #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 470 -#define _STORE_ATTR 471 -#define _STORE_ATTR_INSTANCE_VALUE 472 -#define _STORE_ATTR_SLOT 473 -#define _STORE_ATTR_WITH_HINT 474 +#define _START_EXECUTOR 469 +#define _STORE_ATTR 470 +#define _STORE_ATTR_INSTANCE_VALUE 471 +#define _STORE_ATTR_SLOT 472 +#define _STORE_ATTR_WITH_HINT 473 #define _STORE_DEREF STORE_DEREF -#define _STORE_FAST 475 -#define _STORE_FAST_0 476 -#define _STORE_FAST_1 477 -#define _STORE_FAST_2 478 -#define _STORE_FAST_3 479 -#define _STORE_FAST_4 480 -#define _STORE_FAST_5 481 -#define _STORE_FAST_6 482 -#define _STORE_FAST_7 483 +#define _STORE_FAST 474 +#define _STORE_FAST_0 475 +#define _STORE_FAST_1 476 +#define _STORE_FAST_2 477 +#define _STORE_FAST_3 478 +#define _STORE_FAST_4 479 +#define _STORE_FAST_5 480 +#define _STORE_FAST_6 481 +#define _STORE_FAST_7 482 #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 484 -#define _STORE_SUBSCR 485 +#define _STORE_SLICE 483 +#define _STORE_SUBSCR 484 #define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT -#define _STORE_SUBSCR_LIST_INT 486 +#define _STORE_SUBSCR_LIST_INT 485 #define _SWAP SWAP -#define _TIER2_RESUME_CHECK 487 -#define _TO_BOOL 488 +#define _TIER2_RESUME_CHECK 486 +#define _TO_BOOL 487 #define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_INT TO_BOOL_INT #define _TO_BOOL_LIST TO_BOOL_LIST #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 489 +#define _TO_BOOL_STR 488 #define _UNARY_INVERT UNARY_INVERT #define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 490 +#define _UNPACK_SEQUENCE 489 #define _UNPACK_SEQUENCE_LIST UNPACK_SEQUENCE_LIST #define _UNPACK_SEQUENCE_TUPLE UNPACK_SEQUENCE_TUPLE #define _UNPACK_SEQUENCE_TWO_TUPLE UNPACK_SEQUENCE_TWO_TUPLE #define _WITH_EXCEPT_START WITH_EXCEPT_START #define _YIELD_VALUE YIELD_VALUE -#define MAX_UOP_ID 490 +#define MAX_UOP_ID 489 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 95ccf4e81af..c089328f2e9 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -287,7 +287,6 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = { [_START_EXECUTOR] = HAS_ESCAPES_FLAG, [_MAKE_WARM] = 0, [_FATAL_ERROR] = 0, - [_CHECK_VALIDITY_AND_SET_IP] = HAS_DEOPT_FLAG, [_DEOPT] = 0, [_ERROR_POP_N] = HAS_ARG_FLAG, [_TIER2_RESUME_CHECK] = HAS_DEOPT_FLAG, @@ -365,7 +364,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = { [_CHECK_STACK_SPACE] = "_CHECK_STACK_SPACE", [_CHECK_STACK_SPACE_OPERAND] = "_CHECK_STACK_SPACE_OPERAND", [_CHECK_VALIDITY] = "_CHECK_VALIDITY", - [_CHECK_VALIDITY_AND_SET_IP] = "_CHECK_VALIDITY_AND_SET_IP", [_COMPARE_OP] = "_COMPARE_OP", [_COMPARE_OP_FLOAT] = "_COMPARE_OP_FLOAT", [_COMPARE_OP_INT] = "_COMPARE_OP_INT", @@ -1114,8 +1112,6 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _FATAL_ERROR: return 0; - case _CHECK_VALIDITY_AND_SET_IP: - return 0; case _DEOPT: return 0; case _ERROR_POP_N: diff --git a/Python/bytecodes.c b/Python/bytecodes.c index c50df896cc9..8d7e137c829 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -5191,11 +5191,6 @@ dummy_func( Py_FatalError("Fatal error uop executed."); } - tier2 op(_CHECK_VALIDITY_AND_SET_IP, (instr_ptr/4 --)) { - DEOPT_IF(!current_executor->vm_data.valid); - frame->instr_ptr = (_Py_CODEUNIT *)instr_ptr; - } - tier2 op(_DEOPT, (--)) { tstate->previous_executor = (PyObject *)current_executor; GOTO_TIER_ONE(_PyFrame_GetBytecode(frame) + CURRENT_TARGET()); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 117c80c8d78..ca64d7557e3 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -7025,16 +7025,6 @@ break; } - case _CHECK_VALIDITY_AND_SET_IP: { - PyObject *instr_ptr = (PyObject *)CURRENT_OPERAND0(); - if (!current_executor->vm_data.valid) { - UOP_STAT_INC(uopcode, miss); - JUMP_TO_JUMP_TARGET(); - } - frame->instr_ptr = (_Py_CODEUNIT *)instr_ptr; - break; - } - case _DEOPT: { tstate->previous_executor = (PyObject *)current_executor; GOTO_TIER_ONE(_PyFrame_GetBytecode(frame) + CURRENT_TARGET()); diff --git a/Python/optimizer.c b/Python/optimizer.c index ace16faa70f..f8d0aa04b9e 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -569,13 +569,11 @@ translate_bytecode_to_trace( goto done; } assert(opcode != ENTER_EXECUTOR && opcode != EXTENDED_ARG); - if (OPCODE_HAS_NO_SAVE_IP(opcode)) { - RESERVE_RAW(2, "_CHECK_VALIDITY"); - ADD_TO_TRACE(_CHECK_VALIDITY, 0, 0, target); - } - else { - RESERVE_RAW(2, "_CHECK_VALIDITY_AND_SET_IP"); - ADD_TO_TRACE(_CHECK_VALIDITY_AND_SET_IP, 0, (uintptr_t)instr, target); + RESERVE_RAW(2, "_CHECK_VALIDITY"); + ADD_TO_TRACE(_CHECK_VALIDITY, 0, 0, target); + if (!OPCODE_HAS_NO_SAVE_IP(opcode)) { + RESERVE_RAW(2, "_SET_IP"); + ADD_TO_TRACE(_SET_IP, 0, (uintptr_t)instr, target); } /* Special case the first instruction, diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c index afaf2e059e1..ab28fae94a9 100644 --- a/Python/optimizer_analysis.c +++ b/Python/optimizer_analysis.c @@ -554,16 +554,6 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size) buffer[pc].opcode = _NOP; } break; - case _CHECK_VALIDITY_AND_SET_IP: - if (may_have_escaped) { - may_have_escaped = false; - buffer[pc].opcode = _CHECK_VALIDITY; - } - else { - buffer[pc].opcode = _NOP; - } - last_set_ip = pc; - break; case _POP_TOP: { _PyUOpInstruction *last = &buffer[pc-1]; @@ -597,13 +587,8 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size) may_have_escaped = true; } if (needs_ip && last_set_ip >= 0) { - if (buffer[last_set_ip].opcode == _CHECK_VALIDITY) { - buffer[last_set_ip].opcode = _CHECK_VALIDITY_AND_SET_IP; - } - else { - assert(buffer[last_set_ip].opcode == _NOP); - buffer[last_set_ip].opcode = _SET_IP; - } + assert(buffer[last_set_ip].opcode == _NOP); + buffer[last_set_ip].opcode = _SET_IP; last_set_ip = -1; } } diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 6fdc81f1e5a..e306567c812 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -2378,10 +2378,6 @@ break; } - case _CHECK_VALIDITY_AND_SET_IP: { - break; - } - case _DEOPT: { break; } |