Skip to content
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

Jump to bottom

Micro-optimize the LOAD_FAST opcode #92763

Closed
wants to merge 16 commits into from
Closed

Micro-optimize the LOAD_FAST opcode #92763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3627bb5
implement LOAD_FAST_KNOWN
sweeneyde May 10, 2022
ac0ad1b
fix leak and add stack effect
sweeneyde May 10, 2022
721e6ed
add failing test
sweeneyde May 10, 2022
42ef42f
Attempt exception handling
sweeneyde May 10, 2022
a8e94f8
Parameters are guaranteed to be initialized
sweeneyde May 10, 2022
038a85d
revert to LOAD_FAST on lineno setter and LocalsToFast
sweeneyde May 10, 2022
3243981
Port over superinstructions
sweeneyde May 10, 2022
0ddc721
remove debugging code so non-debug builds work.
sweeneyde May 10, 2022
dea4a83
NOTRACE_DISPATCH() and TARGET_SAFE
sweeneyde May 11, 2022
df0abe9
Fix and remove debugging code
sweeneyde May 13, 2022
566ff81
Merge remote-tracking branch 'upstream/main' into microopt
sweeneyde May 13, 2022
3e3ca26
Add more test cases
sweeneyde May 13, 2022
0ea6c86
Update test_dis
sweeneyde May 13, 2022
f2c5e1f
Fix asan and leaky symbols
sweeneyde May 13, 2022
749030c
Merge remote-tracking branch 'upstream/main' into microopt
sweeneyde May 17, 2022
0818033
Use make_cfg_traversal_stack
sweeneyde May 17, 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
46 changes: 24 additions & 22 deletions Include/internal/pycore_opcode.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 42 additions & 40 deletions Include/opcode.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,8 @@ def _write_atomic(path, data, mode=0o666):
# add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
# Python 3.11a7 3492 (make POP_JUMP_IF_NONE/NOT_NONE/TRUE/FALSE relative)
# Python 3.11a7 3493 (Make JUMP_IF_TRUE_OR_POP/JUMP_IF_FALSE_OR_POP relative)
# Python 3.11a7 3494 (New location info table)
# Python 3.12 will start with magic number 3500

# Python 3.11a7 3494 (New location info table)
# Python 3.12a0 3500 (LOAD_FAST_KNOWN)

#
# MAGIC must change whenever the bytecode emitted by the compiler may no
Expand All @@ -416,7 +415,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.

MAGIC_NUMBER = (3494).to_bytes(2, 'little') + b'\r\n'
MAGIC_NUMBER = (3500).to_bytes(2, 'little') + b'\r\n'

_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c

Expand Down
5 changes: 5 additions & 0 deletions Lib/opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ def jabs_op(name, op):
haslocal.append(125)
def_op('DELETE_FAST', 126) # Local variable number
haslocal.append(126)
def_op('LOAD_FAST_KNOWN', 127) # Local variable number
haslocal.append(127)
jrel_op('POP_JUMP_FORWARD_IF_NOT_NONE', 128)
jrel_op('POP_JUMP_FORWARD_IF_NONE', 129)
def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3)
Expand Down Expand Up @@ -281,6 +283,9 @@ def jabs_op(name, op):
"LOAD_FAST__LOAD_CONST",
"LOAD_FAST__LOAD_FAST",
],
"LOAD_FAST_KNOWN": [
"LOAD_FAST_KNOWN_QUICK",
],
"LOAD_GLOBAL": [
"LOAD_GLOBAL_ADAPTIVE",
"LOAD_GLOBAL_BUILTIN",
Expand Down
Loading