gh-116381: Remove bad specializations, add fail stats (GH-116464)

* Remove bad specializations, add fail stats
This commit is contained in:
Ken Jin 2024-03-08 00:21:21 +08:00 committed by GitHub
parent 4298d69d4b
commit 41457c7fdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 125 additions and 320 deletions

View file

@ -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: \