mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
gh-116381: Remove bad specializations, add fail stats (GH-116464)
* Remove bad specializations, add fail stats
This commit is contained in:
Ken Jin
GitHub
parent
4298d69d4b
commit
41457c7fdb
16 changed files with 125 additions and 320 deletions
|
|
@ -56,8 +56,6 @@ typedef struct {
|
|||
|
||||
PyAPI_FUNC(PyObject *)_PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n);
|
||||
|
||||
PyAPI_FUNC(int) _PyList_Contains(PyObject *aa, PyObject *el);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
27
Include/internal/pycore_opcode_metadata.h
generated
27
Include/internal/pycore_opcode_metadata.h
generated
|
|
@ -153,14 +153,8 @@ int _PyOpcode_num_popped(int opcode, int oparg) {
|
|||
return 2;
|
||||
case CONTAINS_OP_DICT:
|
||||
return 2;
|
||||
case CONTAINS_OP_LIST:
|
||||
return 2;
|
||||
case CONTAINS_OP_SET:
|
||||
return 2;
|
||||
case CONTAINS_OP_STR:
|
||||
return 2;
|
||||
case CONTAINS_OP_TUPLE:
|
||||
return 2;
|
||||
case CONVERT_VALUE:
|
||||
return 1;
|
||||
case COPY:
|
||||
|
|
@ -588,14 +582,8 @@ int _PyOpcode_num_pushed(int opcode, int oparg) {
|
|||
return 1;
|
||||
case CONTAINS_OP_DICT:
|
||||
return 1;
|
||||
case CONTAINS_OP_LIST:
|
||||
return 1;
|
||||
case CONTAINS_OP_SET:
|
||||
return 1;
|
||||
case CONTAINS_OP_STR:
|
||||
return 1;
|
||||
case CONTAINS_OP_TUPLE:
|
||||
return 1;
|
||||
case CONVERT_VALUE:
|
||||
return 1;
|
||||
case COPY:
|
||||
|
|
@ -1024,10 +1012,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[268] = {
|
|||
[COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONTAINS_OP_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
|
||||
[CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG },
|
||||
[COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
|
||||
[COPY_FREE_VARS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
|
||||
|
|
@ -1251,10 +1236,7 @@ _PyOpcode_macro_expansion[256] = {
|
|||
[COMPARE_OP_STR] = { .nuops = 2, .uops = { { _GUARD_BOTH_UNICODE, 0, 0 }, { _COMPARE_OP_STR, 0, 0 } } },
|
||||
[CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, 0, 0 } } },
|
||||
[CONTAINS_OP_DICT] = { .nuops = 1, .uops = { { _CONTAINS_OP_DICT, 0, 0 } } },
|
||||
[CONTAINS_OP_LIST] = { .nuops = 1, .uops = { { _CONTAINS_OP_LIST, 0, 0 } } },
|
||||
[CONTAINS_OP_SET] = { .nuops = 1, .uops = { { _CONTAINS_OP_SET, 0, 0 } } },
|
||||
[CONTAINS_OP_STR] = { .nuops = 1, .uops = { { _CONTAINS_OP_STR, 0, 0 } } },
|
||||
[CONTAINS_OP_TUPLE] = { .nuops = 1, .uops = { { _CONTAINS_OP_TUPLE, 0, 0 } } },
|
||||
[CONVERT_VALUE] = { .nuops = 1, .uops = { { _CONVERT_VALUE, 0, 0 } } },
|
||||
[COPY] = { .nuops = 1, .uops = { { _COPY, 0, 0 } } },
|
||||
[COPY_FREE_VARS] = { .nuops = 1, .uops = { { _COPY_FREE_VARS, 0, 0 } } },
|
||||
|
|
@ -1429,10 +1411,7 @@ const char *_PyOpcode_OpName[268] = {
|
|||
[COMPARE_OP_STR] = "COMPARE_OP_STR",
|
||||
[CONTAINS_OP] = "CONTAINS_OP",
|
||||
[CONTAINS_OP_DICT] = "CONTAINS_OP_DICT",
|
||||
[CONTAINS_OP_LIST] = "CONTAINS_OP_LIST",
|
||||
[CONTAINS_OP_SET] = "CONTAINS_OP_SET",
|
||||
[CONTAINS_OP_STR] = "CONTAINS_OP_STR",
|
||||
[CONTAINS_OP_TUPLE] = "CONTAINS_OP_TUPLE",
|
||||
[CONVERT_VALUE] = "CONVERT_VALUE",
|
||||
[COPY] = "COPY",
|
||||
[COPY_FREE_VARS] = "COPY_FREE_VARS",
|
||||
|
|
@ -1685,10 +1664,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
|
|||
[COMPARE_OP_STR] = COMPARE_OP,
|
||||
[CONTAINS_OP] = CONTAINS_OP,
|
||||
[CONTAINS_OP_DICT] = CONTAINS_OP,
|
||||
[CONTAINS_OP_LIST] = CONTAINS_OP,
|
||||
[CONTAINS_OP_SET] = CONTAINS_OP,
|
||||
[CONTAINS_OP_STR] = CONTAINS_OP,
|
||||
[CONTAINS_OP_TUPLE] = CONTAINS_OP,
|
||||
[CONVERT_VALUE] = CONVERT_VALUE,
|
||||
[COPY] = COPY,
|
||||
[COPY_FREE_VARS] = COPY_FREE_VARS,
|
||||
|
|
@ -1875,6 +1851,9 @@ const uint8_t _PyOpcode_Deopt[256] = {
|
|||
case 146: \
|
||||
case 147: \
|
||||
case 148: \
|
||||
case 221: \
|
||||
case 222: \
|
||||
case 223: \
|
||||
case 224: \
|
||||
case 225: \
|
||||
case 226: \
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ typedef struct {
|
|||
PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
|
||||
} _PyTupleIterObject;
|
||||
|
||||
PyAPI_FUNC(int) _PyTuple_Contains(PyTupleObject *a, PyObject *el);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
3
Include/internal/pycore_uop_ids.h
generated
3
Include/internal/pycore_uop_ids.h
generated
|
|
@ -76,10 +76,7 @@ extern "C" {
|
|||
#define _COMPARE_OP_STR 328
|
||||
#define _CONTAINS_OP 329
|
||||
#define _CONTAINS_OP_DICT CONTAINS_OP_DICT
|
||||
#define _CONTAINS_OP_LIST CONTAINS_OP_LIST
|
||||
#define _CONTAINS_OP_SET CONTAINS_OP_SET
|
||||
#define _CONTAINS_OP_STR CONTAINS_OP_STR
|
||||
#define _CONTAINS_OP_TUPLE CONTAINS_OP_TUPLE
|
||||
#define _CONVERT_VALUE CONVERT_VALUE
|
||||
#define _COPY COPY
|
||||
#define _COPY_FREE_VARS COPY_FREE_VARS
|
||||
|
|
|
|||
6
Include/internal/pycore_uop_metadata.h
generated
6
Include/internal/pycore_uop_metadata.h
generated
|
|
@ -154,11 +154,8 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
|
|||
[_COMPARE_OP_STR] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_IS_OP] = HAS_ARG_FLAG,
|
||||
[_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CONTAINS_OP_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CONTAINS_OP_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CONTAINS_OP_STR] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_CHECK_EXC_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
|
||||
[_IS_NONE] = 0,
|
||||
|
|
@ -314,10 +311,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
|
|||
[_COMPARE_OP_STR] = "_COMPARE_OP_STR",
|
||||
[_CONTAINS_OP] = "_CONTAINS_OP",
|
||||
[_CONTAINS_OP_DICT] = "_CONTAINS_OP_DICT",
|
||||
[_CONTAINS_OP_LIST] = "_CONTAINS_OP_LIST",
|
||||
[_CONTAINS_OP_SET] = "_CONTAINS_OP_SET",
|
||||
[_CONTAINS_OP_STR] = "_CONTAINS_OP_STR",
|
||||
[_CONTAINS_OP_TUPLE] = "_CONTAINS_OP_TUPLE",
|
||||
[_CONVERT_VALUE] = "_CONVERT_VALUE",
|
||||
[_COPY] = "_COPY",
|
||||
[_COPY_FREE_VARS] = "_COPY_FREE_VARS",
|
||||
|
|
|
|||
77
Include/opcode_ids.h
generated
77
Include/opcode_ids.h
generated
|
|
@ -164,46 +164,43 @@ extern "C" {
|
|||
#define COMPARE_OP_INT 181
|
||||
#define COMPARE_OP_STR 182
|
||||
#define CONTAINS_OP_DICT 183
|
||||
#define CONTAINS_OP_LIST 184
|
||||
#define CONTAINS_OP_SET 185
|
||||
#define CONTAINS_OP_STR 186
|
||||
#define CONTAINS_OP_TUPLE 187
|
||||
#define FOR_ITER_GEN 188
|
||||
#define FOR_ITER_LIST 189
|
||||
#define FOR_ITER_RANGE 190
|
||||
#define FOR_ITER_TUPLE 191
|
||||
#define LOAD_ATTR_CLASS 192
|
||||
#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 193
|
||||
#define LOAD_ATTR_INSTANCE_VALUE 194
|
||||
#define LOAD_ATTR_METHOD_LAZY_DICT 195
|
||||
#define LOAD_ATTR_METHOD_NO_DICT 196
|
||||
#define LOAD_ATTR_METHOD_WITH_VALUES 197
|
||||
#define LOAD_ATTR_MODULE 198
|
||||
#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 199
|
||||
#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 200
|
||||
#define LOAD_ATTR_PROPERTY 201
|
||||
#define LOAD_ATTR_SLOT 202
|
||||
#define LOAD_ATTR_WITH_HINT 203
|
||||
#define LOAD_GLOBAL_BUILTIN 204
|
||||
#define LOAD_GLOBAL_MODULE 205
|
||||
#define LOAD_SUPER_ATTR_ATTR 206
|
||||
#define LOAD_SUPER_ATTR_METHOD 207
|
||||
#define RESUME_CHECK 208
|
||||
#define SEND_GEN 209
|
||||
#define STORE_ATTR_INSTANCE_VALUE 210
|
||||
#define STORE_ATTR_SLOT 211
|
||||
#define STORE_ATTR_WITH_HINT 212
|
||||
#define STORE_SUBSCR_DICT 213
|
||||
#define STORE_SUBSCR_LIST_INT 214
|
||||
#define TO_BOOL_ALWAYS_TRUE 215
|
||||
#define TO_BOOL_BOOL 216
|
||||
#define TO_BOOL_INT 217
|
||||
#define TO_BOOL_LIST 218
|
||||
#define TO_BOOL_NONE 219
|
||||
#define TO_BOOL_STR 220
|
||||
#define UNPACK_SEQUENCE_LIST 221
|
||||
#define UNPACK_SEQUENCE_TUPLE 222
|
||||
#define UNPACK_SEQUENCE_TWO_TUPLE 223
|
||||
#define CONTAINS_OP_SET 184
|
||||
#define FOR_ITER_GEN 185
|
||||
#define FOR_ITER_LIST 186
|
||||
#define FOR_ITER_RANGE 187
|
||||
#define FOR_ITER_TUPLE 188
|
||||
#define LOAD_ATTR_CLASS 189
|
||||
#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 190
|
||||
#define LOAD_ATTR_INSTANCE_VALUE 191
|
||||
#define LOAD_ATTR_METHOD_LAZY_DICT 192
|
||||
#define LOAD_ATTR_METHOD_NO_DICT 193
|
||||
#define LOAD_ATTR_METHOD_WITH_VALUES 194
|
||||
#define LOAD_ATTR_MODULE 195
|
||||
#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 196
|
||||
#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 197
|
||||
#define LOAD_ATTR_PROPERTY 198
|
||||
#define LOAD_ATTR_SLOT 199
|
||||
#define LOAD_ATTR_WITH_HINT 200
|
||||
#define LOAD_GLOBAL_BUILTIN 201
|
||||
#define LOAD_GLOBAL_MODULE 202
|
||||
#define LOAD_SUPER_ATTR_ATTR 203
|
||||
#define LOAD_SUPER_ATTR_METHOD 204
|
||||
#define RESUME_CHECK 205
|
||||
#define SEND_GEN 206
|
||||
#define STORE_ATTR_INSTANCE_VALUE 207
|
||||
#define STORE_ATTR_SLOT 208
|
||||
#define STORE_ATTR_WITH_HINT 209
|
||||
#define STORE_SUBSCR_DICT 210
|
||||
#define STORE_SUBSCR_LIST_INT 211
|
||||
#define TO_BOOL_ALWAYS_TRUE 212
|
||||
#define TO_BOOL_BOOL 213
|
||||
#define TO_BOOL_INT 214
|
||||
#define TO_BOOL_LIST 215
|
||||
#define TO_BOOL_NONE 216
|
||||
#define TO_BOOL_STR 217
|
||||
#define UNPACK_SEQUENCE_LIST 218
|
||||
#define UNPACK_SEQUENCE_TUPLE 219
|
||||
#define UNPACK_SEQUENCE_TWO_TUPLE 220
|
||||
#define INSTRUMENTED_RESUME 236
|
||||
#define INSTRUMENTED_END_FOR 237
|
||||
#define INSTRUMENTED_END_SEND 238
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue