mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-100239: specialize BINARY_OP/SUBSCR for list-slice (#132626)

Browse source
This commit is contained in:
Irit Katriel 2025-05-01 11:28:52 +01:00 • committed by GitHub
parent 3831752689
commit 5529213d4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 552 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/cpython/pystats.h
View file

@ -29,7 +29,7 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#define PYSTATS_MAX_UOP_ID 512 #define PYSTATS_MAX_UOP_ID 1024
#define SPECIALIZATION_FAILURE_KINDS 60 #define SPECIALIZATION_FAILURE_KINDS 60

3
Include/internal/pycore_list.h
View file

@ -13,10 +13,13 @@ extern "C" {
#endif #endif
PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject *, PyObject *); PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject *, PyObject *);
PyAPI_FUNC(PyObject) *_PyList_SliceSubscript(PyObject*, PyObject*);
extern void _PyList_DebugMallocStats(FILE *out); extern void _PyList_DebugMallocStats(FILE *out);
// _PyList_GetItemRef should be used only when the object is known as a list // _PyList_GetItemRef should be used only when the object is known as a list
// because it doesn't raise TypeError when the object is not a list, whereas PyList_GetItemRef does. // because it doesn't raise TypeError when the object is not a list, whereas PyList_GetItemRef does.
extern PyObject* _PyList_GetItemRef(PyListObject *, Py_ssize_t i); extern PyObject* _PyList_GetItemRef(PyListObject *, Py_ssize_t i);
#ifdef Py_GIL_DISABLED #ifdef Py_GIL_DISABLED
// Returns -1 in case of races with other threads. // Returns -1 in case of races with other threads.
extern int _PyList_GetItemRefNoLock(PyListObject *, Py_ssize_t, _PyStackRef *); extern int _PyList_GetItemRefNoLock(PyListObject *, Py_ssize_t, _PyStackRef *);

9
Include/internal/pycore_opcode_metadata.h generated
View file

@ -60,6 +60,8 @@ int _PyOpcode_num_popped(int opcode, int oparg) {
return 2; return 2;
case BINARY_OP_SUBSCR_LIST_INT: case BINARY_OP_SUBSCR_LIST_INT:
return 2; return 2;
case BINARY_OP_SUBSCR_LIST_SLICE:
return 2;
case BINARY_OP_SUBSCR_STR_INT: case BINARY_OP_SUBSCR_STR_INT:
return 2; return 2;
case BINARY_OP_SUBSCR_TUPLE_INT: case BINARY_OP_SUBSCR_TUPLE_INT:
@ -545,6 +547,8 @@ int _PyOpcode_num_pushed(int opcode, int oparg) {
return 0; return 0;
case BINARY_OP_SUBSCR_LIST_INT: case BINARY_OP_SUBSCR_LIST_INT:
return 1; return 1;
case BINARY_OP_SUBSCR_LIST_SLICE:
return 1;
case BINARY_OP_SUBSCR_STR_INT: case BINARY_OP_SUBSCR_STR_INT:
return 1; return 1;
case BINARY_OP_SUBSCR_TUPLE_INT: case BINARY_OP_SUBSCR_TUPLE_INT:
@ -1085,6 +1089,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = {
[BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG }, [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG },
[BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_LIST_SLICE] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG }, [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG },
[BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG }, [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG },
@ -1335,6 +1340,7 @@ _PyOpcode_macro_expansion[256] = {
[BINARY_OP_SUBSCR_DICT] = { .nuops = 2, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_DICT] = { .nuops = 2, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_LIST_SLICE] = { .nuops = 3, .uops = { { _GUARD_TOS_SLICE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_SLICE, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } },
@ -1524,6 +1530,7 @@ const char *_PyOpcode_OpName[267] = {
[BINARY_OP_SUBSCR_DICT] = "BINARY_OP_SUBSCR_DICT", [BINARY_OP_SUBSCR_DICT] = "BINARY_OP_SUBSCR_DICT",
[BINARY_OP_SUBSCR_GETITEM] = "BINARY_OP_SUBSCR_GETITEM", [BINARY_OP_SUBSCR_GETITEM] = "BINARY_OP_SUBSCR_GETITEM",
[BINARY_OP_SUBSCR_LIST_INT] = "BINARY_OP_SUBSCR_LIST_INT", [BINARY_OP_SUBSCR_LIST_INT] = "BINARY_OP_SUBSCR_LIST_INT",
[BINARY_OP_SUBSCR_LIST_SLICE] = "BINARY_OP_SUBSCR_LIST_SLICE",
[BINARY_OP_SUBSCR_STR_INT] = "BINARY_OP_SUBSCR_STR_INT", [BINARY_OP_SUBSCR_STR_INT] = "BINARY_OP_SUBSCR_STR_INT",
[BINARY_OP_SUBSCR_TUPLE_INT] = "BINARY_OP_SUBSCR_TUPLE_INT", [BINARY_OP_SUBSCR_TUPLE_INT] = "BINARY_OP_SUBSCR_TUPLE_INT",
[BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT", [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT",
@ -1791,6 +1798,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
[BINARY_OP_SUBSCR_DICT] = BINARY_OP, [BINARY_OP_SUBSCR_DICT] = BINARY_OP,
[BINARY_OP_SUBSCR_GETITEM] = BINARY_OP, [BINARY_OP_SUBSCR_GETITEM] = BINARY_OP,
[BINARY_OP_SUBSCR_LIST_INT] = BINARY_OP, [BINARY_OP_SUBSCR_LIST_INT] = BINARY_OP,
[BINARY_OP_SUBSCR_LIST_SLICE] = BINARY_OP,
[BINARY_OP_SUBSCR_STR_INT] = BINARY_OP, [BINARY_OP_SUBSCR_STR_INT] = BINARY_OP,
[BINARY_OP_SUBSCR_TUPLE_INT] = BINARY_OP, [BINARY_OP_SUBSCR_TUPLE_INT] = BINARY_OP,
[BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP, [BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP,
@ -2018,7 +2026,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
case 125: \ case 125: \
case 126: \ case 126: \
case 127: \ case 127: \
case 211: \
case 212: \ case 212: \
case 213: \ case 213: \
case 214: \ case 214: \

400
Include/internal/pycore_uop_ids.h generated
View file

@ -23,11 +23,12 @@ extern "C" {
#define _BINARY_OP_SUBSCR_DICT 311 #define _BINARY_OP_SUBSCR_DICT 311
#define _BINARY_OP_SUBSCR_INIT_CALL 312 #define _BINARY_OP_SUBSCR_INIT_CALL 312
#define _BINARY_OP_SUBSCR_LIST_INT 313 #define _BINARY_OP_SUBSCR_LIST_INT 313
#define _BINARY_OP_SUBSCR_STR_INT 314 #define _BINARY_OP_SUBSCR_LIST_SLICE 314
#define _BINARY_OP_SUBSCR_TUPLE_INT 315 #define _BINARY_OP_SUBSCR_STR_INT 315
#define _BINARY_OP_SUBTRACT_FLOAT 316 #define _BINARY_OP_SUBSCR_TUPLE_INT 316
#define _BINARY_OP_SUBTRACT_INT 317 #define _BINARY_OP_SUBTRACT_FLOAT 317
#define _BINARY_SLICE 318 #define _BINARY_OP_SUBTRACT_INT 318
#define _BINARY_SLICE 319
#define _BUILD_INTERPOLATION BUILD_INTERPOLATION #define _BUILD_INTERPOLATION BUILD_INTERPOLATION
#define _BUILD_LIST BUILD_LIST #define _BUILD_LIST BUILD_LIST
#define _BUILD_MAP BUILD_MAP #define _BUILD_MAP BUILD_MAP
@ -36,128 +37,129 @@ extern "C" {
#define _BUILD_STRING BUILD_STRING #define _BUILD_STRING BUILD_STRING
#define _BUILD_TEMPLATE BUILD_TEMPLATE #define _BUILD_TEMPLATE BUILD_TEMPLATE
#define _BUILD_TUPLE BUILD_TUPLE #define _BUILD_TUPLE BUILD_TUPLE
#define _CALL_BUILTIN_CLASS 319 #define _CALL_BUILTIN_CLASS 320
#define _CALL_BUILTIN_FAST 320 #define _CALL_BUILTIN_FAST 321
#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 321 #define _CALL_BUILTIN_FAST_WITH_KEYWORDS 322
#define _CALL_BUILTIN_O 322 #define _CALL_BUILTIN_O 323
#define _CALL_INTRINSIC_1 CALL_INTRINSIC_1 #define _CALL_INTRINSIC_1 CALL_INTRINSIC_1
#define _CALL_INTRINSIC_2 CALL_INTRINSIC_2 #define _CALL_INTRINSIC_2 CALL_INTRINSIC_2
#define _CALL_ISINSTANCE CALL_ISINSTANCE #define _CALL_ISINSTANCE CALL_ISINSTANCE
#define _CALL_KW_NON_PY 323 #define _CALL_KW_NON_PY 324
#define _CALL_LEN CALL_LEN #define _CALL_LEN CALL_LEN
#define _CALL_LIST_APPEND CALL_LIST_APPEND #define _CALL_LIST_APPEND CALL_LIST_APPEND
#define _CALL_METHOD_DESCRIPTOR_FAST 324 #define _CALL_METHOD_DESCRIPTOR_FAST 325
#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 325 #define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 326
#define _CALL_METHOD_DESCRIPTOR_NOARGS 326 #define _CALL_METHOD_DESCRIPTOR_NOARGS 327
#define _CALL_METHOD_DESCRIPTOR_O 327 #define _CALL_METHOD_DESCRIPTOR_O 328
#define _CALL_NON_PY_GENERAL 328 #define _CALL_NON_PY_GENERAL 329
#define _CALL_STR_1 329 #define _CALL_STR_1 330
#define _CALL_TUPLE_1 330 #define _CALL_TUPLE_1 331
#define _CALL_TYPE_1 331 #define _CALL_TYPE_1 332
#define _CHECK_AND_ALLOCATE_OBJECT 332 #define _CHECK_AND_ALLOCATE_OBJECT 333
#define _CHECK_ATTR_CLASS 333 #define _CHECK_ATTR_CLASS 334
#define _CHECK_ATTR_METHOD_LAZY_DICT 334 #define _CHECK_ATTR_METHOD_LAZY_DICT 335
#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 335 #define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 336
#define _CHECK_EG_MATCH CHECK_EG_MATCH #define _CHECK_EG_MATCH CHECK_EG_MATCH
#define _CHECK_EXC_MATCH CHECK_EXC_MATCH #define _CHECK_EXC_MATCH CHECK_EXC_MATCH
#define _CHECK_FUNCTION 336 #define _CHECK_FUNCTION 337
#define _CHECK_FUNCTION_EXACT_ARGS 337 #define _CHECK_FUNCTION_EXACT_ARGS 338
#define _CHECK_FUNCTION_VERSION 338 #define _CHECK_FUNCTION_VERSION 339
#define _CHECK_FUNCTION_VERSION_INLINE 339 #define _CHECK_FUNCTION_VERSION_INLINE 340
#define _CHECK_FUNCTION_VERSION_KW 340 #define _CHECK_FUNCTION_VERSION_KW 341
#define _CHECK_IS_NOT_PY_CALLABLE 341 #define _CHECK_IS_NOT_PY_CALLABLE 342
#define _CHECK_IS_NOT_PY_CALLABLE_KW 342 #define _CHECK_IS_NOT_PY_CALLABLE_KW 343
#define _CHECK_MANAGED_OBJECT_HAS_VALUES 343 #define _CHECK_MANAGED_OBJECT_HAS_VALUES 344
#define _CHECK_METHOD_VERSION 344 #define _CHECK_METHOD_VERSION 345
#define _CHECK_METHOD_VERSION_KW 345 #define _CHECK_METHOD_VERSION_KW 346
#define _CHECK_PEP_523 346 #define _CHECK_PEP_523 347
#define _CHECK_PERIODIC 347 #define _CHECK_PERIODIC 348
#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 348 #define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 349
#define _CHECK_STACK_SPACE 349 #define _CHECK_STACK_SPACE 350
#define _CHECK_STACK_SPACE_OPERAND 350 #define _CHECK_STACK_SPACE_OPERAND 351
#define _CHECK_VALIDITY 351 #define _CHECK_VALIDITY 352
#define _COMPARE_OP 352 #define _COMPARE_OP 353
#define _COMPARE_OP_FLOAT 353 #define _COMPARE_OP_FLOAT 354
#define _COMPARE_OP_INT 354 #define _COMPARE_OP_INT 355
#define _COMPARE_OP_STR 355 #define _COMPARE_OP_STR 356
#define _CONTAINS_OP 356 #define _CONTAINS_OP 357
#define _CONTAINS_OP_DICT 357 #define _CONTAINS_OP_DICT 358
#define _CONTAINS_OP_SET 358 #define _CONTAINS_OP_SET 359
#define _CONVERT_VALUE CONVERT_VALUE #define _CONVERT_VALUE CONVERT_VALUE
#define _COPY COPY #define _COPY COPY
#define _COPY_FREE_VARS COPY_FREE_VARS #define _COPY_FREE_VARS COPY_FREE_VARS
#define _CREATE_INIT_FRAME 359 #define _CREATE_INIT_FRAME 360
#define _DELETE_ATTR DELETE_ATTR #define _DELETE_ATTR DELETE_ATTR
#define _DELETE_DEREF DELETE_DEREF #define _DELETE_DEREF DELETE_DEREF
#define _DELETE_FAST DELETE_FAST #define _DELETE_FAST DELETE_FAST
#define _DELETE_GLOBAL DELETE_GLOBAL #define _DELETE_GLOBAL DELETE_GLOBAL
#define _DELETE_NAME DELETE_NAME #define _DELETE_NAME DELETE_NAME
#define _DELETE_SUBSCR DELETE_SUBSCR #define _DELETE_SUBSCR DELETE_SUBSCR
#define _DEOPT 360 #define _DEOPT 361
#define _DICT_MERGE DICT_MERGE #define _DICT_MERGE DICT_MERGE
#define _DICT_UPDATE DICT_UPDATE #define _DICT_UPDATE DICT_UPDATE
#define _DO_CALL 361 #define _DO_CALL 362
#define _DO_CALL_FUNCTION_EX 362 #define _DO_CALL_FUNCTION_EX 363
#define _DO_CALL_KW 363 #define _DO_CALL_KW 364
#define _END_FOR END_FOR #define _END_FOR END_FOR
#define _END_SEND END_SEND #define _END_SEND END_SEND
#define _ERROR_POP_N 364 #define _ERROR_POP_N 365
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK #define _EXIT_INIT_CHECK EXIT_INIT_CHECK
#define _EXPAND_METHOD 365 #define _EXPAND_METHOD 366
#define _EXPAND_METHOD_KW 366 #define _EXPAND_METHOD_KW 367
#define _FATAL_ERROR 367 #define _FATAL_ERROR 368
#define _FORMAT_SIMPLE FORMAT_SIMPLE #define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
#define _FOR_ITER 368 #define _FOR_ITER 369
#define _FOR_ITER_GEN_FRAME 369 #define _FOR_ITER_GEN_FRAME 370
#define _FOR_ITER_TIER_TWO 370 #define _FOR_ITER_TIER_TWO 371
#define _GET_AITER GET_AITER #define _GET_AITER GET_AITER
#define _GET_ANEXT GET_ANEXT #define _GET_ANEXT GET_ANEXT
#define _GET_AWAITABLE GET_AWAITABLE #define _GET_AWAITABLE GET_AWAITABLE
#define _GET_ITER GET_ITER #define _GET_ITER GET_ITER
#define _GET_LEN GET_LEN #define _GET_LEN GET_LEN
#define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER #define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER
#define _GUARD_BINARY_OP_EXTEND 371 #define _GUARD_BINARY_OP_EXTEND 372
#define _GUARD_CALLABLE_STR_1 372 #define _GUARD_CALLABLE_STR_1 373
#define _GUARD_CALLABLE_TUPLE_1 373 #define _GUARD_CALLABLE_TUPLE_1 374
#define _GUARD_CALLABLE_TYPE_1 374 #define _GUARD_CALLABLE_TYPE_1 375
#define _GUARD_DORV_NO_DICT 375 #define _GUARD_DORV_NO_DICT 376
#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 376 #define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 377
#define _GUARD_GLOBALS_VERSION 377 #define _GUARD_GLOBALS_VERSION 378
#define _GUARD_IS_FALSE_POP 378 #define _GUARD_IS_FALSE_POP 379
#define _GUARD_IS_NONE_POP 379 #define _GUARD_IS_NONE_POP 380
#define _GUARD_IS_NOT_NONE_POP 380 #define _GUARD_IS_NOT_NONE_POP 381
#define _GUARD_IS_TRUE_POP 381 #define _GUARD_IS_TRUE_POP 382
#define _GUARD_KEYS_VERSION 382 #define _GUARD_KEYS_VERSION 383
#define _GUARD_NOS_DICT 383 #define _GUARD_NOS_DICT 384
#define _GUARD_NOS_FLOAT 384 #define _GUARD_NOS_FLOAT 385
#define _GUARD_NOS_INT 385 #define _GUARD_NOS_INT 386
#define _GUARD_NOS_LIST 386 #define _GUARD_NOS_LIST 387
#define _GUARD_NOS_NULL 387 #define _GUARD_NOS_NULL 388
#define _GUARD_NOS_TUPLE 388 #define _GUARD_NOS_TUPLE 389
#define _GUARD_NOS_UNICODE 389 #define _GUARD_NOS_UNICODE 390
#define _GUARD_NOT_EXHAUSTED_LIST 390 #define _GUARD_NOT_EXHAUSTED_LIST 391
#define _GUARD_NOT_EXHAUSTED_RANGE 391 #define _GUARD_NOT_EXHAUSTED_RANGE 392
#define _GUARD_NOT_EXHAUSTED_TUPLE 392 #define _GUARD_NOT_EXHAUSTED_TUPLE 393
#define _GUARD_TOS_ANY_SET 393 #define _GUARD_TOS_ANY_SET 394
#define _GUARD_TOS_DICT 394 #define _GUARD_TOS_DICT 395
#define _GUARD_TOS_FLOAT 395 #define _GUARD_TOS_FLOAT 396
#define _GUARD_TOS_INT 396 #define _GUARD_TOS_INT 397
#define _GUARD_TOS_LIST 397 #define _GUARD_TOS_LIST 398
#define _GUARD_TOS_TUPLE 398 #define _GUARD_TOS_SLICE 399
#define _GUARD_TOS_UNICODE 399 #define _GUARD_TOS_TUPLE 400
#define _GUARD_TYPE_VERSION 400 #define _GUARD_TOS_UNICODE 401
#define _GUARD_TYPE_VERSION_AND_LOCK 401 #define _GUARD_TYPE_VERSION 402
#define _GUARD_TYPE_VERSION_AND_LOCK 403
#define _IMPORT_FROM IMPORT_FROM #define _IMPORT_FROM IMPORT_FROM
#define _IMPORT_NAME IMPORT_NAME #define _IMPORT_NAME IMPORT_NAME
#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 402 #define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 404
#define _INIT_CALL_PY_EXACT_ARGS 403 #define _INIT_CALL_PY_EXACT_ARGS 405
#define _INIT_CALL_PY_EXACT_ARGS_0 404 #define _INIT_CALL_PY_EXACT_ARGS_0 406
#define _INIT_CALL_PY_EXACT_ARGS_1 405 #define _INIT_CALL_PY_EXACT_ARGS_1 407
#define _INIT_CALL_PY_EXACT_ARGS_2 406 #define _INIT_CALL_PY_EXACT_ARGS_2 408
#define _INIT_CALL_PY_EXACT_ARGS_3 407 #define _INIT_CALL_PY_EXACT_ARGS_3 409
#define _INIT_CALL_PY_EXACT_ARGS_4 408 #define _INIT_CALL_PY_EXACT_ARGS_4 410
#define _INSERT_NULL 409 #define _INSERT_NULL 411
#define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
#define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
#define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@ -167,163 +169,163 @@ extern "C" {
#define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE #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_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE
#define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE #define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE
#define _IS_NONE 410 #define _IS_NONE 412
#define _IS_OP IS_OP #define _IS_OP IS_OP
#define _ITER_CHECK_LIST 411 #define _ITER_CHECK_LIST 413
#define _ITER_CHECK_RANGE 412 #define _ITER_CHECK_RANGE 414
#define _ITER_CHECK_TUPLE 413 #define _ITER_CHECK_TUPLE 415
#define _ITER_JUMP_LIST 414 #define _ITER_JUMP_LIST 416
#define _ITER_JUMP_RANGE 415 #define _ITER_JUMP_RANGE 417
#define _ITER_JUMP_TUPLE 416 #define _ITER_JUMP_TUPLE 418
#define _ITER_NEXT_LIST 417 #define _ITER_NEXT_LIST 419
#define _ITER_NEXT_LIST_TIER_TWO 418 #define _ITER_NEXT_LIST_TIER_TWO 420
#define _ITER_NEXT_RANGE 419 #define _ITER_NEXT_RANGE 421
#define _ITER_NEXT_TUPLE 420 #define _ITER_NEXT_TUPLE 422
#define _JUMP_TO_TOP 421 #define _JUMP_TO_TOP 423
#define _LIST_APPEND LIST_APPEND #define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND #define _LIST_EXTEND LIST_EXTEND
#define _LOAD_ATTR 422 #define _LOAD_ATTR 424
#define _LOAD_ATTR_CLASS 423 #define _LOAD_ATTR_CLASS 425
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
#define _LOAD_ATTR_INSTANCE_VALUE 424 #define _LOAD_ATTR_INSTANCE_VALUE 426
#define _LOAD_ATTR_METHOD_LAZY_DICT 425 #define _LOAD_ATTR_METHOD_LAZY_DICT 427
#define _LOAD_ATTR_METHOD_NO_DICT 426 #define _LOAD_ATTR_METHOD_NO_DICT 428
#define _LOAD_ATTR_METHOD_WITH_VALUES 427 #define _LOAD_ATTR_METHOD_WITH_VALUES 429
#define _LOAD_ATTR_MODULE 428 #define _LOAD_ATTR_MODULE 430
#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 429 #define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 431
#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 430 #define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 432
#define _LOAD_ATTR_PROPERTY_FRAME 431 #define _LOAD_ATTR_PROPERTY_FRAME 433
#define _LOAD_ATTR_SLOT 432 #define _LOAD_ATTR_SLOT 434
#define _LOAD_ATTR_WITH_HINT 433 #define _LOAD_ATTR_WITH_HINT 435
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
#define _LOAD_BYTECODE 434 #define _LOAD_BYTECODE 436
#define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
#define _LOAD_CONST LOAD_CONST #define _LOAD_CONST LOAD_CONST
#define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL
#define _LOAD_CONST_INLINE 435 #define _LOAD_CONST_INLINE 437
#define _LOAD_CONST_INLINE_BORROW 436 #define _LOAD_CONST_INLINE_BORROW 438
#define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL
#define _LOAD_DEREF LOAD_DEREF #define _LOAD_DEREF LOAD_DEREF
#define _LOAD_FAST 437 #define _LOAD_FAST 439
#define _LOAD_FAST_0 438 #define _LOAD_FAST_0 440
#define _LOAD_FAST_1 439 #define _LOAD_FAST_1 441
#define _LOAD_FAST_2 440 #define _LOAD_FAST_2 442
#define _LOAD_FAST_3 441 #define _LOAD_FAST_3 443
#define _LOAD_FAST_4 442 #define _LOAD_FAST_4 444
#define _LOAD_FAST_5 443 #define _LOAD_FAST_5 445
#define _LOAD_FAST_6 444 #define _LOAD_FAST_6 446
#define _LOAD_FAST_7 445 #define _LOAD_FAST_7 447
#define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
#define _LOAD_FAST_BORROW 446 #define _LOAD_FAST_BORROW 448
#define _LOAD_FAST_BORROW_0 447 #define _LOAD_FAST_BORROW_0 449
#define _LOAD_FAST_BORROW_1 448 #define _LOAD_FAST_BORROW_1 450
#define _LOAD_FAST_BORROW_2 449 #define _LOAD_FAST_BORROW_2 451
#define _LOAD_FAST_BORROW_3 450 #define _LOAD_FAST_BORROW_3 452
#define _LOAD_FAST_BORROW_4 451 #define _LOAD_FAST_BORROW_4 453
#define _LOAD_FAST_BORROW_5 452 #define _LOAD_FAST_BORROW_5 454
#define _LOAD_FAST_BORROW_6 453 #define _LOAD_FAST_BORROW_6 455
#define _LOAD_FAST_BORROW_7 454 #define _LOAD_FAST_BORROW_7 456
#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW #define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW
#define _LOAD_FAST_CHECK LOAD_FAST_CHECK #define _LOAD_FAST_CHECK LOAD_FAST_CHECK
#define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST #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_DEREF LOAD_FROM_DICT_OR_DEREF
#define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS #define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS
#define _LOAD_GLOBAL 455 #define _LOAD_GLOBAL 457
#define _LOAD_GLOBAL_BUILTINS 456 #define _LOAD_GLOBAL_BUILTINS 458
#define _LOAD_GLOBAL_MODULE 457 #define _LOAD_GLOBAL_MODULE 459
#define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME #define _LOAD_NAME LOAD_NAME
#define _LOAD_SMALL_INT 458 #define _LOAD_SMALL_INT 460
#define _LOAD_SMALL_INT_0 459 #define _LOAD_SMALL_INT_0 461
#define _LOAD_SMALL_INT_1 460 #define _LOAD_SMALL_INT_1 462
#define _LOAD_SMALL_INT_2 461 #define _LOAD_SMALL_INT_2 463
#define _LOAD_SMALL_INT_3 462 #define _LOAD_SMALL_INT_3 464
#define _LOAD_SPECIAL 463 #define _LOAD_SPECIAL 465
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
#define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
#define _MAKE_CALLARGS_A_TUPLE 464 #define _MAKE_CALLARGS_A_TUPLE 466
#define _MAKE_CELL MAKE_CELL #define _MAKE_CELL MAKE_CELL
#define _MAKE_FUNCTION MAKE_FUNCTION #define _MAKE_FUNCTION MAKE_FUNCTION
#define _MAKE_WARM 465 #define _MAKE_WARM 467
#define _MAP_ADD MAP_ADD #define _MAP_ADD MAP_ADD
#define _MATCH_CLASS MATCH_CLASS #define _MATCH_CLASS MATCH_CLASS
#define _MATCH_KEYS MATCH_KEYS #define _MATCH_KEYS MATCH_KEYS
#define _MATCH_MAPPING MATCH_MAPPING #define _MATCH_MAPPING MATCH_MAPPING
#define _MATCH_SEQUENCE MATCH_SEQUENCE #define _MATCH_SEQUENCE MATCH_SEQUENCE
#define _MAYBE_EXPAND_METHOD 466 #define _MAYBE_EXPAND_METHOD 468
#define _MAYBE_EXPAND_METHOD_KW 467 #define _MAYBE_EXPAND_METHOD_KW 469
#define _MONITOR_CALL 468 #define _MONITOR_CALL 470
#define _MONITOR_CALL_KW 469 #define _MONITOR_CALL_KW 471
#define _MONITOR_JUMP_BACKWARD 470 #define _MONITOR_JUMP_BACKWARD 472
#define _MONITOR_RESUME 471 #define _MONITOR_RESUME 473
#define _NOP NOP #define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT #define _POP_EXCEPT POP_EXCEPT
#define _POP_JUMP_IF_FALSE 472 #define _POP_JUMP_IF_FALSE 474
#define _POP_JUMP_IF_TRUE 473 #define _POP_JUMP_IF_TRUE 475
#define _POP_TOP POP_TOP #define _POP_TOP POP_TOP
#define _POP_TOP_LOAD_CONST_INLINE 474 #define _POP_TOP_LOAD_CONST_INLINE 476
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 475 #define _POP_TOP_LOAD_CONST_INLINE_BORROW 477
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 476 #define _POP_TWO_LOAD_CONST_INLINE_BORROW 478
#define _PUSH_EXC_INFO PUSH_EXC_INFO #define _PUSH_EXC_INFO PUSH_EXC_INFO
#define _PUSH_FRAME 477 #define _PUSH_FRAME 479
#define _PUSH_NULL PUSH_NULL #define _PUSH_NULL PUSH_NULL
#define _PUSH_NULL_CONDITIONAL 478 #define _PUSH_NULL_CONDITIONAL 480
#define _PY_FRAME_GENERAL 479 #define _PY_FRAME_GENERAL 481
#define _PY_FRAME_KW 480 #define _PY_FRAME_KW 482
#define _QUICKEN_RESUME 481 #define _QUICKEN_RESUME 483
#define _REPLACE_WITH_TRUE 482 #define _REPLACE_WITH_TRUE 484
#define _RESUME_CHECK RESUME_CHECK #define _RESUME_CHECK RESUME_CHECK
#define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_GENERATOR RETURN_GENERATOR
#define _RETURN_VALUE RETURN_VALUE #define _RETURN_VALUE RETURN_VALUE
#define _SAVE_RETURN_OFFSET 483 #define _SAVE_RETURN_OFFSET 485
#define _SEND 484 #define _SEND 486
#define _SEND_GEN_FRAME 485 #define _SEND_GEN_FRAME 487
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
#define _SET_ADD SET_ADD #define _SET_ADD SET_ADD
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
#define _SET_UPDATE SET_UPDATE #define _SET_UPDATE SET_UPDATE
#define _START_EXECUTOR 486 #define _START_EXECUTOR 488
#define _STORE_ATTR 487 #define _STORE_ATTR 489
#define _STORE_ATTR_INSTANCE_VALUE 488 #define _STORE_ATTR_INSTANCE_VALUE 490
#define _STORE_ATTR_SLOT 489 #define _STORE_ATTR_SLOT 491
#define _STORE_ATTR_WITH_HINT 490 #define _STORE_ATTR_WITH_HINT 492
#define _STORE_DEREF STORE_DEREF #define _STORE_DEREF STORE_DEREF
#define _STORE_FAST 491 #define _STORE_FAST 493
#define _STORE_FAST_0 492 #define _STORE_FAST_0 494
#define _STORE_FAST_1 493 #define _STORE_FAST_1 495
#define _STORE_FAST_2 494 #define _STORE_FAST_2 496
#define _STORE_FAST_3 495 #define _STORE_FAST_3 497
#define _STORE_FAST_4 496 #define _STORE_FAST_4 498
#define _STORE_FAST_5 497 #define _STORE_FAST_5 499
#define _STORE_FAST_6 498 #define _STORE_FAST_6 500
#define _STORE_FAST_7 499 #define _STORE_FAST_7 501
#define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST #define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST
#define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST #define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST
#define _STORE_GLOBAL STORE_GLOBAL #define _STORE_GLOBAL STORE_GLOBAL
#define _STORE_NAME STORE_NAME #define _STORE_NAME STORE_NAME
#define _STORE_SLICE 500 #define _STORE_SLICE 502
#define _STORE_SUBSCR 501 #define _STORE_SUBSCR 503
#define _STORE_SUBSCR_DICT 502 #define _STORE_SUBSCR_DICT 504
#define _STORE_SUBSCR_LIST_INT 503 #define _STORE_SUBSCR_LIST_INT 505
#define _SWAP SWAP #define _SWAP SWAP
#define _TIER2_RESUME_CHECK 504 #define _TIER2_RESUME_CHECK 506
#define _TO_BOOL 505 #define _TO_BOOL 507
#define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT #define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST 506 #define _TO_BOOL_LIST 508
#define _TO_BOOL_NONE TO_BOOL_NONE #define _TO_BOOL_NONE TO_BOOL_NONE
#define _TO_BOOL_STR 507 #define _TO_BOOL_STR 509
#define _UNARY_INVERT UNARY_INVERT #define _UNARY_INVERT UNARY_INVERT
#define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT #define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX #define _UNPACK_EX UNPACK_EX
#define _UNPACK_SEQUENCE 508 #define _UNPACK_SEQUENCE 510
#define _UNPACK_SEQUENCE_LIST 509 #define _UNPACK_SEQUENCE_LIST 511
#define _UNPACK_SEQUENCE_TUPLE 510 #define _UNPACK_SEQUENCE_TUPLE 512
#define _UNPACK_SEQUENCE_TWO_TUPLE 511 #define _UNPACK_SEQUENCE_TWO_TUPLE 513
#define _WITH_EXCEPT_START WITH_EXCEPT_START #define _WITH_EXCEPT_START WITH_EXCEPT_START
#define _YIELD_VALUE YIELD_VALUE #define _YIELD_VALUE YIELD_VALUE
#define MAX_UOP_ID 511 #define MAX_UOP_ID 513
#ifdef __cplusplus #ifdef __cplusplus
} }

8
Include/internal/pycore_uop_metadata.h generated
View file

@ -74,6 +74,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_TO_BOOL_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_TO_BOOL_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_NOS_LIST] = HAS_EXIT_FLAG, [_GUARD_NOS_LIST] = HAS_EXIT_FLAG,
[_GUARD_TOS_LIST] = HAS_EXIT_FLAG, [_GUARD_TOS_LIST] = HAS_EXIT_FLAG,
[_GUARD_TOS_SLICE] = HAS_EXIT_FLAG,
[_TO_BOOL_LIST] = 0, [_TO_BOOL_LIST] = 0,
[_TO_BOOL_NONE] = HAS_EXIT_FLAG, [_TO_BOOL_NONE] = HAS_EXIT_FLAG,
[_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG, [_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG,
@ -98,6 +99,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_BINARY_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_BINARY_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_LIST_SLICE] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG,
[_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG,
@ -327,6 +329,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_BINARY_OP_SUBSCR_DICT] = "_BINARY_OP_SUBSCR_DICT", [_BINARY_OP_SUBSCR_DICT] = "_BINARY_OP_SUBSCR_DICT",
[_BINARY_OP_SUBSCR_INIT_CALL] = "_BINARY_OP_SUBSCR_INIT_CALL", [_BINARY_OP_SUBSCR_INIT_CALL] = "_BINARY_OP_SUBSCR_INIT_CALL",
[_BINARY_OP_SUBSCR_LIST_INT] = "_BINARY_OP_SUBSCR_LIST_INT", [_BINARY_OP_SUBSCR_LIST_INT] = "_BINARY_OP_SUBSCR_LIST_INT",
[_BINARY_OP_SUBSCR_LIST_SLICE] = "_BINARY_OP_SUBSCR_LIST_SLICE",
[_BINARY_OP_SUBSCR_STR_INT] = "_BINARY_OP_SUBSCR_STR_INT", [_BINARY_OP_SUBSCR_STR_INT] = "_BINARY_OP_SUBSCR_STR_INT",
[_BINARY_OP_SUBSCR_TUPLE_INT] = "_BINARY_OP_SUBSCR_TUPLE_INT", [_BINARY_OP_SUBSCR_TUPLE_INT] = "_BINARY_OP_SUBSCR_TUPLE_INT",
[_BINARY_OP_SUBTRACT_FLOAT] = "_BINARY_OP_SUBTRACT_FLOAT", [_BINARY_OP_SUBTRACT_FLOAT] = "_BINARY_OP_SUBTRACT_FLOAT",
@ -445,6 +448,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT", [_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT",
[_GUARD_TOS_INT] = "_GUARD_TOS_INT", [_GUARD_TOS_INT] = "_GUARD_TOS_INT",
[_GUARD_TOS_LIST] = "_GUARD_TOS_LIST", [_GUARD_TOS_LIST] = "_GUARD_TOS_LIST",
[_GUARD_TOS_SLICE] = "_GUARD_TOS_SLICE",
[_GUARD_TOS_TUPLE] = "_GUARD_TOS_TUPLE", [_GUARD_TOS_TUPLE] = "_GUARD_TOS_TUPLE",
[_GUARD_TOS_UNICODE] = "_GUARD_TOS_UNICODE", [_GUARD_TOS_UNICODE] = "_GUARD_TOS_UNICODE",
[_GUARD_TYPE_VERSION] = "_GUARD_TYPE_VERSION", [_GUARD_TYPE_VERSION] = "_GUARD_TYPE_VERSION",
@ -714,6 +718,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 0; return 0;
case _GUARD_TOS_LIST: case _GUARD_TOS_LIST:
return 0; return 0;
case _GUARD_TOS_SLICE:
return 0;
case _TO_BOOL_LIST: case _TO_BOOL_LIST:
return 1; return 1;
case _TO_BOOL_NONE: case _TO_BOOL_NONE:
@ -762,6 +768,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 4; return 4;
case _BINARY_OP_SUBSCR_LIST_INT: case _BINARY_OP_SUBSCR_LIST_INT:
return 2; return 2;
case _BINARY_OP_SUBSCR_LIST_SLICE:
return 2;
case _BINARY_OP_SUBSCR_STR_INT: case _BINARY_OP_SUBSCR_STR_INT:
return 2; return 2;
case _GUARD_NOS_TUPLE: case _GUARD_NOS_TUPLE:

147
Include/opcode_ids.h generated
View file

@ -141,79 +141,80 @@ extern "C" {
#define BINARY_OP_SUBSCR_DICT 135 #define BINARY_OP_SUBSCR_DICT 135
#define BINARY_OP_SUBSCR_GETITEM 136 #define BINARY_OP_SUBSCR_GETITEM 136
#define BINARY_OP_SUBSCR_LIST_INT 137 #define BINARY_OP_SUBSCR_LIST_INT 137
#define BINARY_OP_SUBSCR_STR_INT 138 #define BINARY_OP_SUBSCR_LIST_SLICE 138
#define BINARY_OP_SUBSCR_TUPLE_INT 139 #define BINARY_OP_SUBSCR_STR_INT 139
#define BINARY_OP_SUBTRACT_FLOAT 140 #define BINARY_OP_SUBSCR_TUPLE_INT 140
#define BINARY_OP_SUBTRACT_INT 141 #define BINARY_OP_SUBTRACT_FLOAT 141
#define CALL_ALLOC_AND_ENTER_INIT 142 #define BINARY_OP_SUBTRACT_INT 142
#define CALL_BOUND_METHOD_EXACT_ARGS 143 #define CALL_ALLOC_AND_ENTER_INIT 143
#define CALL_BOUND_METHOD_GENERAL 144 #define CALL_BOUND_METHOD_EXACT_ARGS 144
#define CALL_BUILTIN_CLASS 145 #define CALL_BOUND_METHOD_GENERAL 145
#define CALL_BUILTIN_FAST 146 #define CALL_BUILTIN_CLASS 146
#define CALL_BUILTIN_FAST_WITH_KEYWORDS 147 #define CALL_BUILTIN_FAST 147
#define CALL_BUILTIN_O 148 #define CALL_BUILTIN_FAST_WITH_KEYWORDS 148
#define CALL_ISINSTANCE 149 #define CALL_BUILTIN_O 149
#define CALL_KW_BOUND_METHOD 150 #define CALL_ISINSTANCE 150
#define CALL_KW_NON_PY 151 #define CALL_KW_BOUND_METHOD 151
#define CALL_KW_PY 152 #define CALL_KW_NON_PY 152
#define CALL_LEN 153 #define CALL_KW_PY 153
#define CALL_LIST_APPEND 154 #define CALL_LEN 154
#define CALL_METHOD_DESCRIPTOR_FAST 155 #define CALL_LIST_APPEND 155
#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 156 #define CALL_METHOD_DESCRIPTOR_FAST 156
#define CALL_METHOD_DESCRIPTOR_NOARGS 157 #define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 157
#define CALL_METHOD_DESCRIPTOR_O 158 #define CALL_METHOD_DESCRIPTOR_NOARGS 158
#define CALL_NON_PY_GENERAL 159 #define CALL_METHOD_DESCRIPTOR_O 159
#define CALL_PY_EXACT_ARGS 160 #define CALL_NON_PY_GENERAL 160
#define CALL_PY_GENERAL 161 #define CALL_PY_EXACT_ARGS 161
#define CALL_STR_1 162 #define CALL_PY_GENERAL 162
#define CALL_TUPLE_1 163 #define CALL_STR_1 163
#define CALL_TYPE_1 164 #define CALL_TUPLE_1 164
#define COMPARE_OP_FLOAT 165 #define CALL_TYPE_1 165
#define COMPARE_OP_INT 166 #define COMPARE_OP_FLOAT 166
#define COMPARE_OP_STR 167 #define COMPARE_OP_INT 167
#define CONTAINS_OP_DICT 168 #define COMPARE_OP_STR 168
#define CONTAINS_OP_SET 169 #define CONTAINS_OP_DICT 169
#define FOR_ITER_GEN 170 #define CONTAINS_OP_SET 170
#define FOR_ITER_LIST 171 #define FOR_ITER_GEN 171
#define FOR_ITER_RANGE 172 #define FOR_ITER_LIST 172
#define FOR_ITER_TUPLE 173 #define FOR_ITER_RANGE 173
#define JUMP_BACKWARD_JIT 174 #define FOR_ITER_TUPLE 174
#define JUMP_BACKWARD_NO_JIT 175 #define JUMP_BACKWARD_JIT 175
#define LOAD_ATTR_CLASS 176 #define JUMP_BACKWARD_NO_JIT 176
#define LOAD_ATTR_CLASS_WITH_METACLASS_CHECK 177 #define LOAD_ATTR_CLASS 177
#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 178 #define LOAD_ATTR_CLASS_WITH_METACLASS_CHECK 178
#define LOAD_ATTR_INSTANCE_VALUE 179 #define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 179
#define LOAD_ATTR_METHOD_LAZY_DICT 180 #define LOAD_ATTR_INSTANCE_VALUE 180
#define LOAD_ATTR_METHOD_NO_DICT 181 #define LOAD_ATTR_METHOD_LAZY_DICT 181
#define LOAD_ATTR_METHOD_WITH_VALUES 182 #define LOAD_ATTR_METHOD_NO_DICT 182
#define LOAD_ATTR_MODULE 183 #define LOAD_ATTR_METHOD_WITH_VALUES 183
#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 184 #define LOAD_ATTR_MODULE 184
#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 185 #define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 185
#define LOAD_ATTR_PROPERTY 186 #define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 186
#define LOAD_ATTR_SLOT 187 #define LOAD_ATTR_PROPERTY 187
#define LOAD_ATTR_WITH_HINT 188 #define LOAD_ATTR_SLOT 188
#define LOAD_CONST_IMMORTAL 189 #define LOAD_ATTR_WITH_HINT 189
#define LOAD_CONST_MORTAL 190 #define LOAD_CONST_IMMORTAL 190
#define LOAD_GLOBAL_BUILTIN 191 #define LOAD_CONST_MORTAL 191
#define LOAD_GLOBAL_MODULE 192 #define LOAD_GLOBAL_BUILTIN 192
#define LOAD_SUPER_ATTR_ATTR 193 #define LOAD_GLOBAL_MODULE 193
#define LOAD_SUPER_ATTR_METHOD 194 #define LOAD_SUPER_ATTR_ATTR 194
#define RESUME_CHECK 195 #define LOAD_SUPER_ATTR_METHOD 195
#define SEND_GEN 196 #define RESUME_CHECK 196
#define STORE_ATTR_INSTANCE_VALUE 197 #define SEND_GEN 197
#define STORE_ATTR_SLOT 198 #define STORE_ATTR_INSTANCE_VALUE 198
#define STORE_ATTR_WITH_HINT 199 #define STORE_ATTR_SLOT 199
#define STORE_SUBSCR_DICT 200 #define STORE_ATTR_WITH_HINT 200
#define STORE_SUBSCR_LIST_INT 201 #define STORE_SUBSCR_DICT 201
#define TO_BOOL_ALWAYS_TRUE 202 #define STORE_SUBSCR_LIST_INT 202
#define TO_BOOL_BOOL 203 #define TO_BOOL_ALWAYS_TRUE 203
#define TO_BOOL_INT 204 #define TO_BOOL_BOOL 204
#define TO_BOOL_LIST 205 #define TO_BOOL_INT 205
#define TO_BOOL_NONE 206 #define TO_BOOL_LIST 206
#define TO_BOOL_STR 207 #define TO_BOOL_NONE 207
#define UNPACK_SEQUENCE_LIST 208 #define TO_BOOL_STR 208
#define UNPACK_SEQUENCE_TUPLE 209 #define UNPACK_SEQUENCE_LIST 209
#define UNPACK_SEQUENCE_TWO_TUPLE 210 #define UNPACK_SEQUENCE_TUPLE 210
#define UNPACK_SEQUENCE_TWO_TUPLE 211
#define INSTRUMENTED_END_FOR 234 #define INSTRUMENTED_END_FOR 234
#define INSTRUMENTED_POP_ITER 235 #define INSTRUMENTED_POP_ITER 235
#define INSTRUMENTED_END_SEND 236 #define INSTRUMENTED_END_SEND 236

148
Lib/_opcode_metadata.py generated
View file

@ -27,6 +27,7 @@ _specializations = {
"BINARY_OP_SUBTRACT_FLOAT", "BINARY_OP_SUBTRACT_FLOAT",
"BINARY_OP_ADD_UNICODE", "BINARY_OP_ADD_UNICODE",
"BINARY_OP_SUBSCR_LIST_INT", "BINARY_OP_SUBSCR_LIST_INT",
"BINARY_OP_SUBSCR_LIST_SLICE",
"BINARY_OP_SUBSCR_TUPLE_INT", "BINARY_OP_SUBSCR_TUPLE_INT",
"BINARY_OP_SUBSCR_STR_INT", "BINARY_OP_SUBSCR_STR_INT",
"BINARY_OP_SUBSCR_DICT", "BINARY_OP_SUBSCR_DICT",
@ -133,79 +134,80 @@ _specialized_opmap = {
'BINARY_OP_SUBSCR_DICT': 135, 'BINARY_OP_SUBSCR_DICT': 135,
'BINARY_OP_SUBSCR_GETITEM': 136, 'BINARY_OP_SUBSCR_GETITEM': 136,
'BINARY_OP_SUBSCR_LIST_INT': 137, 'BINARY_OP_SUBSCR_LIST_INT': 137,
'BINARY_OP_SUBSCR_STR_INT': 138, 'BINARY_OP_SUBSCR_LIST_SLICE': 138,
'BINARY_OP_SUBSCR_TUPLE_INT': 139, 'BINARY_OP_SUBSCR_STR_INT': 139,
'BINARY_OP_SUBTRACT_FLOAT': 140, 'BINARY_OP_SUBSCR_TUPLE_INT': 140,
'BINARY_OP_SUBTRACT_INT': 141, 'BINARY_OP_SUBTRACT_FLOAT': 141,
'CALL_ALLOC_AND_ENTER_INIT': 142, 'BINARY_OP_SUBTRACT_INT': 142,
'CALL_BOUND_METHOD_EXACT_ARGS': 143, 'CALL_ALLOC_AND_ENTER_INIT': 143,
'CALL_BOUND_METHOD_GENERAL': 144, 'CALL_BOUND_METHOD_EXACT_ARGS': 144,
'CALL_BUILTIN_CLASS': 145, 'CALL_BOUND_METHOD_GENERAL': 145,
'CALL_BUILTIN_FAST': 146, 'CALL_BUILTIN_CLASS': 146,
'CALL_BUILTIN_FAST_WITH_KEYWORDS': 147, 'CALL_BUILTIN_FAST': 147,
'CALL_BUILTIN_O': 148, 'CALL_BUILTIN_FAST_WITH_KEYWORDS': 148,
'CALL_ISINSTANCE': 149, 'CALL_BUILTIN_O': 149,
'CALL_KW_BOUND_METHOD': 150, 'CALL_ISINSTANCE': 150,
'CALL_KW_NON_PY': 151, 'CALL_KW_BOUND_METHOD': 151,
'CALL_KW_PY': 152, 'CALL_KW_NON_PY': 152,
'CALL_LEN': 153, 'CALL_KW_PY': 153,
'CALL_LIST_APPEND': 154, 'CALL_LEN': 154,
'CALL_METHOD_DESCRIPTOR_FAST': 155, 'CALL_LIST_APPEND': 155,
'CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS': 156, 'CALL_METHOD_DESCRIPTOR_FAST': 156,
'CALL_METHOD_DESCRIPTOR_NOARGS': 157, 'CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS': 157,
'CALL_METHOD_DESCRIPTOR_O': 158, 'CALL_METHOD_DESCRIPTOR_NOARGS': 158,
'CALL_NON_PY_GENERAL': 159, 'CALL_METHOD_DESCRIPTOR_O': 159,
'CALL_PY_EXACT_ARGS': 160, 'CALL_NON_PY_GENERAL': 160,
'CALL_PY_GENERAL': 161, 'CALL_PY_EXACT_ARGS': 161,
'CALL_STR_1': 162, 'CALL_PY_GENERAL': 162,
'CALL_TUPLE_1': 163, 'CALL_STR_1': 163,
'CALL_TYPE_1': 164, 'CALL_TUPLE_1': 164,
'COMPARE_OP_FLOAT': 165, 'CALL_TYPE_1': 165,
'COMPARE_OP_INT': 166, 'COMPARE_OP_FLOAT': 166,
'COMPARE_OP_STR': 167, 'COMPARE_OP_INT': 167,
'CONTAINS_OP_DICT': 168, 'COMPARE_OP_STR': 168,
'CONTAINS_OP_SET': 169, 'CONTAINS_OP_DICT': 169,
'FOR_ITER_GEN': 170, 'CONTAINS_OP_SET': 170,
'FOR_ITER_LIST': 171, 'FOR_ITER_GEN': 171,
'FOR_ITER_RANGE': 172, 'FOR_ITER_LIST': 172,
'FOR_ITER_TUPLE': 173, 'FOR_ITER_RANGE': 173,
'JUMP_BACKWARD_JIT': 174, 'FOR_ITER_TUPLE': 174,
'JUMP_BACKWARD_NO_JIT': 175, 'JUMP_BACKWARD_JIT': 175,
'LOAD_ATTR_CLASS': 176, 'JUMP_BACKWARD_NO_JIT': 176,
'LOAD_ATTR_CLASS_WITH_METACLASS_CHECK': 177, 'LOAD_ATTR_CLASS': 177,
'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 178, 'LOAD_ATTR_CLASS_WITH_METACLASS_CHECK': 178,
'LOAD_ATTR_INSTANCE_VALUE': 179, 'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 179,
'LOAD_ATTR_METHOD_LAZY_DICT': 180, 'LOAD_ATTR_INSTANCE_VALUE': 180,
'LOAD_ATTR_METHOD_NO_DICT': 181, 'LOAD_ATTR_METHOD_LAZY_DICT': 181,
'LOAD_ATTR_METHOD_WITH_VALUES': 182, 'LOAD_ATTR_METHOD_NO_DICT': 182,
'LOAD_ATTR_MODULE': 183, 'LOAD_ATTR_METHOD_WITH_VALUES': 183,
'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 184, 'LOAD_ATTR_MODULE': 184,
'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 185, 'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 185,
'LOAD_ATTR_PROPERTY': 186, 'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 186,
'LOAD_ATTR_SLOT': 187, 'LOAD_ATTR_PROPERTY': 187,
'LOAD_ATTR_WITH_HINT': 188, 'LOAD_ATTR_SLOT': 188,
'LOAD_CONST_IMMORTAL': 189, 'LOAD_ATTR_WITH_HINT': 189,
'LOAD_CONST_MORTAL': 190, 'LOAD_CONST_IMMORTAL': 190,
'LOAD_GLOBAL_BUILTIN': 191, 'LOAD_CONST_MORTAL': 191,
'LOAD_GLOBAL_MODULE': 192, 'LOAD_GLOBAL_BUILTIN': 192,
'LOAD_SUPER_ATTR_ATTR': 193, 'LOAD_GLOBAL_MODULE': 193,
'LOAD_SUPER_ATTR_METHOD': 194, 'LOAD_SUPER_ATTR_ATTR': 194,
'RESUME_CHECK': 195, 'LOAD_SUPER_ATTR_METHOD': 195,
'SEND_GEN': 196, 'RESUME_CHECK': 196,
'STORE_ATTR_INSTANCE_VALUE': 197, 'SEND_GEN': 197,
'STORE_ATTR_SLOT': 198, 'STORE_ATTR_INSTANCE_VALUE': 198,
'STORE_ATTR_WITH_HINT': 199, 'STORE_ATTR_SLOT': 199,
'STORE_SUBSCR_DICT': 200, 'STORE_ATTR_WITH_HINT': 200,
'STORE_SUBSCR_LIST_INT': 201, 'STORE_SUBSCR_DICT': 201,
'TO_BOOL_ALWAYS_TRUE': 202, 'STORE_SUBSCR_LIST_INT': 202,
'TO_BOOL_BOOL': 203, 'TO_BOOL_ALWAYS_TRUE': 203,
'TO_BOOL_INT': 204, 'TO_BOOL_BOOL': 204,
'TO_BOOL_LIST': 205, 'TO_BOOL_INT': 205,
'TO_BOOL_NONE': 206, 'TO_BOOL_LIST': 206,
'TO_BOOL_STR': 207, 'TO_BOOL_NONE': 207,
'UNPACK_SEQUENCE_LIST': 208, 'TO_BOOL_STR': 208,
'UNPACK_SEQUENCE_TUPLE': 209, 'UNPACK_SEQUENCE_LIST': 209,
'UNPACK_SEQUENCE_TWO_TUPLE': 210, 'UNPACK_SEQUENCE_TUPLE': 210,
'UNPACK_SEQUENCE_TWO_TUPLE': 211,
} }
opmap = { opmap = {

1
Misc/NEWS.d/next/Core_and_Builtins/2025-04-17-11-40-13.gh-issue-100239.9RxIxY.rst Normal file
View file

@ -0,0 +1 @@
Add specialisation for ``BINARY_OP/SUBSCR`` on list and slice.

24
Objects/listobject.c
View file

@ -3617,6 +3617,24 @@ list_slice_wrap(PyListObject *aa, Py_ssize_t start, Py_ssize_t stop, Py_ssize_t
return res; return res;
} }
static inline PyObject*
list_slice_subscript(PyObject* self, PyObject* item)
{
assert(PyList_Check(self));
assert(PySlice_Check(item));
Py_ssize_t start, stop, step;
if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
return NULL;
}
return list_slice_wrap((PyListObject *)self, start, stop, step);
}
PyObject *
_PyList_SliceSubscript(PyObject* _self, PyObject* item)
{
return list_slice_subscript(_self, item);
}
static PyObject * static PyObject *
list_subscript(PyObject* _self, PyObject* item) list_subscript(PyObject* _self, PyObject* item)
{ {
@ -3631,11 +3649,7 @@ list_subscript(PyObject* _self, PyObject* item)
return list_item((PyObject *)self, i); return list_item((PyObject *)self, i);
} }
else if (PySlice_Check(item)) { else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step; return list_slice_subscript(_self, item);
if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
return NULL;
}
return list_slice_wrap(self, start, stop, step);
} }
else { else {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,

24
Python/bytecodes.c
View file

@ -519,6 +519,11 @@ dummy_func(
EXIT_IF(!PyList_CheckExact(o)); EXIT_IF(!PyList_CheckExact(o));
} }
op(_GUARD_TOS_SLICE, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
EXIT_IF(!PySlice_Check(o));
}
macro(TO_BOOL_LIST) = _GUARD_TOS_LIST + unused/1 + unused/2 + _TO_BOOL_LIST; macro(TO_BOOL_LIST) = _GUARD_TOS_LIST + unused/1 + unused/2 + _TO_BOOL_LIST;
op(_TO_BOOL_LIST, (value -- res)) { op(_TO_BOOL_LIST, (value -- res)) {
@ -591,6 +596,7 @@ dummy_func(
BINARY_OP_SUBTRACT_FLOAT, BINARY_OP_SUBTRACT_FLOAT,
BINARY_OP_ADD_UNICODE, BINARY_OP_ADD_UNICODE,
BINARY_OP_SUBSCR_LIST_INT, BINARY_OP_SUBSCR_LIST_INT,
BINARY_OP_SUBSCR_LIST_SLICE,
BINARY_OP_SUBSCR_TUPLE_INT, BINARY_OP_SUBSCR_TUPLE_INT,
BINARY_OP_SUBSCR_STR_INT, BINARY_OP_SUBSCR_STR_INT,
BINARY_OP_SUBSCR_DICT, BINARY_OP_SUBSCR_DICT,
@ -900,6 +906,24 @@ dummy_func(
DECREF_INPUTS(); DECREF_INPUTS();
} }
macro(BINARY_OP_SUBSCR_LIST_SLICE) =
_GUARD_TOS_SLICE + _GUARD_NOS_LIST + unused/5 + _BINARY_OP_SUBSCR_LIST_SLICE;
op(_BINARY_OP_SUBSCR_LIST_SLICE, (list_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PySlice_Check(sub));
assert(PyList_CheckExact(list));
PyObject *res_o = _PyList_SliceSubscript(list, sub);
DEOPT_IF(res_o == NULL);
STAT_INC(BINARY_OP, hit);
res = PyStackRef_FromPyObjectSteal(res_o);
STAT_INC(BINARY_OP, hit);
DECREF_INPUTS();
}
macro(BINARY_OP_SUBSCR_STR_INT) = macro(BINARY_OP_SUBSCR_STR_INT) =
_GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_STR_INT; _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_STR_INT;

46
Python/executor_cases.c.h generated
View file

@ -740,6 +740,17 @@
break; break;
} }
case _GUARD_TOS_SLICE: {
_PyStackRef tos;
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PySlice_Check(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _TO_BOOL_LIST: { case _TO_BOOL_LIST: {
_PyStackRef value; _PyStackRef value;
_PyStackRef res; _PyStackRef res;
@ -1324,6 +1335,41 @@
break; break;
} }
case _BINARY_OP_SUBSCR_LIST_SLICE: {
_PyStackRef sub_st;
_PyStackRef list_st;
_PyStackRef res;
sub_st = stack_pointer[-1];
list_st = stack_pointer[-2];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PySlice_Check(sub));
assert(PyList_CheckExact(list));
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *res_o = _PyList_SliceSubscript(list, sub);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(BINARY_OP, hit);
res = PyStackRef_FromPyObjectSteal(res_o);
STAT_INC(BINARY_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = list_st;
list_st = res;
stack_pointer[-2] = list_st;
PyStackRef_CLOSE(tmp);
tmp = sub_st;
sub_st = PyStackRef_NULL;
stack_pointer[-1] = sub_st;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
assert(WITHIN_STACK_BOUNDS());
break;
}
case _BINARY_OP_SUBSCR_STR_INT: { case _BINARY_OP_SUBSCR_STR_INT: {
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef str_st; _PyStackRef str_st;

72
Python/generated_cases.c.h generated
View file

@ -763,6 +763,78 @@
DISPATCH(); DISPATCH();
} }
TARGET(BINARY_OP_SUBSCR_LIST_SLICE) {
#if Py_TAIL_CALL_INTERP
int opcode = BINARY_OP_SUBSCR_LIST_SLICE;
(void)(opcode);
#endif
_Py_CODEUNIT* const this_instr = next_instr;
(void)this_instr;
frame->instr_ptr = next_instr;
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBSCR_LIST_SLICE);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef tos;
_PyStackRef nos;
_PyStackRef list_st;
_PyStackRef sub_st;
_PyStackRef res;
// _GUARD_TOS_SLICE
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PySlice_Check(o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
}
// _GUARD_NOS_LIST
{
nos = stack_pointer[-2];
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyList_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
}
/* Skip 5 cache entries */
// _BINARY_OP_SUBSCR_LIST_SLICE
{
sub_st = tos;
list_st = nos;
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PySlice_Check(sub));
assert(PyList_CheckExact(list));
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *res_o = _PyList_SliceSubscript(list, sub);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
STAT_INC(BINARY_OP, hit);
res = PyStackRef_FromPyObjectSteal(res_o);
STAT_INC(BINARY_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = list_st;
list_st = res;
stack_pointer[-2] = list_st;
PyStackRef_CLOSE(tmp);
tmp = sub_st;
sub_st = PyStackRef_NULL;
stack_pointer[-1] = sub_st;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
assert(WITHIN_STACK_BOUNDS());
}
DISPATCH();
}
TARGET(BINARY_OP_SUBSCR_STR_INT) { TARGET(BINARY_OP_SUBSCR_STR_INT) {
#if Py_TAIL_CALL_INTERP #if Py_TAIL_CALL_INTERP
int opcode = BINARY_OP_SUBSCR_STR_INT; int opcode = BINARY_OP_SUBSCR_STR_INT;

5
Python/opcode_targets.h generated
View file

@ -138,6 +138,7 @@ static void *opcode_targets[256] = {
&&TARGET_BINARY_OP_SUBSCR_DICT, &&TARGET_BINARY_OP_SUBSCR_DICT,
&&TARGET_BINARY_OP_SUBSCR_GETITEM, &&TARGET_BINARY_OP_SUBSCR_GETITEM,
&&TARGET_BINARY_OP_SUBSCR_LIST_INT, &&TARGET_BINARY_OP_SUBSCR_LIST_INT,
&&TARGET_BINARY_OP_SUBSCR_LIST_SLICE,
&&TARGET_BINARY_OP_SUBSCR_STR_INT, &&TARGET_BINARY_OP_SUBSCR_STR_INT,
&&TARGET_BINARY_OP_SUBSCR_TUPLE_INT, &&TARGET_BINARY_OP_SUBSCR_TUPLE_INT,
&&TARGET_BINARY_OP_SUBTRACT_FLOAT, &&TARGET_BINARY_OP_SUBTRACT_FLOAT,
@ -233,7 +234,6 @@ static void *opcode_targets[256] = {
&&_unknown_opcode, &&_unknown_opcode,
&&_unknown_opcode, &&_unknown_opcode,
&&_unknown_opcode, &&_unknown_opcode,
&&_unknown_opcode,
&&TARGET_INSTRUMENTED_END_FOR, &&TARGET_INSTRUMENTED_END_FOR,
&&TARGET_INSTRUMENTED_POP_ITER, &&TARGET_INSTRUMENTED_POP_ITER,
&&TARGET_INSTRUMENTED_END_SEND, &&TARGET_INSTRUMENTED_END_SEND,
@ -278,6 +278,7 @@ Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_MULTIPLY_INT(TAIL_CALL
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_DICT(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_DICT(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_GETITEM(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_GETITEM(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_STR_INT(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_STR_INT(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT(TAIL_CALL_PARAMS);
Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT(TAIL_CALL_PARAMS); Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT(TAIL_CALL_PARAMS);
@ -516,6 +517,7 @@ static py_tail_call_funcptr INSTRUCTION_TABLE[256] = {
[BINARY_OP_SUBSCR_DICT] = _TAIL_CALL_BINARY_OP_SUBSCR_DICT, [BINARY_OP_SUBSCR_DICT] = _TAIL_CALL_BINARY_OP_SUBSCR_DICT,
[BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM, [BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM,
[BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT, [BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT,
[BINARY_OP_SUBSCR_LIST_SLICE] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE,
[BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT, [BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT,
[BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT, [BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT,
[BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT, [BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT,
@ -738,7 +740,6 @@ static py_tail_call_funcptr INSTRUCTION_TABLE[256] = {
[125] = _TAIL_CALL_UNKNOWN_OPCODE, [125] = _TAIL_CALL_UNKNOWN_OPCODE,
[126] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE,
[127] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE,
[211] = _TAIL_CALL_UNKNOWN_OPCODE,
[212] = _TAIL_CALL_UNKNOWN_OPCODE, [212] = _TAIL_CALL_UNKNOWN_OPCODE,
[213] = _TAIL_CALL_UNKNOWN_OPCODE, [213] = _TAIL_CALL_UNKNOWN_OPCODE,
[214] = _TAIL_CALL_UNKNOWN_OPCODE, [214] = _TAIL_CALL_UNKNOWN_OPCODE,

13
Python/optimizer_cases.c.h generated
View file

@ -215,6 +215,10 @@
break; break;
} }
case _GUARD_TOS_SLICE: {
break;
}
case _TO_BOOL_LIST: { case _TO_BOOL_LIST: {
JitOptSymbol *value; JitOptSymbol *value;
JitOptSymbol *res; JitOptSymbol *res;
@ -587,6 +591,15 @@
break; break;
} }
case _BINARY_OP_SUBSCR_LIST_SLICE: {
JitOptSymbol *res;
res = sym_new_not_null(ctx);
stack_pointer[-2] = res;
stack_pointer += -1;
assert(WITHIN_STACK_BOUNDS());
break;
}
case _BINARY_OP_SUBSCR_STR_INT: { case _BINARY_OP_SUBSCR_STR_INT: {
JitOptSymbol *res; JitOptSymbol *res;
res = sym_new_type(ctx, &PyUnicode_Type); res = sym_new_type(ctx, &PyUnicode_Type);

4
Python/specialize.c
View file

@ -2657,6 +2657,10 @@ _Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *in
specialize(instr, BINARY_OP_SUBSCR_DICT); specialize(instr, BINARY_OP_SUBSCR_DICT);
return; return;
} }
if (PyList_CheckExact(lhs) && PySlice_Check(rhs)) {
specialize(instr, BINARY_OP_SUBSCR_LIST_SLICE);
return;
}
unsigned int tp_version; unsigned int tp_version;
PyTypeObject *container_type = Py_TYPE(lhs); PyTypeObject *container_type = Py_TYPE(lhs);
PyObject *descriptor = _PyType_LookupRefAndVersion(container_type, &_Py_ID(__getitem__), &tp_version); PyObject *descriptor = _PyType_LookupRefAndVersion(container_type, &_Py_ID(__getitem__), &tp_version);