8000 bpo-46841: Quicken code in-place by brandtbucher · Pull Request #31888 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-46841: Quicken code in-place #31888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Mar 21, 2022
Merged

bpo-46841: Quicken code in-place #31888

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6ca0d42
Move bytecode into the code object
brandtbucher Mar 10, 2022
a77a124
Clean things up a bit
brandtbucher Mar 10, 2022
975b8d1
Bump the magic number
brandtbucher Mar 10, 2022
40ddf39
co_bytecode -> _co_code
brandtbucher Mar 10, 2022
bfcba6d
Generate specialization table
brandtbucher Mar 10, 2022
0376822
Clean things up a bit
brandtbucher Mar 10, 2022
3e77b8d
Pack code objects more efficiently
brandtbucher Mar 10, 2022
0a598a7
Fix typo
brandtbucher Mar 10, 2022
2fda3b8
More cleanup
brandtbucher Mar 11, 2022
42810dd
Try a different approach
brandtbucher Mar 11, 2022
7df4934
Clean up the diff
brandtbucher Mar 11, 2022
5fa0ca2
Support equality comparisons again
brandtbucher Mar 11, 2022
1fc2282
Never un-quicken!
brandtbucher Mar 11, 2022
b40e300
More renaming and cleanup
brandtbucher Mar 11, 2022
af27670
Revert marshal format changes
brandtbucher Mar 11, 2022
629bf8b
More cleanup
brandtbucher Mar 11, 2022
59cda59
Clean up the diff
brandtbucher Mar 11, 2022
73c33c1
Catch up with main
brandtbucher Mar 12, 2022
ecfb193
Miscellaneous cleanup
brandtbucher Mar 14, 2022
824b2da
Remove outdated comment
brandtbucher Mar 14, 2022
8164f41
Properly skip over EXTENDED_ARG instructions
brandtbucher Mar 14, 2022
932a3f2
Make sure that f_lasti is always valid
b 8000 randtbucher Mar 14, 2022
c0c5498
Add some comments
brandtbucher Mar 14, 2022
f62a395
Catch up with main
brandtbucher Mar 14, 2022
e7464a3
Check opargs during size calculations
brandtbucher Mar 14, 2022
4f51fdd
Add another TODO
brandtbucher Mar 14, 2022
75bd375
Clean up formatting
brandtbucher Mar 15, 2022
d6d5128
Fix compiler warning
brandtbucher Mar 15, 2022
82145c1
Simplify calculation of instr_prev
brandtbucher Mar 15, 2022
ca176ac
_Py_Quicken -> _PyCode_Quicken
brandtbucher Mar 15, 2022
1e06bb5
Revert expensive f_lasti changes
brandtbucher Mar 15, 2022
e70819f
Naming is hard
brandtbucher Mar 16, 2022
001eb53
Catch up with main
brandtbucher Mar 16, 2022
6b96204
make patchcheck
brandtbucher Mar 16, 2022
3087025
blurb add
brandtbucher Mar 16, 2022
6f3bc38
Reuse the PyCodeObject definition for deepfreeze
brandtbucher Mar 16, 2022
c8054b9
Clean up TODO
brandtbucher Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clean up formatting
  • Loading branch information
@brandtbucher
brandtbucher committed Mar 15, 2022
commit 75bd37546db01be600b115df93c67dec5b6eb285
170 changes: 85 additions & 85 deletions Lib/opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,106 +230,106 @@ def jabs_op(name, op, entries=0):
]

_specializations = {
'BINARY_OP': [
'BINARY_OP_ADAPTIVE',
'BINARY_OP_ADD_FLOAT',
'BINARY_OP_ADD_INT',
'BINARY_OP_ADD_UNICODE',
'BINARY_OP_INPLACE_ADD_UNICODE',
'BINARY_OP_MULTIPLY_FLOAT',
'BINARY_OP_MULTIPLY_INT',
'BINARY_OP_SUBTRACT_FLOAT',
'BINARY_OP_SUBTRACT_INT',
"BINARY_OP": [
"BINARY_OP_ADAPTIVE",
"BINARY_OP_ADD_FLOAT",
"BINARY_OP_ADD_INT",
"BINARY_OP_ADD_UNICODE",
"BINARY_OP_INPLACE_ADD_UNICODE",
"BINARY_OP_MULTIPLY_FLOAT",
"BINARY_OP_MULTIPLY_INT",
"BINARY_OP_SUBTRACT_FLOAT",
"BINARY_OP_SUBTRACT_INT",
],
'BINARY_SUBSCR': [
'BINARY_SUBSCR_ADAPTIVE',
'BINARY_SUBSCR_DICT',
'BINARY_SUBSCR_GETITEM',
'BINARY_SUBSCR_LIST_INT',
'BINARY_SUBSCR_TUPLE_INT',
"BINARY_SUBSCR": [
"BINARY_SUBSCR_ADAPTIVE",
"BINARY_SUBSCR_DICT",
"BINARY_SUBSCR_GETITEM",
"BINARY_SUBSCR_LIST_INT",
"BINARY_SUBSCR_TUPLE_INT",
],
'CALL': [
'CALL_ADAPTIVE',
'CALL_PY_EXACT_ARGS',
'CALL_PY_WITH_DEFAULTS',
"CALL": [
"CALL_ADAPTIVE",
"CALL_PY_EXACT_ARGS",
"CALL_PY_WITH_DEFAULTS",
],
'COMPARE_OP': [
'COMPARE_OP_ADAPTIVE',
'COMPARE_OP_FLOAT_JUMP',
'COMPARE_OP_INT_JUMP',
'COMPARE_OP_STR_JUMP',
"COMPARE_OP": [
"COMPARE_OP_ADAPTIVE",
"COMPARE_OP_FLOAT_JUMP",
"COMPARE_OP_INT_JUMP",
"COMPARE_OP_STR_JUMP",
],
'JUMP_ABSOLUTE': [
'JUMP_ABSOLUTE_QUICK',
"JUMP_ABSOLUTE": [
"JUMP_ABSOLUTE_QUICK",
],
'LOAD_ATTR': [
'LOAD_ATTR_ADAPTIVE',
'LOAD_ATTR_INSTANCE_VALUE',
'LOAD_ATTR_MODULE',
'LOAD_ATTR_SLOT',
'LOAD_ATTR_WITH_HINT',
"LOAD_ATTR": [
"LOAD_ATTR_ADAPTIVE",
"LOAD_ATTR_INSTANCE_VALUE",
"LOAD_ATTR_MODULE",
"LOAD_ATTR_SLOT",
"LOAD_ATTR_WITH_HINT",
],
'LOAD_CONST': [
'LOAD_CONST__LOAD_FAST',
"LOAD_CONST": [
"LOAD_CONST__LOAD_FAST",
],
'LOAD_FAST': [
'LOAD_FAST__LOAD_CONST',
'LOAD_FAST__LOAD_FAST',
"LOAD_FAST": [
"LOAD_FAST__LOAD_CONST",
"LOAD_FAST__LOAD_FAST",
],
'LOAD_GLOBAL': [
'LOAD_GLOBAL_ADAPTIVE',
'LOAD_GLOBAL_BUILTIN',
'LOAD_GLOBAL_MODULE',
"LOAD_GLOBAL": [
"LOAD_GLOBAL_ADAPTIVE",
"LOAD_GLOBAL_BUILTIN",
"LOAD_GLOBAL_MODULE",
],
'LOAD_METHOD': [
'LOAD_METHOD_ADAPTIVE',
'LOAD_METHOD_CLASS',
'LOAD_METHOD_MODULE',
'LOAD_METHOD_NO_DICT',
'LOAD_METHOD_WITH_DICT',
'LOAD_METHOD_WITH_VALUES',
"LOAD_METHOD": [
"LOAD_METHOD_ADAPTIVE",
"LOAD_METHOD_CLASS",
"LOAD_METHOD_MODULE",
"LOAD_METHOD_NO_DICT",
"LOAD_METHOD_WITH_DICT",
"LOAD_METHOD_WITH_VALUES",
],
'PRECALL': [
'PRECALL_ADAPTIVE',
'PRECALL_BOUND_METHOD',
'PRECALL_BUILTIN_CLASS',
'PRECALL_BUILTIN_FAST_WITH_KEYWORDS',
'PRECALL_NO_KW_BUILTIN_FAST',
'PRECALL_NO_KW_BUILTIN_O',
'PRECALL_NO_KW_ISINSTANCE',
'PRECALL_NO_KW_LEN',
'PRECALL_NO_KW_LIST_APPEND',
'PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST',
'PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS',
'PRECALL_NO_KW_METHOD_DESCRIPTOR_O',
'PRECALL_NO_KW_STR_1',
'PRECALL_NO_KW_TUPLE_1',
'PRECALL_NO_KW_TYPE_1',
'PRECALL_PYFUNC',
"PRECALL": [
"PRECALL_ADAPTIVE",
"PRECALL_BOUND_METHOD",
"PRECALL_BUILTIN_CLASS",
"PRECALL_BUILTIN_FAST_WITH_KEYWORDS",
"PRECALL_NO_KW_BUILTIN_FAST",
"PRECALL_NO_KW_BUILTIN_O",
"PRECALL_NO_KW_ISINSTANCE",
"PRECALL_NO_KW_LEN",
"PRECALL_NO_KW_LIST_APPEND",
"PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST",
"PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
"PRECALL_NO_KW_METHOD_DESCRIPTOR_O",
"PRECALL_NO_KW_STR_1",
"PRECALL_NO_KW_TUPLE_1",
"PRECALL_NO_KW_TYPE_1",
"PRECALL_PYFUNC",
],
'RESUME': [
'RESUME_QUICK',
"RESUME": [
"RESUME_QUICK",
],
'STORE_ATTR': [
'STORE_ATTR_ADAPTIVE',
'STORE_ATTR_INSTANCE_VALUE',
'STORE_ATTR_SLOT',
'STORE_ATTR_WITH_HINT',
"STORE_ATTR": [
"STORE_ATTR_ADAPTIVE",
"STORE_ATTR_INSTANCE_VALUE",
"STORE_ATTR_SLOT",
"STORE_ATTR_WITH_HINT",
],
'STORE_FAST': [
'STORE_FAST__LOAD_FAST',
'STORE_FAST__STORE_FAST',
"STORE_FAST": [
"STORE_FAST__LOAD_FAST",
"STORE_FAST__STORE_FAST",
],
'STORE_SUBSCR': [
'STORE_SUBSCR_ADAPTIVE',
'STORE_SUBSCR_DICT',
'STORE_SUBSCR_LIST_INT',
"STORE_SUBSCR": [
"STORE_SUBSCR_ADAPTIVE",
"STORE_SUBSCR_DICT",
"STORE_SUBSCR_LIST_INT",
],
'UNPACK_SEQUENCE': [
'UNPACK_SEQUENCE_ADAPTIVE',
'UNPACK_SEQUENCE_LIST',
'UNPACK_SEQUENCE_TUPLE',
'UNPACK_SEQUENCE_TWO_TUPLE',
"UNPACK_SEQUENCE": [
"UNPACK_SEQUENCE_ADAPTIVE",
"UNPACK_SEQUENCE_LIST",
"UNPACK_SEQUENCE_TUPLE",
"UNPACK_SEQUENCE_TWO_TUPLE",
],
}
_specialized_instructions = [
Expand Down
0