mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

GH-131798: JIT: Split CALL_TYPE_1 into several uops (GH-132419)

Browse source
This commit is contained in:
Tomas R. 2025-04-22 18:30:38 +02:00 • committed by GitHub
parent 87b1ea016b
commit a6a3dbb7db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 348 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_opcode_metadata.h generated
View file

@ -1354,7 +1354,7 @@ _PyOpcode_macro_expansion[256] = {
[CALL_PY_GENERAL] = { .nuops = 5, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 1 }, { _CHECK_FUNCTION_VERSION, 2, 1 }, { _PY_FRAME_GENERAL, OPARG_SIMPLE, 3 }, { _SAVE_RETURN_OFFSET, OPARG_SAVE_RETURN_OFFSET, 3 }, { _PUSH_FRAME, OPARG_SIMPLE, 3 } } },
[CALL_STR_1] = { .nuops = 2, .uops = { { _CALL_STR_1, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC, OPARG_SIMPLE, 3 } } },
[CALL_TUPLE_1] = { .nuops = 2, .uops = { { _CALL_TUPLE_1, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC, OPARG_SIMPLE, 3 } } },
[CALL_TYPE_1] = { .nuops = 1, .uops = { { _CALL_TYPE_1, OPARG_SIMPLE, 3 } } },
[CALL_TYPE_1] = { .nuops = 3, .uops = { { _GUARD_NOS_NULL, OPARG_SIMPLE, 3 }, { _GUARD_CALLABLE_TYPE_1, OPARG_SIMPLE, 3 }, { _CALL_TYPE_1, OPARG_SIMPLE, 3 } } },
[CHECK_EG_MATCH] = { .nuops = 1, .uops = { { _CHECK_EG_MATCH, OPARG_SIMPLE, 0 } } },
[CHECK_EXC_MATCH] = { .nuops = 1, .uops = { { _CHECK_EXC_MATCH, OPARG_SIMPLE, 0 } } },
[COMPARE_OP] = { .nuops = 1, .uops = { { _COMPARE_OP, OPARG_SIMPLE, 0 } } },

358
Include/internal/pycore_uop_ids.h generated
View file

@ -51,107 +51,109 @@ extern "C" {
#define _CALL_NON_PY_GENERAL 328
#define _CALL_STR_1 329
#define _CALL_TUPLE_1 330
#define _CALL_TYPE_1 CALL_TYPE_1
#define _CHECK_AND_ALLOCATE_OBJECT 331
#define _CHECK_ATTR_CLASS 332
#define _CHECK_ATTR_METHOD_LAZY_DICT 333
#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 334
#define _CALL_TYPE_1 331
#define _CHECK_AND_ALLOCATE_OBJECT 332
#define _CHECK_ATTR_CLASS 333
#define _CHECK_ATTR_METHOD_LAZY_DICT 334
#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 335
#define _CHECK_EG_MATCH CHECK_EG_MATCH
#define _CHECK_EXC_MATCH CHECK_EXC_MATCH
#define _CHECK_FUNCTION 335
#define _CHECK_FUNCTION_EXACT_ARGS 336
#define _CHECK_FUNCTION_VERSION 337
#define _CHECK_FUNCTION_VERSION_INLINE 338
#define _CHECK_FUNCTION_VERSION_KW 339
#define _CHECK_IS_NOT_PY_CALLABLE 340
#define _CHECK_IS_NOT_PY_CALLABLE_KW 341
#define _CHECK_MANAGED_OBJECT_HAS_VALUES 342
#define _CHECK_METHOD_VERSION 343
#define _CHECK_METHOD_VERSION_KW 344
#define _CHECK_PEP_523 345
#define _CHECK_PERIODIC 346
#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 347
#define _CHECK_STACK_SPACE 348
#define _CHECK_STACK_SPACE_OPERAND 349
#define _CHECK_VALIDITY 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 _CONTAINS_OP_DICT 356
#define _CONTAINS_OP_SET 357
#define _CHECK_FUNCTION 336
#define _CHECK_FUNCTION_EXACT_ARGS 337
#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 _CONVERT_VALUE CONVERT_VALUE
#define _COPY COPY
#define _COPY_FREE_VARS COPY_FREE_VARS
#define _CREATE_INIT_FRAME 358
#define _CREATE_INIT_FRAME 359
#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 359
#define _DEOPT 360
#define _DICT_MERGE DICT_MERGE
#define _DICT_UPDATE DICT_UPDATE
#define _DO_CALL 360
#define _DO_CALL_FUNCTION_EX 361
#define _DO_CALL_KW 362
#define _DO_CALL 361
#define _DO_CALL_FUNCTION_EX 362
#define _DO_CALL_KW 363
#define _END_FOR END_FOR
#define _END_SEND END_SEND
#define _ERROR_POP_N 363
#define _ERROR_POP_N 364
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK
#define _EXPAND_METHOD 364
#define _EXPAND_METHOD_KW 365
#define _FATAL_ERROR 366
#define _EXPAND_METHOD 365
#define _EXPAND_METHOD_KW 366
#define _FATAL_ERROR 367
#define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
#define _FOR_ITER 367
#define _FOR_ITER_GEN_FRAME 368
#define _FOR_ITER_TIER_TWO 369
#define _FOR_ITER 368
#define _FOR_ITER_GEN_FRAME 369
#define _FOR_ITER_TIER_TWO 370
#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 370
#define _GUARD_DORV_NO_DICT 371
#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 372
#define _GUARD_GLOBALS_VERSION 373
#define _GUARD_IS_FALSE_POP 374
#define _GUARD_IS_NONE_POP 375
#define _GUARD_IS_NOT_NONE_POP 376
#define _GUARD_IS_TRUE_POP 377
#define _GUARD_KEYS_VERSION 378
#define _GUARD_NOS_DICT 379
#define _GUARD_NOS_FLOAT 380
#define _GUARD_NOS_INT 381
#define _GUARD_NOS_LIST 382
#define _GUARD_NOS_TUPLE 383
#define _GUARD_NOS_UNICODE 384
#define _GUARD_NOT_EXHAUSTED_LIST 385
#define _GUARD_NOT_EXHAUSTED_RANGE 386
#define _GUARD_NOT_EXHAUSTED_TUPLE 387
#define _GUARD_TOS_ANY_SET 388
#define _GUARD_TOS_DICT 389
#define _GUARD_TOS_FLOAT 390
#define _GUARD_TOS_INT 391
#define _GUARD_TOS_LIST 392
#define _GUARD_TOS_TUPLE 393
#define _GUARD_TOS_UNICODE 394
#define _GUARD_TYPE_VERSION 395
#define _GUARD_TYPE_VERSION_AND_LOCK 396
#define _GUARD_BINARY_OP_EXTEND 371
#define _GUARD_CALLABLE_TYPE_1 372
#define _GUARD_DORV_NO_DICT 373
#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 374
#define _GUARD_GLOBALS_VERSION 375
#define _GUARD_IS_FALSE_POP 376
#define _GUARD_IS_NONE_POP 377
#define _GUARD_IS_NOT_NONE_POP 378
#define _GUARD_IS_TRUE_POP 379
#define _GUARD_KEYS_VERSION 380
#define _GUARD_NOS_DICT 381
#define _GUARD_NOS_FLOAT 382
#define _GUARD_NOS_INT 383
#define _GUARD_NOS_LIST 384
#define _GUARD_NOS_NULL 385
#define _GUARD_NOS_TUPLE 386
#define _GUARD_NOS_UNICODE 387
#define _GUARD_NOT_EXHAUSTED_LIST 388
#define _GUARD_NOT_EXHAUSTED_RANGE 389
#define _GUARD_NOT_EXHAUSTED_TUPLE 390
#define _GUARD_TOS_ANY_SET 391
#define _GUARD_TOS_DICT 392
#define _GUARD_TOS_FLOAT 393
#define _GUARD_TOS_INT 394
#define _GUARD_TOS_LIST 395
#define _GUARD_TOS_TUPLE 396
#define _GUARD_TOS_UNICODE 397
#define _GUARD_TYPE_VERSION 398
#define _GUARD_TYPE_VERSION_AND_LOCK 399
#define _IMPORT_FROM IMPORT_FROM
#define _IMPORT_NAME IMPORT_NAME
#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 397
#define _INIT_CALL_PY_EXACT_ARGS 398
#define _INIT_CALL_PY_EXACT_ARGS_0 399
#define _INIT_CALL_PY_EXACT_ARGS_1 400
#define _INIT_CALL_PY_EXACT_ARGS_2 401
#define _INIT_CALL_PY_EXACT_ARGS_3 402
#define _INIT_CALL_PY_EXACT_ARGS_4 403
#define _INSERT_NULL 404
#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 400
#define _INIT_CALL_PY_EXACT_ARGS 401
#define _INIT_CALL_PY_EXACT_ARGS_0 402
#define _INIT_CALL_PY_EXACT_ARGS_1 403
#define _INIT_CALL_PY_EXACT_ARGS_2 404
#define _INIT_CALL_PY_EXACT_ARGS_3 405
#define _INIT_CALL_PY_EXACT_ARGS_4 406
#define _INSERT_NULL 407
#define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
#define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
#define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@ -161,163 +163,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 405
#define _IS_NONE 408
#define _IS_OP IS_OP
#define _ITER_CHECK_LIST 406
#define _ITER_CHECK_RANGE 407
#define _ITER_CHECK_TUPLE 408
#define _ITER_JUMP_LIST 409
#define _ITER_JUMP_RANGE 410
#define _ITER_JUMP_TUPLE 411
#define _ITER_NEXT_LIST 412
#define _ITER_NEXT_LIST_TIER_TWO 413
#define _ITER_NEXT_RANGE 414
#define _ITER_NEXT_TUPLE 415
#define _JUMP_TO_TOP 416
#define _ITER_CHECK_LIST 409
#define _ITER_CHECK_RANGE 410
#define _ITER_CHECK_TUPLE 411
#define _ITER_JUMP_LIST 412
#define _ITER_JUMP_RANGE 413
#define _ITER_JUMP_TUPLE 414
#define _ITER_NEXT_LIST 415
#define _ITER_NEXT_LIST_TIER_TWO 416
#define _ITER_NEXT_RANGE 417
#define _ITER_NEXT_TUPLE 418
#define _JUMP_TO_TOP 419
#define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND
#define _LOAD_ATTR 417
#define _LOAD_ATTR_CLASS 418
#define _LOAD_ATTR 420
#define _LOAD_ATTR_CLASS 421
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
#define _LOAD_ATTR_INSTANCE_VALUE 419
#define _LOAD_ATTR_METHOD_LAZY_DICT 420
#define _LOAD_ATTR_METHOD_NO_DICT 421
#define _LOAD_ATTR_METHOD_WITH_VALUES 422
#define _LOAD_ATTR_MODULE 423
#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 424
#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 425
#define _LOAD_ATTR_PROPERTY_FRAME 426
#define _LOAD_ATTR_SLOT 427
#define _LOAD_ATTR_WITH_HINT 428
#define _LOAD_ATTR_INSTANCE_VALUE 422
#define _LOAD_ATTR_METHOD_LAZY_DICT 423
#define _LOAD_ATTR_METHOD_NO_DICT 424
#define _LOAD_ATTR_METHOD_WITH_VALUES 425
#define _LOAD_ATTR_MODULE 426
#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 427
#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 428
#define _LOAD_ATTR_PROPERTY_FRAME 429
#define _LOAD_ATTR_SLOT 430
#define _LOAD_ATTR_WITH_HINT 431
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
#define _LOAD_BYTECODE 429
#define _LOAD_BYTECODE 432
#define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
#define _LOAD_CONST LOAD_CONST
#define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL
#define _LOAD_CONST_INLINE 430
#define _LOAD_CONST_INLINE_BORROW 431
#define _LOAD_CONST_INLINE 433
#define _LOAD_CONST_INLINE_BORROW 434
#define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL
#define _LOAD_DEREF LOAD_DEREF
#define _LOAD_FAST 432
#define _LOAD_FAST_0 433
#define _LOAD_FAST_1 434
#define _LOAD_FAST_2 435
#define _LOAD_FAST_3 436
#define _LOAD_FAST_4 437
#define _LOAD_FAST_5 438
#define _LOAD_FAST_6 439
#define _LOAD_FAST_7 440
#define _LOAD_FAST 435
#define _LOAD_FAST_0 436
#define _LOAD_FAST_1 437
#define _LOAD_FAST_2 438
#define _LOAD_FAST_3 439
#define _LOAD_FAST_4 440
#define _LOAD_FAST_5 441
#define _LOAD_FAST_6 442
#define _LOAD_FAST_7 443
#define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
#define _LOAD_FAST_BORROW 441
#define _LOAD_FAST_BORROW_0 442
#define _LOAD_FAST_BORROW_1 443
#define _LOAD_FAST_BORROW_2 444
#define _LOAD_FAST_BORROW_3 445
#define _LOAD_FAST_BORROW_4 446
#define _LOAD_FAST_BORROW_5 447
#define _LOAD_FAST_BORROW_6 448
#define _LOAD_FAST_BORROW_7 449
#define _LOAD_FAST_BORROW 444
#define _LOAD_FAST_BORROW_0 445
#define _LOAD_FAST_BORROW_1 446
#define _LOAD_FAST_BORROW_2 447
#define _LOAD_FAST_BORROW_3 448
#define _LOAD_FAST_BORROW_4 449
#define _LOAD_FAST_BORROW_5 450
#define _LOAD_FAST_BORROW_6 451
#define _LOAD_FAST_BORROW_7 452
#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 450
#define _LOAD_GLOBAL_BUILTINS 451
#define _LOAD_GLOBAL_MODULE 452
#define _LOAD_GLOBAL 453
#define _LOAD_GLOBAL_BUILTINS 454
#define _LOAD_GLOBAL_MODULE 455
#define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME
#define _LOAD_SMALL_INT 453
#define _LOAD_SMALL_INT_0 454
#define _LOAD_SMALL_INT_1 455
#define _LOAD_SMALL_INT_2 456
#define _LOAD_SMALL_INT_3 457
#define _LOAD_SPECIAL 458
#define _LOAD_SMALL_INT 456
#define _LOAD_SMALL_INT_0 457
#define _LOAD_SMALL_INT_1 458
#define _LOAD_SMALL_INT_2 459
#define _LOAD_SMALL_INT_3 460
#define _LOAD_SPECIAL 461
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
#define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
#define _MAKE_CALLARGS_A_TUPLE 459
#define _MAKE_CALLARGS_A_TUPLE 462
#define _MAKE_CELL MAKE_CELL
#define _MAKE_FUNCTION MAKE_FUNCTION
#define _MAKE_WARM 460
#define _MAKE_WARM 463
#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 461
#define _MAYBE_EXPAND_METHOD_KW 462
#define _MONITOR_CALL 463
#define _MONITOR_CALL_KW 464
#define _MONITOR_JUMP_BACKWARD 465
#define _MONITOR_RESUME 466
#define _MAYBE_EXPAND_METHOD 464
#define _MAYBE_EXPAND_METHOD_KW 465
#define _MONITOR_CALL 466
#define _MONITOR_CALL_KW 467
#define _MONITOR_JUMP_BACKWARD 468
#define _MONITOR_RESUME 469
#define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT
#define _POP_JUMP_IF_FALSE 467
#define _POP_JUMP_IF_TRUE 468
#define _POP_JUMP_IF_FALSE 470
#define _POP_JUMP_IF_TRUE 471
#define _POP_TOP POP_TOP
#define _POP_TOP_LOAD_CONST_INLINE 469
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 470
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 471
#define _POP_TOP_LOAD_CONST_INLINE 472
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 473
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 474
#define _PUSH_EXC_INFO PUSH_EXC_INFO
#define _PUSH_FRAME 472
#define _PUSH_FRAME 475
#define _PUSH_NULL PUSH_NULL
#define _PUSH_NULL_CONDITIONAL 473
#define _PY_FRAME_GENERAL 474
#define _PY_FRAME_KW 475
#define _QUICKEN_RESUME 476
#define _REPLACE_WITH_TRUE 477
#define _PUSH_NULL_CONDITIONAL 476
#define _PY_FRAME_GENERAL 477
#define _PY_FRAME_KW 478
#define _QUICKEN_RESUME 479
#define _REPLACE_WITH_TRUE 480
#define _RESUME_CHECK RESUME_CHECK
#define _RETURN_GENERATOR RETURN_GENERATOR
#define _RETURN_VALUE RETURN_VALUE
#define _SAVE_RETURN_OFFSET 478
#define _SEND 479
#define _SEND_GEN_FRAME 480
#define _SAVE_RETURN_OFFSET 481
#define _SEND 482
#define _SEND_GEN_FRAME 483
#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 481
#define _STORE_ATTR 482
#define _STORE_ATTR_INSTANCE_VALUE 483
#define _STORE_ATTR_SLOT 484
#define _STORE_ATTR_WITH_HINT 485
#define _START_EXECUTOR 484
#define _STORE_ATTR 485
#define _STORE_ATTR_INSTANCE_VALUE 486
#define _STORE_ATTR_SLOT 487
#define _STORE_ATTR_WITH_HINT 488
#define _STORE_DEREF STORE_DEREF
#define _STORE_FAST 486
#define _STORE_FAST_0 487
#define _STORE_FAST_1 488
#define _STORE_FAST_2 489
#define _STORE_FAST_3 490
#define _STORE_FAST_4 491
#define _STORE_FAST_5 492
#define _STORE_FAST_6 493
#define _STORE_FAST_7 494
#define _STORE_FAST 489
#define _STORE_FAST_0 490
#define _STORE_FAST_1 491
#define _STORE_FAST_2 492
#define _STORE_FAST_3 493
#define _STORE_FAST_4 494
#define _STORE_FAST_5 495
#define _STORE_FAST_6 496
#define _STORE_FAST_7 497
#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 495
#define _STORE_SUBSCR 496
#define _STORE_SUBSCR_DICT 497
#define _STORE_SUBSCR_LIST_INT 498
#define _STORE_SLICE 498
#define _STORE_SUBSCR 499
#define _STORE_SUBSCR_DICT 500
#define _STORE_SUBSCR_LIST_INT 501
#define _SWAP SWAP
#define _TIER2_RESUME_CHECK 499
#define _TO_BOOL 500
#define _TIER2_RESUME_CHECK 502
#define _TO_BOOL 503
#define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST 501
#define _TO_BOOL_LIST 504
#define _TO_BOOL_NONE TO_BOOL_NONE
#define _TO_BOOL_STR 502
#define _TO_BOOL_STR 505
#define _UNARY_INVERT UNARY_INVERT
#define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX
#define _UNPACK_SEQUENCE 503
#define _UNPACK_SEQUENCE_LIST 504
#define _UNPACK_SEQUENCE_TUPLE 505
#define _UNPACK_SEQUENCE_TWO_TUPLE 506
#define _UNPACK_SEQUENCE 506
#define _UNPACK_SEQUENCE_LIST 507
#define _UNPACK_SEQUENCE_TUPLE 508
#define _UNPACK_SEQUENCE_TWO_TUPLE 509
#define _WITH_EXCEPT_START WITH_EXCEPT_START
#define _YIELD_VALUE YIELD_VALUE
#define MAX_UOP_ID 506
#define MAX_UOP_ID 509
#ifdef __cplusplus
}

10
Include/internal/pycore_uop_metadata.h generated
View file

@ -241,7 +241,9 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_INIT_CALL_PY_EXACT_ARGS_4] = HAS_PURE_FLAG,
[_INIT_CALL_PY_EXACT_ARGS] = HAS_ARG_FLAG | HAS_PURE_FLAG,
[_PUSH_FRAME] = 0,
[_CALL_TYPE_1] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_NOS_NULL] = HAS_DEOPT_FLAG,
[_GUARD_CALLABLE_TYPE_1] = HAS_DEOPT_FLAG,
[_CALL_TYPE_1] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG,
[_CALL_STR_1] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_TUPLE_1] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_AND_ALLOCATE_OBJECT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
@ -411,6 +413,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GET_LEN] = "_GET_LEN",
[_GET_YIELD_FROM_ITER] = "_GET_YIELD_FROM_ITER",
[_GUARD_BINARY_OP_EXTEND] = "_GUARD_BINARY_OP_EXTEND",
[_GUARD_CALLABLE_TYPE_1] = "_GUARD_CALLABLE_TYPE_1",
[_GUARD_DORV_NO_DICT] = "_GUARD_DORV_NO_DICT",
[_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT] = "_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT",
[_GUARD_GLOBALS_VERSION] = "_GUARD_GLOBALS_VERSION",
@ -423,6 +426,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GUARD_NOS_FLOAT] = "_GUARD_NOS_FLOAT",
[_GUARD_NOS_INT] = "_GUARD_NOS_INT",
[_GUARD_NOS_LIST] = "_GUARD_NOS_LIST",
[_GUARD_NOS_NULL] = "_GUARD_NOS_NULL",
[_GUARD_NOS_TUPLE] = "_GUARD_NOS_TUPLE",
[_GUARD_NOS_UNICODE] = "_GUARD_NOS_UNICODE",
[_GUARD_NOT_EXHAUSTED_LIST] = "_GUARD_NOT_EXHAUSTED_LIST",
@ -1036,6 +1040,10 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2 + oparg;
case _PUSH_FRAME:
return 1;
case _GUARD_NOS_NULL:
return 0;
case _GUARD_CALLABLE_TYPE_1:
return 0;
case _CALL_TYPE_1:
return 3;
case _CALL_STR_1:

31
Lib/test/test_capi/test_opt.py
View file

@ -1767,6 +1767,37 @@ class TestUopsOptimization(unittest.TestCase):
self.assertNotIn("_GUARD_TOS_UNICODE", uops)
self.assertIn("_BINARY_OP_ADD_UNICODE", uops)
def test_call_type_1(self):
def testfunc(n):
x = 0
for _ in range(n):
x += type(42) is int
return x
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_CALL_TYPE_1", uops)
self.assertNotIn("_GUARD_NOS_NULL", uops)
self.assertNotIn("_GUARD_CALLABLE_TYPE_1", uops)
def test_call_type_1_result_is_const(self):
def testfunc(n):
x = 0
for _ in range(n):
t = type(42)
if t is not None: # guard is removed
x += 1
return x
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_CALL_TYPE_1", uops)
self.assertNotIn("_GUARD_IS_NOT_NONE_POP", uops)
def global_identity(x):
return x

2
Misc/NEWS.d/next/Core_and_Builtins/2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst Normal file
View file

@ -0,0 +1,2 @@
Split ``CALL_TYPE_1`` into several uops allowing the JIT to remove some of
them.

21
Python/bytecodes.c
View file

@ -3966,20 +3966,35 @@ dummy_func(
_SAVE_RETURN_OFFSET +
_PUSH_FRAME;
inst(CALL_TYPE_1, (unused/1, unused/2, callable, null, arg -- res)) {
op(_GUARD_NOS_NULL, (null, unused -- null, unused)) {
DEOPT_IF(!PyStackRef_IsNull(null));
}
op(_GUARD_CALLABLE_TYPE_1, (callable, unused, unused -- callable, unused, unused)) {
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
DEOPT_IF(callable_o != (PyObject *)&PyType_Type);
}
op(_CALL_TYPE_1, (callable, null, arg -- res)) {
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
assert(oparg == 1);
DEOPT_IF(!PyStackRef_IsNull(null));
DEAD(null);
DEOPT_IF(callable_o != (PyObject *)&PyType_Type);
DEAD(callable);
(void)callable; // Silence compiler warnings about unused variables
(void)null;
STAT_INC(CALL, hit);
res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
PyStackRef_CLOSE(arg);
}
macro(CALL_TYPE_1) =
unused/1 +
unused/2 +
_GUARD_NOS_NULL +
_GUARD_CALLABLE_TYPE_1 +
_CALL_TYPE_1;
op(_CALL_STR_1, (callable, null, arg -- res)) {
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);

32
Python/executor_cases.c.h generated
View file

@ -5127,6 +5127,27 @@
break;
}
case _GUARD_NOS_NULL: {
_PyStackRef null;
null = stack_pointer[-2];
if (!PyStackRef_IsNull(null)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _GUARD_CALLABLE_TYPE_1: {
_PyStackRef callable;
callable = stack_pointer[-3];
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
if (callable_o != (PyObject *)&PyType_Type) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _CALL_TYPE_1: {
_PyStackRef arg;
_PyStackRef null;
@ -5136,17 +5157,10 @@
arg = stack_pointer[-1];
null = stack_pointer[-2];
callable = stack_pointer[-3];
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
assert(oparg == 1);
if (!PyStackRef_IsNull(null)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (callable_o != (PyObject *)&PyType_Type) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
(void)callable;
(void)null;
STAT_INC(CALL, hit);
res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
stack_pointer[-3] = res;

57
Python/generated_cases.c.h generated
View file

@ -4292,36 +4292,47 @@
next_instr += 4;
INSTRUCTION_STATS(CALL_TYPE_1);
static_assert(INLINE_CACHE_ENTRIES_CALL == 3, "incorrect cache size");
_PyStackRef callable;
_PyStackRef null;
_PyStackRef callable;
_PyStackRef arg;
_PyStackRef res;
/* Skip 1 cache entry */
/* Skip 2 cache entries */
arg = stack_pointer[-1];
null = stack_pointer[-2];
callable = stack_pointer[-3];
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
assert(oparg == 1);
if (!PyStackRef_IsNull(null)) {
UPDATE_MISS_STATS(CALL);
assert(_PyOpcode_Deopt[opcode] == (CALL));
JUMP_TO_PREDICTED(CALL);
// _GUARD_NOS_NULL
{
null = stack_pointer[-2];
if (!PyStackRef_IsNull(null)) {
UPDATE_MISS_STATS(CALL);
assert(_PyOpcode_Deopt[opcode] == (CALL));
JUMP_TO_PREDICTED(CALL);
}
}
if (callable_o != (PyObject *)&PyType_Type) {
UPDATE_MISS_STATS(CALL);
assert(_PyOpcode_Deopt[opcode] == (CALL));
JUMP_TO_PREDICTED(CALL);
// _GUARD_CALLABLE_TYPE_1
{
callable = stack_pointer[-3];
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
if (callable_o != (PyObject *)&PyType_Type) {
UPDATE_MISS_STATS(CALL);
assert(_PyOpcode_Deopt[opcode] == (CALL));
JUMP_TO_PREDICTED(CALL);
}
}
// _CALL_TYPE_1
{
arg = stack_pointer[-1];
PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
assert(oparg == 1);
(void)callable;
(void)null;
STAT_INC(CALL, hit);
res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
stack_pointer[-3] = res;
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(arg);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
STAT_INC(CALL, hit);
res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
stack_pointer[-3] = res;
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(arg);
stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH();
}

22
Python/optimizer_bytecodes.c
View file

@ -846,6 +846,15 @@ dummy_func(void) {
next = sym_new_type(ctx, &PyLong_Type);
}
op(_CALL_TYPE_1, (unused, unused, arg -- res)) {
if (sym_has_type(arg)) {
res = sym_new_const(ctx, (PyObject *)sym_get_type(arg));
}
else {
res = sym_new_not_null(ctx);
}
}
op(_GUARD_IS_TRUE_POP, (flag -- )) {
if (sym_is_const(ctx, flag)) {
PyObject *value = sym_get_const(ctx, flag);
@ -998,6 +1007,19 @@ dummy_func(void) {
}
}
op(_GUARD_NOS_NULL, (null, unused -- null, unused)) {
if (sym_is_null(null)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_null(null);
}
op(_GUARD_CALLABLE_TYPE_1, (callable, unused, unused -- callable, unused, unused)) {
if (sym_get_const(ctx, callable) == (PyObject *)&PyType_Type) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_const(callable, (PyObject *)&PyType_Type);
}
// END BYTECODES //

29
Python/optimizer_cases.c.h generated
View file

@ -1856,9 +1856,36 @@
break;
}
case _GUARD_NOS_NULL: {
JitOptSymbol *null;
null = stack_pointer[-2];
if (sym_is_null(null)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_null(null);
break;
}
case _GUARD_CALLABLE_TYPE_1: {
JitOptSymbol *callable;
callable = stack_pointer[-3];
if (sym_get_const(ctx, callable) == (PyObject *)&PyType_Type) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_const(callable, (PyObject *)&PyType_Type);
break;
}
case _CALL_TYPE_1: {
JitOptSymbol *arg;
JitOptSymbol *res;
res = sym_new_not_null(ctx);
arg = stack_pointer[-1];
if (sym_has_type(arg)) {
res = sym_new_const(ctx, (PyObject *)sym_get_type(arg));
}
else {
res = sym_new_not_null(ctx);
}
stack_pointer[-3] = res;
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());