From 67ae6180e4a4b642fc6e134115045c48e2e489e9 Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Thu, 10 Apr 2025 08:20:40 +0200 Subject: [PATCH 1/9] Split `CALL_TYPE_1` into several uops. --- Include/internal/pycore_opcode_metadata.h | 2 +- Include/internal/pycore_uop_ids.h | 354 +++++++++++----------- Include/internal/pycore_uop_metadata.h | 10 +- Lib/test/test_capi/test_opt.py | 14 + Python/bytecodes.c | 19 +- Python/executor_cases.c.h | 30 +- Python/generated_cases.c.h | 55 ++-- Python/optimizer_bytecodes.c | 21 ++ Python/optimizer_cases.c.h | 26 +- 9 files changed, 317 insertions(+), 214 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 521f7a92cf08c4..6a61107c0b182f 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -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 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index e9a536919da598..b72b23c8d21988 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -51,106 +51,108 @@ 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 _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 _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -160,163 +162,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 404 +#define _IS_NONE 407 #define _IS_OP IS_OP -#define _ITER_CHECK_LIST 405 -#define _ITER_CHECK_RANGE 406 -#define _ITER_CHECK_TUPLE 407 -#define _ITER_JUMP_LIST 408 -#define _ITER_JUMP_RANGE 409 -#define _ITER_JUMP_TUPLE 410 -#define _ITER_NEXT_LIST 411 -#define _ITER_NEXT_LIST_TIER_TWO 412 -#define _ITER_NEXT_RANGE 413 -#define _ITER_NEXT_TUPLE 414 -#define _JUMP_TO_TOP 415 +#define _ITER_CHECK_LIST 408 +#define _ITER_CHECK_RANGE 409 +#define _ITER_CHECK_TUPLE 410 +#define _ITER_JUMP_LIST 411 +#define _ITER_JUMP_RANGE 412 +#define _ITER_JUMP_TUPLE 413 +#define _ITER_NEXT_LIST 414 +#define _ITER_NEXT_LIST_TIER_TWO 415 +#define _ITER_NEXT_RANGE 416 +#define _ITER_NEXT_TUPLE 417 +#define _JUMP_TO_TOP 418 #define _LIST_APPEND LIST_APPEND #define _LIST_EXTEND LIST_EXTEND -#define _LOAD_ATTR 416 -#define _LOAD_ATTR_CLASS 417 +#define _LOAD_ATTR 419 +#define _LOAD_ATTR_CLASS 420 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN -#define _LOAD_ATTR_INSTANCE_VALUE 418 -#define _LOAD_ATTR_METHOD_LAZY_DICT 419 -#define _LOAD_ATTR_METHOD_NO_DICT 420 -#define _LOAD_ATTR_METHOD_WITH_VALUES 421 -#define _LOAD_ATTR_MODULE 422 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 423 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 424 -#define _LOAD_ATTR_PROPERTY_FRAME 425 -#define _LOAD_ATTR_SLOT 426 -#define _LOAD_ATTR_WITH_HINT 427 +#define _LOAD_ATTR_INSTANCE_VALUE 421 +#define _LOAD_ATTR_METHOD_LAZY_DICT 422 +#define _LOAD_ATTR_METHOD_NO_DICT 423 +#define _LOAD_ATTR_METHOD_WITH_VALUES 424 +#define _LOAD_ATTR_MODULE 425 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 426 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 427 +#define _LOAD_ATTR_PROPERTY_FRAME 428 +#define _LOAD_ATTR_SLOT 429 +#define _LOAD_ATTR_WITH_HINT 430 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 428 +#define _LOAD_BYTECODE 431 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL -#define _LOAD_CONST_INLINE 429 -#define _LOAD_CONST_INLINE_BORROW 430 +#define _LOAD_CONST_INLINE 432 +#define _LOAD_CONST_INLINE_BORROW 433 #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL #define _LOAD_DEREF LOAD_DEREF -#define _LOAD_FAST 431 -#define _LOAD_FAST_0 432 -#define _LOAD_FAST_1 433 -#define _LOAD_FAST_2 434 -#define _LOAD_FAST_3 435 -#define _LOAD_FAST_4 436 -#define _LOAD_FAST_5 437 -#define _LOAD_FAST_6 438 -#define _LOAD_FAST_7 439 +#define _LOAD_FAST 434 +#define _LOAD_FAST_0 435 +#define _LOAD_FAST_1 436 +#define _LOAD_FAST_2 437 +#define _LOAD_FAST_3 438 +#define _LOAD_FAST_4 439 +#define _LOAD_FAST_5 440 +#define _LOAD_FAST_6 441 +#define _LOAD_FAST_7 442 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 440 -#define _LOAD_FAST_BORROW_0 441 -#define _LOAD_FAST_BORROW_1 442 -#define _LOAD_FAST_BORROW_2 443 -#define _LOAD_FAST_BORROW_3 444 -#define _LOAD_FAST_BORROW_4 445 -#define _LOAD_FAST_BORROW_5 446 -#define _LOAD_FAST_BORROW_6 447 -#define _LOAD_FAST_BORROW_7 448 +#define _LOAD_FAST_BORROW 443 +#define _LOAD_FAST_BORROW_0 444 +#define _LOAD_FAST_BORROW_1 445 +#define _LOAD_FAST_BORROW_2 446 +#define _LOAD_FAST_BORROW_3 447 +#define _LOAD_FAST_BORROW_4 448 +#define _LOAD_FAST_BORROW_5 449 +#define _LOAD_FAST_BORROW_6 450 +#define _LOAD_FAST_BORROW_7 451 #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 449 -#define _LOAD_GLOBAL_BUILTINS 450 -#define _LOAD_GLOBAL_MODULE 451 +#define _LOAD_GLOBAL 452 +#define _LOAD_GLOBAL_BUILTINS 453 +#define _LOAD_GLOBAL_MODULE 454 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 452 -#define _LOAD_SMALL_INT_0 453 -#define _LOAD_SMALL_INT_1 454 -#define _LOAD_SMALL_INT_2 455 -#define _LOAD_SMALL_INT_3 456 +#define _LOAD_SMALL_INT 455 +#define _LOAD_SMALL_INT_0 456 +#define _LOAD_SMALL_INT_1 457 +#define _LOAD_SMALL_INT_2 458 +#define _LOAD_SMALL_INT_3 459 #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 457 +#define _MAKE_CALLARGS_A_TUPLE 460 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_WARM 458 +#define _MAKE_WARM 461 #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 459 -#define _MAYBE_EXPAND_METHOD_KW 460 -#define _MONITOR_CALL 461 -#define _MONITOR_CALL_KW 462 -#define _MONITOR_JUMP_BACKWARD 463 -#define _MONITOR_RESUME 464 +#define _MAYBE_EXPAND_METHOD 462 +#define _MAYBE_EXPAND_METHOD_KW 463 +#define _MONITOR_CALL 464 +#define _MONITOR_CALL_KW 465 +#define _MONITOR_JUMP_BACKWARD 466 +#define _MONITOR_RESUME 467 #define _NOP NOP #define _POP_EXCEPT POP_EXCEPT -#define _POP_JUMP_IF_FALSE 465 -#define _POP_JUMP_IF_TRUE 466 +#define _POP_JUMP_IF_FALSE 468 +#define _POP_JUMP_IF_TRUE 469 #define _POP_TOP POP_TOP -#define _POP_TOP_LOAD_CONST_INLINE 467 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 468 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 469 +#define _POP_TOP_LOAD_CONST_INLINE 470 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW 471 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW 472 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 470 +#define _PUSH_FRAME 473 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 471 -#define _PY_FRAME_GENERAL 472 -#define _PY_FRAME_KW 473 -#define _QUICKEN_RESUME 474 -#define _REPLACE_WITH_TRUE 475 +#define _PUSH_NULL_CONDITIONAL 474 +#define _PY_FRAME_GENERAL 475 +#define _PY_FRAME_KW 476 +#define _QUICKEN_RESUME 477 +#define _REPLACE_WITH_TRUE 478 #define _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_VALUE RETURN_VALUE -#define _SAVE_RETURN_OFFSET 476 -#define _SEND 477 -#define _SEND_GEN_FRAME 478 +#define _SAVE_RETURN_OFFSET 479 +#define _SEND 480 +#define _SEND_GEN_FRAME 481 #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 479 -#define _STORE_ATTR 480 -#define _STORE_ATTR_INSTANCE_VALUE 481 -#define _STORE_ATTR_SLOT 482 -#define _STORE_ATTR_WITH_HINT 483 +#define _START_EXECUTOR 482 +#define _STORE_ATTR 483 +#define _STORE_ATTR_INSTANCE_VALUE 484 +#define _STORE_ATTR_SLOT 485 +#define _STORE_ATTR_WITH_HINT 486 #define _STORE_DEREF STORE_DEREF -#define _STORE_FAST 484 -#define _STORE_FAST_0 485 -#define _STORE_FAST_1 486 -#define _STORE_FAST_2 487 -#define _STORE_FAST_3 488 -#define _STORE_FAST_4 489 -#define _STORE_FAST_5 490 -#define _STORE_FAST_6 491 -#define _STORE_FAST_7 492 +#define _STORE_FAST 487 +#define _STORE_FAST_0 488 +#define _STORE_FAST_1 489 +#define _STORE_FAST_2 490 +#define _STORE_FAST_3 491 +#define _STORE_FAST_4 492 +#define _STORE_FAST_5 493 +#define _STORE_FAST_6 494 +#define _STORE_FAST_7 495 #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 493 -#define _STORE_SUBSCR 494 -#define _STORE_SUBSCR_DICT 495 -#define _STORE_SUBSCR_LIST_INT 496 +#define _STORE_SLICE 496 +#define _STORE_SUBSCR 497 +#define _STORE_SUBSCR_DICT 498 +#define _STORE_SUBSCR_LIST_INT 499 #define _SWAP SWAP -#define _TIER2_RESUME_CHECK 497 -#define _TO_BOOL 498 +#define _TIER2_RESUME_CHECK 500 +#define _TO_BOOL 501 #define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_INT TO_BOOL_INT -#define _TO_BOOL_LIST 499 +#define _TO_BOOL_LIST 502 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 500 +#define _TO_BOOL_STR 503 #define _UNARY_INVERT UNARY_INVERT #define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 501 -#define _UNPACK_SEQUENCE_LIST 502 -#define _UNPACK_SEQUENCE_TUPLE 503 -#define _UNPACK_SEQUENCE_TWO_TUPLE 504 +#define _UNPACK_SEQUENCE 504 +#define _UNPACK_SEQUENCE_LIST 505 +#define _UNPACK_SEQUENCE_TUPLE 506 +#define _UNPACK_SEQUENCE_TWO_TUPLE 507 #define _WITH_EXCEPT_START WITH_EXCEPT_START #define _YIELD_VALUE YIELD_VALUE -#define MAX_UOP_ID 504 +#define MAX_UOP_ID 507 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 8fa50ff2c291c4..e845d75e170471 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -240,7 +240,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, @@ -410,6 +412,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", @@ -422,6 +425,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", @@ -1032,6 +1036,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: diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index c0e771a0d59c4f..8124edd9f8c719 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1767,6 +1767,20 @@ def testfunc(n): self.assertNotIn("_GUARD_TOS_UNICODE", uops) self.assertIn("_BINARY_OP_ADD_UNICODE", uops) + def test_call_type_1(self): + def testfunc(n): + for _ in range(n): + x = type(42) + return x + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertEqual(res, int) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_CALL_TYPE_1", uops) + self.assertNotIn("_GUARD_NOS_NULL", uops) + self.assertNotIn("_GUARD_NOS_TYPE", uops) + def global_identity(x): return x diff --git a/Python/bytecodes.c b/Python/bytecodes.c index e9dced654d1492..22bb40976114ae 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -3960,20 +3960,33 @@ 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); 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); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 938a80fe665c0b..e690d44655622d 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5115,6 +5115,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; @@ -5124,17 +5145,8 @@ 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(); - } STAT_INC(CALL, hit); res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o)); stack_pointer[-3] = res; diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 97bffce8d82767..d45e5b0fef9e75 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -4255,36 +4255,45 @@ 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); + 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(); } diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 8e1eacfec83e95..ee19f45177c2dc 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -846,6 +846,10 @@ dummy_func(void) { next = sym_new_type(ctx, &PyLong_Type); } + op(_CALL_TYPE_1, (callable, null, arg -- res)) { + res = sym_new_type(ctx, &PyType_Type); + } + op(_GUARD_IS_TRUE_POP, (flag -- )) { if (sym_is_const(ctx, flag)) { PyObject *value = sym_get_const(ctx, flag); @@ -980,6 +984,23 @@ 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, unused2 -- callable, unused, unused2)) { + if (sym_is_const(ctx, callable)) { + PyObject *value = sym_get_const(ctx, callable); + assert(value != NULL); + if (value == (PyObject *)&PyType_Type) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + } + sym_set_const(callable, (PyObject *)&PyType_Type); + } // END BYTECODES // diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 0c617137a8893d..2b1254cfa88ba8 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1845,9 +1845,33 @@ 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_is_const(ctx, callable)) { + PyObject *value = sym_get_const(ctx, callable); + assert(value != NULL); + if (value == (PyObject *)&PyType_Type) { + REPLACE_OP(this_instr, _NOP, 0, 0); + } + } + sym_set_const(callable, (PyObject *)&PyType_Type); + break; + } + case _CALL_TYPE_1: { JitOptSymbol *res; - res = sym_new_not_null(ctx); + res = sym_new_type(ctx, &PyType_Type); stack_pointer[-3] = res; stack_pointer += -2; assert(WITHIN_STACK_BOUNDS()); From c8ca78716c604e19e33d6def39de0c93214784a7 Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Fri, 11 Apr 2025 22:01:17 +0200 Subject: [PATCH 2/9] Add news entry --- .../2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst new file mode 100644 index 00000000000000..4b23034fc3e11a --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-11-22-01-07.gh-issue-131798.TTu_xH.rst @@ -0,0 +1,2 @@ +Split ``CALL_TYPE_1`` into several uops allowing the JIT to remove some of +them. From 9e1bb988ecbf0edc09cada0959731291347437be Mon Sep 17 00:00:00 2001 From: "Tomas R." Date: Fri, 11 Apr 2025 22:44:38 +0200 Subject: [PATCH 3/9] Simplify `_GUARD_CALLABLE_TYPE_1` Co-authored-by: Brandt Bucher --- Python/optimizer_bytecodes.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index ee19f45177c2dc..8c2dd29a41841e 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -992,12 +992,8 @@ dummy_func(void) { } op(_GUARD_CALLABLE_TYPE_1, (callable, unused, unused2 -- callable, unused, unused2)) { - if (sym_is_const(ctx, callable)) { - PyObject *value = sym_get_const(ctx, callable); - assert(value != NULL); - if (value == (PyObject *)&PyType_Type) { - REPLACE_OP(this_instr, _NOP, 0, 0); - } + if (sym_get_const(ctx, callable) == (PyObject *)&PyType_Type) { + REPLACE_OP(this_instr, _NOP, 0, 0); } sym_set_const(callable, (PyObject *)&PyType_Type); } From 8e03efc5833a113ee9c4ae4b3364b7718d53eb57 Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Fri, 11 Apr 2025 22:52:41 +0200 Subject: [PATCH 4/9] Improve _CALL_TYPE_1 --- Python/optimizer_bytecodes.c | 6 +++++- Python/optimizer_cases.c.h | 16 +++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 8c2dd29a41841e..94f636c211d3df 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -847,7 +847,11 @@ dummy_func(void) { } op(_CALL_TYPE_1, (callable, null, arg -- res)) { - res = sym_new_type(ctx, &PyType_Type); + 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 -- )) { diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 2b1254cfa88ba8..56c26f1a2c7202 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1858,20 +1858,22 @@ case _GUARD_CALLABLE_TYPE_1: { JitOptSymbol *callable; callable = stack_pointer[-3]; - if (sym_is_const(ctx, callable)) { - PyObject *value = sym_get_const(ctx, callable); - assert(value != NULL); - if (value == (PyObject *)&PyType_Type) { - REPLACE_OP(this_instr, _NOP, 0, 0); - } + 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_type(ctx, &PyType_Type); + 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()); From 8984add1d4bbe449b26354a5e557dd5f2cc5a894 Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Sat, 12 Apr 2025 13:53:52 +0200 Subject: [PATCH 5/9] Fix test --- Lib/test/test_capi/test_opt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 8124edd9f8c719..ed8d62c2c6e136 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1779,7 +1779,7 @@ def testfunc(n): uops = get_opnames(ex) self.assertIn("_CALL_TYPE_1", uops) self.assertNotIn("_GUARD_NOS_NULL", uops) - self.assertNotIn("_GUARD_NOS_TYPE", uops) + self.assertNotIn("_GUARD_CALLABLE_TYPE_1", uops) def global_identity(x): From 8a0152f58e0e37df86d6f33cab46f7eb392adcbe Mon Sep 17 00:00:00 2001 From: "Tomas R." Date: Sat, 12 Apr 2025 22:54:32 +0200 Subject: [PATCH 6/9] PEP7 Co-authored-by: Brandt Bucher --- Python/optimizer_bytecodes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 94f636c211d3df..5e8209fefd1a60 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -848,8 +848,9 @@ dummy_func(void) { op(_CALL_TYPE_1, (callable, null, arg -- res)) { if (sym_has_type(arg)) { - res = sym_new_const(ctx, (PyObject*)sym_get_type(arg)); - } else { + res = sym_new_const(ctx, (PyObject *)sym_get_type(arg)); + } + else { res = sym_new_not_null(ctx); } } From 0f6c12b2e590dbd2019383edcff99a30e8f7640d Mon Sep 17 00:00:00 2001 From: "Tomas R." Date: Sat, 12 Apr 2025 22:59:28 +0200 Subject: [PATCH 7/9] Improve test Co-authored-by: Brandt Bucher --- Lib/test/test_capi/test_opt.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index ed8d62c2c6e136..3e68c60b18a11b 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1769,12 +1769,13 @@ def testfunc(n): def test_call_type_1(self): def testfunc(n): + x = 0 for _ in range(n): - x = type(42) + x += type(42) is int return x res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) - self.assertEqual(res, int) + self.assertEqual(res, TIER2_THRESHOLD) self.assertIsNotNone(ex) uops = get_opnames(ex) self.assertIn("_CALL_TYPE_1", uops) From 809782694488ae644da3ee1128aea95448d15dad Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Sun, 13 Apr 2025 12:45:53 +0200 Subject: [PATCH 8/9] Regenerate files --- Python/optimizer_cases.c.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 56c26f1a2c7202..2bef9f4f240f21 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1870,8 +1870,9 @@ JitOptSymbol *res; arg = stack_pointer[-1]; if (sym_has_type(arg)) { - res = sym_new_const(ctx, (PyObject*)sym_get_type(arg)); - } else { + res = sym_new_const(ctx, (PyObject *)sym_get_type(arg)); + } + else { res = sym_new_not_null(ctx); } stack_pointer[-3] = res; From 218dc00b38b69e6f614a037c7a01c756b426baf9 Mon Sep 17 00:00:00 2001 From: Tomas Roun Date: Mon, 14 Apr 2025 21:26:37 +0200 Subject: [PATCH 9/9] Add a test --- Lib/test/test_capi/test_opt.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 3e68c60b18a11b..800729cdd3ab25 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1782,6 +1782,22 @@ def testfunc(n): 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