diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index d6d81f88c8e00c..c3442cf06b37a4 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -63,99 +63,100 @@ extern "C" { #define _CHECK_FUNCTION_VERSION 338 #define _CHECK_FUNCTION_VERSION_INLINE 339 #define _CHECK_FUNCTION_VERSION_KW 340 -#define _CHECK_IS_NOT_PY_CALLABLE 341 -#define _CHECK_IS_NOT_PY_CALLABLE_KW 342 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES 343 -#define _CHECK_METHOD_VERSION 344 -#define _CHECK_METHOD_VERSION_KW 345 -#define _CHECK_PEP_523 346 -#define _CHECK_PERIODIC 347 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 348 -#define _CHECK_STACK_SPACE 349 -#define _CHECK_STACK_SPACE_OPERAND 350 -#define _CHECK_VALIDITY 351 -#define _COMPARE_OP 352 -#define _COMPARE_OP_FLOAT 353 -#define _COMPARE_OP_INT 354 -#define _COMPARE_OP_STR 355 -#define _CONTAINS_OP 356 -#define _CONTAINS_OP_DICT 357 -#define _CONTAINS_OP_SET 358 +#define _CHECK_INIT_MATCHES_VERSIONS 341 +#define _CHECK_IS_NOT_PY_CALLABLE 342 +#define _CHECK_IS_NOT_PY_CALLABLE_KW 343 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES 344 +#define _CHECK_METHOD_VERSION 345 +#define _CHECK_METHOD_VERSION_KW 346 +#define _CHECK_PEP_523 347 +#define _CHECK_PERIODIC 348 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 349 +#define _CHECK_STACK_SPACE 350 +#define _CHECK_STACK_SPACE_OPERAND 351 +#define _CHECK_VALIDITY 352 +#define _COMPARE_OP 353 +#define _COMPARE_OP_FLOAT 354 +#define _COMPARE_OP_INT 355 +#define _COMPARE_OP_STR 356 +#define _CONTAINS_OP 357 +#define _CONTAINS_OP_DICT 358 +#define _CONTAINS_OP_SET 359 #define _CONVERT_VALUE CONVERT_VALUE #define _COPY COPY #define _COPY_FREE_VARS COPY_FREE_VARS -#define _CREATE_INIT_FRAME 359 +#define _CREATE_INIT_FRAME 360 #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 360 +#define _DEOPT 361 #define _DICT_MERGE DICT_MERGE #define _DICT_UPDATE DICT_UPDATE -#define _DO_CALL 361 -#define _DO_CALL_FUNCTION_EX 362 -#define _DO_CALL_KW 363 +#define _DO_CALL 362 +#define _DO_CALL_FUNCTION_EX 363 +#define _DO_CALL_KW 364 #define _END_FOR END_FOR #define _END_SEND END_SEND -#define _ERROR_POP_N 364 +#define _ERROR_POP_N 365 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK -#define _EXPAND_METHOD 365 -#define _EXPAND_METHOD_KW 366 -#define _FATAL_ERROR 367 +#define _EXPAND_METHOD 366 +#define _EXPAND_METHOD_KW 367 +#define _FATAL_ERROR 368 #define _FORMAT_SIMPLE FORMAT_SIMPLE #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC -#define _FOR_ITER 368 -#define _FOR_ITER_GEN_FRAME 369 -#define _FOR_ITER_TIER_TWO 370 +#define _FOR_ITER 369 +#define _FOR_ITER_GEN_FRAME 370 +#define _FOR_ITER_TIER_TWO 371 #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 371 -#define _GUARD_CALLABLE_STR_1 372 -#define _GUARD_CALLABLE_TUPLE_1 373 -#define _GUARD_CALLABLE_TYPE_1 374 -#define _GUARD_DORV_NO_DICT 375 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 376 -#define _GUARD_GLOBALS_VERSION 377 -#define _GUARD_IS_FALSE_POP 378 -#define _GUARD_IS_NONE_POP 379 -#define _GUARD_IS_NOT_NONE_POP 380 -#define _GUARD_IS_TRUE_POP 381 -#define _GUARD_KEYS_VERSION 382 -#define _GUARD_NOS_DICT 383 -#define _GUARD_NOS_FLOAT 384 -#define _GUARD_NOS_INT 385 -#define _GUARD_NOS_LIST 386 -#define _GUARD_NOS_NULL 387 -#define _GUARD_NOS_TUPLE 388 -#define _GUARD_NOS_UNICODE 389 -#define _GUARD_NOT_EXHAUSTED_LIST 390 -#define _GUARD_NOT_EXHAUSTED_RANGE 391 -#define _GUARD_NOT_EXHAUSTED_TUPLE 392 -#define _GUARD_TOS_ANY_SET 393 -#define _GUARD_TOS_DICT 394 -#define _GUARD_TOS_FLOAT 395 -#define _GUARD_TOS_INT 396 -#define _GUARD_TOS_LIST 397 -#define _GUARD_TOS_TUPLE 398 -#define _GUARD_TOS_UNICODE 399 -#define _GUARD_TYPE_VERSION 400 -#define _GUARD_TYPE_VERSION_AND_LOCK 401 +#define _GUARD_BINARY_OP_EXTEND 372 +#define _GUARD_CALLABLE_STR_1 373 +#define _GUARD_CALLABLE_TUPLE_1 374 +#define _GUARD_CALLABLE_TYPE_1 375 +#define _GUARD_DORV_NO_DICT 376 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 377 +#define _GUARD_GLOBALS_VERSION 378 +#define _GUARD_IS_FALSE_POP 379 +#define _GUARD_IS_NONE_POP 380 +#define _GUARD_IS_NOT_NONE_POP 381 +#define _GUARD_IS_TRUE_POP 382 +#define _GUARD_KEYS_VERSION 383 +#define _GUARD_NOS_DICT 384 +#define _GUARD_NOS_FLOAT 385 +#define _GUARD_NOS_INT 386 +#define _GUARD_NOS_LIST 387 +#define _GUARD_NOS_NULL 388 +#define _GUARD_NOS_TUPLE 389 +#define _GUARD_NOS_UNICODE 390 +#define _GUARD_NOT_EXHAUSTED_LIST 391 +#define _GUARD_NOT_EXHAUSTED_RANGE 392 +#define _GUARD_NOT_EXHAUSTED_TUPLE 393 +#define _GUARD_TOS_ANY_SET 394 +#define _GUARD_TOS_DICT 395 +#define _GUARD_TOS_FLOAT 396 +#define _GUARD_TOS_INT 397 +#define _GUARD_TOS_LIST 398 +#define _GUARD_TOS_TUPLE 399 +#define _GUARD_TOS_UNICODE 400 +#define _GUARD_TYPE_VERSION 401 +#define _GUARD_TYPE_VERSION_AND_LOCK 402 #define _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 402 -#define _INIT_CALL_PY_EXACT_ARGS 403 -#define _INIT_CALL_PY_EXACT_ARGS_0 404 -#define _INIT_CALL_PY_EXACT_ARGS_1 405 -#define _INIT_CALL_PY_EXACT_ARGS_2 406 -#define _INIT_CALL_PY_EXACT_ARGS_3 407 -#define _INIT_CALL_PY_EXACT_ARGS_4 408 -#define _INSERT_NULL 409 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 403 +#define _INIT_CALL_PY_EXACT_ARGS 404 +#define _INIT_CALL_PY_EXACT_ARGS_0 405 +#define _INIT_CALL_PY_EXACT_ARGS_1 406 +#define _INIT_CALL_PY_EXACT_ARGS_2 407 +#define _INIT_CALL_PY_EXACT_ARGS_3 408 +#define _INIT_CALL_PY_EXACT_ARGS_4 409 +#define _INSERT_NULL 410 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -165,163 +166,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 410 +#define _IS_NONE 411 #define _IS_OP IS_OP -#define _ITER_CHECK_LIST 411 -#define _ITER_CHECK_RANGE 412 -#define _ITER_CHECK_TUPLE 413 -#define _ITER_JUMP_LIST 414 -#define _ITER_JUMP_RANGE 415 -#define _ITER_JUMP_TUPLE 416 -#define _ITER_NEXT_LIST 417 -#define _ITER_NEXT_LIST_TIER_TWO 418 -#define _ITER_NEXT_RANGE 419 -#define _ITER_NEXT_TUPLE 420 -#define _JUMP_TO_TOP 421 +#define _ITER_CHECK_LIST 412 +#define _ITER_CHECK_RANGE 413 +#define _ITER_CHECK_TUPLE 414 +#define _ITER_JUMP_LIST 415 +#define _ITER_JUMP_RANGE 416 +#define _ITER_JUMP_TUPLE 417 +#define _ITER_NEXT_LIST 418 +#define _ITER_NEXT_LIST_TIER_TWO 419 +#define _ITER_NEXT_RANGE 420 +#define _ITER_NEXT_TUPLE 421 +#define _JUMP_TO_TOP 422 #define _LIST_APPEND LIST_APPEND #define _LIST_EXTEND LIST_EXTEND -#define _LOAD_ATTR 422 -#define _LOAD_ATTR_CLASS 423 +#define _LOAD_ATTR 423 +#define _LOAD_ATTR_CLASS 424 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN -#define _LOAD_ATTR_INSTANCE_VALUE 424 -#define _LOAD_ATTR_METHOD_LAZY_DICT 425 -#define _LOAD_ATTR_METHOD_NO_DICT 426 -#define _LOAD_ATTR_METHOD_WITH_VALUES 427 -#define _LOAD_ATTR_MODULE 428 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 429 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 430 -#define _LOAD_ATTR_PROPERTY_FRAME 431 -#define _LOAD_ATTR_SLOT 432 -#define _LOAD_ATTR_WITH_HINT 433 +#define _LOAD_ATTR_INSTANCE_VALUE 425 +#define _LOAD_ATTR_METHOD_LAZY_DICT 426 +#define _LOAD_ATTR_METHOD_NO_DICT 427 +#define _LOAD_ATTR_METHOD_WITH_VALUES 428 +#define _LOAD_ATTR_MODULE 429 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 430 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 431 +#define _LOAD_ATTR_PROPERTY_FRAME 432 +#define _LOAD_ATTR_SLOT 433 +#define _LOAD_ATTR_WITH_HINT 434 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 434 +#define _LOAD_BYTECODE 435 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL -#define _LOAD_CONST_INLINE 435 -#define _LOAD_CONST_INLINE_BORROW 436 +#define _LOAD_CONST_INLINE 436 +#define _LOAD_CONST_INLINE_BORROW 437 #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL #define _LOAD_DEREF LOAD_DEREF -#define _LOAD_FAST 437 -#define _LOAD_FAST_0 438 -#define _LOAD_FAST_1 439 -#define _LOAD_FAST_2 440 -#define _LOAD_FAST_3 441 -#define _LOAD_FAST_4 442 -#define _LOAD_FAST_5 443 -#define _LOAD_FAST_6 444 -#define _LOAD_FAST_7 445 +#define _LOAD_FAST 438 +#define _LOAD_FAST_0 439 +#define _LOAD_FAST_1 440 +#define _LOAD_FAST_2 441 +#define _LOAD_FAST_3 442 +#define _LOAD_FAST_4 443 +#define _LOAD_FAST_5 444 +#define _LOAD_FAST_6 445 +#define _LOAD_FAST_7 446 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 446 -#define _LOAD_FAST_BORROW_0 447 -#define _LOAD_FAST_BORROW_1 448 -#define _LOAD_FAST_BORROW_2 449 -#define _LOAD_FAST_BORROW_3 450 -#define _LOAD_FAST_BORROW_4 451 -#define _LOAD_FAST_BORROW_5 452 -#define _LOAD_FAST_BORROW_6 453 -#define _LOAD_FAST_BORROW_7 454 +#define _LOAD_FAST_BORROW 447 +#define _LOAD_FAST_BORROW_0 448 +#define _LOAD_FAST_BORROW_1 449 +#define _LOAD_FAST_BORROW_2 450 +#define _LOAD_FAST_BORROW_3 451 +#define _LOAD_FAST_BORROW_4 452 +#define _LOAD_FAST_BORROW_5 453 +#define _LOAD_FAST_BORROW_6 454 +#define _LOAD_FAST_BORROW_7 455 #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 455 -#define _LOAD_GLOBAL_BUILTINS 456 -#define _LOAD_GLOBAL_MODULE 457 +#define _LOAD_GLOBAL 456 +#define _LOAD_GLOBAL_BUILTINS 457 +#define _LOAD_GLOBAL_MODULE 458 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 458 -#define _LOAD_SMALL_INT_0 459 -#define _LOAD_SMALL_INT_1 460 -#define _LOAD_SMALL_INT_2 461 -#define _LOAD_SMALL_INT_3 462 -#define _LOAD_SPECIAL 463 +#define _LOAD_SMALL_INT 459 +#define _LOAD_SMALL_INT_0 460 +#define _LOAD_SMALL_INT_1 461 +#define _LOAD_SMALL_INT_2 462 +#define _LOAD_SMALL_INT_3 463 +#define _LOAD_SPECIAL 464 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD -#define _MAKE_CALLARGS_A_TUPLE 464 +#define _MAKE_CALLARGS_A_TUPLE 465 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_WARM 465 +#define _MAKE_WARM 466 #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 466 -#define _MAYBE_EXPAND_METHOD_KW 467 -#define _MONITOR_CALL 468 -#define _MONITOR_CALL_KW 469 -#define _MONITOR_JUMP_BACKWARD 470 -#define _MONITOR_RESUME 471 +#define _MAYBE_EXPAND_METHOD 467 +#define _MAYBE_EXPAND_METHOD_KW 468 +#define _MONITOR_CALL 469 +#define _MONITOR_CALL_KW 470 +#define _MONITOR_JUMP_BACKWARD 471 +#define _MONITOR_RESUME 472 #define _NOP NOP #define _POP_EXCEPT POP_EXCEPT -#define _POP_JUMP_IF_FALSE 472 -#define _POP_JUMP_IF_TRUE 473 +#define _POP_JUMP_IF_FALSE 473 +#define _POP_JUMP_IF_TRUE 474 #define _POP_TOP POP_TOP -#define _POP_TOP_LOAD_CONST_INLINE 474 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 475 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 476 +#define _POP_TOP_LOAD_CONST_INLINE 475 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW 476 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW 477 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 477 +#define _PUSH_FRAME 478 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 478 -#define _PY_FRAME_GENERAL 479 -#define _PY_FRAME_KW 480 -#define _QUICKEN_RESUME 481 -#define _REPLACE_WITH_TRUE 482 +#define _PUSH_NULL_CONDITIONAL 479 +#define _PY_FRAME_GENERAL 480 +#define _PY_FRAME_KW 481 +#define _QUICKEN_RESUME 482 +#define _REPLACE_WITH_TRUE 483 #define _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_VALUE RETURN_VALUE -#define _SAVE_RETURN_OFFSET 483 -#define _SEND 484 -#define _SEND_GEN_FRAME 485 +#define _SAVE_RETURN_OFFSET 484 +#define _SEND 485 +#define _SEND_GEN_FRAME 486 #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 486 -#define _STORE_ATTR 487 -#define _STORE_ATTR_INSTANCE_VALUE 488 -#define _STORE_ATTR_SLOT 489 -#define _STORE_ATTR_WITH_HINT 490 +#define _START_EXECUTOR 487 +#define _STORE_ATTR 488 +#define _STORE_ATTR_INSTANCE_VALUE 489 +#define _STORE_ATTR_SLOT 490 +#define _STORE_ATTR_WITH_HINT 491 #define _STORE_DEREF STORE_DEREF -#define _STORE_FAST 491 -#define _STORE_FAST_0 492 -#define _STORE_FAST_1 493 -#define _STORE_FAST_2 494 -#define _STORE_FAST_3 495 -#define _STORE_FAST_4 496 -#define _STORE_FAST_5 497 -#define _STORE_FAST_6 498 -#define _STORE_FAST_7 499 +#define _STORE_FAST 492 +#define _STORE_FAST_0 493 +#define _STORE_FAST_1 494 +#define _STORE_FAST_2 495 +#define _STORE_FAST_3 496 +#define _STORE_FAST_4 497 +#define _STORE_FAST_5 498 +#define _STORE_FAST_6 499 +#define _STORE_FAST_7 500 #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 500 -#define _STORE_SUBSCR 501 -#define _STORE_SUBSCR_DICT 502 -#define _STORE_SUBSCR_LIST_INT 503 +#define _STORE_SLICE 501 +#define _STORE_SUBSCR 502 +#define _STORE_SUBSCR_DICT 503 +#define _STORE_SUBSCR_LIST_INT 504 #define _SWAP SWAP -#define _TIER2_RESUME_CHECK 504 -#define _TO_BOOL 505 +#define _TIER2_RESUME_CHECK 505 +#define _TO_BOOL 506 #define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_INT TO_BOOL_INT -#define _TO_BOOL_LIST 506 +#define _TO_BOOL_LIST 507 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 507 +#define _TO_BOOL_STR 508 #define _UNARY_INVERT UNARY_INVERT #define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 508 -#define _UNPACK_SEQUENCE_LIST 509 -#define _UNPACK_SEQUENCE_TUPLE 510 -#define _UNPACK_SEQUENCE_TWO_TUPLE 511 +#define _UNPACK_SEQUENCE 509 +#define _UNPACK_SEQUENCE_LIST 510 +#define _UNPACK_SEQUENCE_TUPLE 511 +#define _UNPACK_SEQUENCE_TWO_TUPLE 512 #define _WITH_EXCEPT_START WITH_EXCEPT_START #define _YIELD_VALUE YIELD_VALUE -#define MAX_UOP_ID 511 +#define MAX_UOP_ID 512 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 0ea8e56b6cd0bc..2217a48c4b1e88 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -248,6 +248,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = { [_CALL_STR_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_GUARD_CALLABLE_TUPLE_1] = HAS_DEOPT_FLAG, [_CALL_TUPLE_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, + [_CHECK_INIT_MATCHES_VERSIONS] = HAS_ARG_FLAG | HAS_DEOPT_FLAG, [_CHECK_AND_ALLOCATE_OBJECT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CREATE_INIT_FRAME] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_EXIT_INIT_CHECK] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, @@ -365,6 +366,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = { [_CHECK_FUNCTION_VERSION] = "_CHECK_FUNCTION_VERSION", [_CHECK_FUNCTION_VERSION_INLINE] = "_CHECK_FUNCTION_VERSION_INLINE", [_CHECK_FUNCTION_VERSION_KW] = "_CHECK_FUNCTION_VERSION_KW", + [_CHECK_INIT_MATCHES_VERSIONS] = "_CHECK_INIT_MATCHES_VERSIONS", [_CHECK_IS_NOT_PY_CALLABLE] = "_CHECK_IS_NOT_PY_CALLABLE", [_CHECK_IS_NOT_PY_CALLABLE_KW] = "_CHECK_IS_NOT_PY_CALLABLE_KW", [_CHECK_MANAGED_OBJECT_HAS_VALUES] = "_CHECK_MANAGED_OBJECT_HAS_VALUES", @@ -1058,6 +1060,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _CALL_TUPLE_1: return 3; + case _CHECK_INIT_MATCHES_VERSIONS: + return 0; case _CHECK_AND_ALLOCATE_OBJECT: return 0; case _CREATE_INIT_FRAME: diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 0047306ae422db..036b327a65794f 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1923,6 +1923,20 @@ def testfunc(n): self.assertNotIn("_GUARD_TOS_INT", uops) self.assertIn("_CALL_LEN", uops) + def test_trace_through_simple_init(self): + def testfunc(n): + for i in range(n): + Initer(i) + + _, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_CHECK_INIT_MATCHES_VERSIONS", uops) + + +class Initer: + def __init__(self, x): + self.x = x def global_identity(x): return x diff --git a/Python/bytecodes.c b/Python/bytecodes.c index f5c6e734a79960..2d8f47fff45284 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -4051,6 +4051,17 @@ dummy_func( _CALL_TUPLE_1 + _CHECK_PERIODIC; + tier2 op(_CHECK_INIT_MATCHES_VERSIONS, (type_version/2, init_func_version/2, callable, unused, unused[oparg] -- callable, unused, unused[oparg])) { + PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); + DEOPT_IF(!PyType_Check(callable_o)); + PyTypeObject *tp = (PyTypeObject *)callable_o; + DEOPT_IF(tp->tp_version_tag != type_version); + assert(tp->tp_flags & Py_TPFLAGS_INLINE_VALUES); + PyHeapTypeObject *cls = (PyHeapTypeObject *)callable_o; + PyFunctionObject *init_func = (PyFunctionObject *)cls->_spec_cache.init; + DEOPT_IF(init_func->func_version != init_func_version); + } + op(_CHECK_AND_ALLOCATE_OBJECT, (type_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) { PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); DEOPT_IF(!PyStackRef_IsNull(self_or_null)); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 978662b241a01c..745e539d952068 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5258,6 +5258,32 @@ break; } + case _CHECK_INIT_MATCHES_VERSIONS: { + _PyStackRef callable; + oparg = CURRENT_OPARG(); + callable = stack_pointer[-2 - oparg]; + uint32_t type_version = (uint32_t)CURRENT_OPERAND0(); + uint32_t init_func_version = (uint32_t)CURRENT_OPERAND1(); + PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable); + if (!PyType_Check(callable_o)) { + UOP_STAT_INC(uopcode, miss); + JUMP_TO_JUMP_TARGET(); + } + PyTypeObject *tp = (PyTypeObject *)callable_o; + if (tp->tp_version_tag != type_version) { + UOP_STAT_INC(uopcode, miss); + JUMP_TO_JUMP_TARGET(); + } + assert(tp->tp_flags & Py_TPFLAGS_INLINE_VALUES); + PyHeapTypeObject *cls = (PyHeapTypeObject *)callable_o; + PyFunctionObject *init_func = (PyFunctionObject *)cls->_spec_cache.init; + if (init_func->func_version != init_func_version) { + UOP_STAT_INC(uopcode, miss); + JUMP_TO_JUMP_TARGET(); + } + break; + } + case _CHECK_AND_ALLOCATE_OBJECT: { _PyStackRef self_or_null; _PyStackRef callable; diff --git a/Python/optimizer.c b/Python/optimizer.c index f8d0aa04b9e003..b4e1848e10c489 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -468,7 +468,8 @@ add_to_trace( assert(func == NULL || func->func_code == (PyObject *)code); \ trace_stack[trace_stack_depth].func = func; \ trace_stack[trace_stack_depth].code = code; \ - trace_stack[trace_stack_depth].instr = instr; \ + trace_stack[trace_stack_depth].instr = instr;\ + trace_stack[trace_stack_depth].is_dunder_init = false; \ trace_stack_depth++; #define TRACE_STACK_POP() \ if (trace_stack_depth <= 0) { \ @@ -506,6 +507,7 @@ translate_bytecode_to_trace( PyFunctionObject *func; PyCodeObject *code; _Py_CODEUNIT *instr; + bool is_dunder_init; } trace_stack[TRACE_STACK_SIZE]; int trace_stack_depth = 0; int confidence = CONFIDENCE_RANGE; // Adjusted by branch instructions @@ -766,6 +768,11 @@ translate_bytecode_to_trace( operand = 0; } ADD_TO_TRACE(uop, oparg, operand, target); + if (trace_stack[trace_stack_depth].is_dunder_init) { + RESERVE_RAW(2, "_Py_InitCleanup"); + ADD_TO_TRACE(EXIT_INIT_CHECK, 0, 0, target); + ADD_TO_TRACE(RETURN_VALUE, 0, 0, 0); + } DPRINTF(2, "Returning to %s (%s:%d) at byte offset %d\n", PyUnicode_AsUTF8(code->co_qualname), @@ -795,6 +802,42 @@ translate_bytecode_to_trace( PyCodeObject *new_code = NULL; PyFunctionObject *new_func = _PyFunction_LookupByVersion(func_version, (PyObject **) &new_code); + if (opcode == CALL_ALLOC_AND_ENTER_INIT) { + // In CALL_ALLOC_AND_ENTER_INIT, func_version is actually the type version. + PyTypeObject *typ = _PyType_LookupByVersion(func_version); + if (typ == NULL || + !PyType_HasFeature(typ, Py_TPFLAGS_HEAPTYPE) || + !PyType_HasFeature(typ, Py_TPFLAGS_INLINE_VALUES)) { + DPRINTF(2, "Bailing due to dynamic target\n"); + ADD_TO_TRACE(uop, oparg, 0, target); + ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0); + goto done; + } + assert(PyType_HasFeature(typ, Py_TPFLAGS_HEAPTYPE)); + PyHeapTypeObject *ht = (PyHeapTypeObject *)typ; + PyObject *init = ht->_spec_cache.init; + if (!PyFunction_Check(init) || + ((PyFunctionObject *)init)->func_version + != ((PyCodeObject *)((PyFunctionObject *)init)->func_code)->co_version) { + DPRINTF(2, "Bailing due to non-matching __init__\n"); + ADD_TO_TRACE(uop, oparg, 0, target); + ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0); + goto done; + } + PyFunctionObject *init_func = (PyFunctionObject *)init; + // Insert a guard that the __init__ is what we expect. + // Then trace through the __init__. + _PyUOpInstruction *nop = &trace[trace_length - 3]; + assert(nop->opcode == _NOP); + nop->opcode = _CHECK_INIT_MATCHES_VERSIONS; + nop->operand0 = typ->tp_version_tag; + nop->oparg = oparg; + nop->target = target; + nop->operand1 = init_func->func_version; + new_func = init_func; + new_code = (PyCodeObject *)init_func->func_code; + func_version = init_func->func_version; + } DPRINTF(2, "Function: version=%#x; new_func=%p, new_code=%p\n", (int)func_version, new_func, new_code); if (new_code != NULL) { @@ -821,6 +864,7 @@ translate_bytecode_to_trace( // Increment IP to the return address instr += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]] + 1; TRACE_STACK_PUSH(); + trace_stack[trace_stack_depth - 1].is_dunder_init = opcode == CALL_ALLOC_AND_ENTER_INIT; _Py_BloomFilter_Add(dependencies, new_code); /* Set the operand to the callee's function or code object, * to assist optimization passes. @@ -863,6 +907,12 @@ translate_bytecode_to_trace( instr++; } + if (uop == _CHECK_AND_ALLOCATE_OBJECT) { + // Reserving a _NOP to insert a check later. + RESERVE_RAW(1, "_NOP"); + ADD_TO_TRACE(_NOP, 0, 0, 0); + } + // All other instructions ADD_TO_TRACE(uop, oparg, operand, target); } diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 9a5a362ec199a9..29a95a180fa9de 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1944,6 +1944,10 @@ break; } + case _CHECK_INIT_MATCHES_VERSIONS: { + break; + } + case _CHECK_AND_ALLOCATE_OBJECT: { JitOptSymbol **args; JitOptSymbol *self;