Skip to content

GH-98831: Simple input-output stack effects #99120

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
gvanrossum merged 22 commits into from
Nov 8, 2022
Merged

GH-98831: Simple input-output stack effects #99120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8868b82
Simple input-output stack effects
gvanrossum Nov 5, 2022
069cfb4
Use PEEK instead of POP; STACK_GROW; etc.
gvanrossum Nov 5, 2022
51db97b
Use POKE(i, v)
gvanrossum Nov 5, 2022
700dd3a
Use ERROR_IF()
gvanrossum Nov 5, 2022
4c990fd
Expand ERROR_IF(), to include SHRINK_STACK()
gvanrossum Nov 5, 2022
2fa6062
Use a varargs inst() macro
gvanrossum Nov 6, 2022
73fab62
Do a few more instructions
gvanrossum Nov 6, 2022
f23b6fb
BINARY_OP_INPLACE_ADD_UNICODE
gvanrossum Nov 6, 2022
fa507a2
Use STACK_SHRINK as needed
gvanrossum Nov 6, 2022
1198502
BINARY_OP_ADD_FLOAT, BINARY_OP_ADD_INT
gvanrossum Nov 6, 2022
ea277ce
Move PREDICTED() up (bad bug)
gvanrossum Nov 6, 2022
fe2767c
BINARY_SUBSCR
gvanrossum Nov 6, 2022
e737bcb
BINARY_SLICE
gvanrossum Nov 6, 2022
19b989c
Bugfix (thanks to Irit)
gvanrossum Nov 6, 2022
b8b4f15
Fix regex nit
gvanrossum Nov 6, 2022
43e7796
Merge main (TODO: PyObject *value etc.)
gvanrossum Nov 6, 2022
62c67b0
Fix code generated for super instructions
gvanrossum Nov 6, 2022
5fbe7b0
STORE_SLICE
gvanrossum Nov 6, 2022
fba1de2
Refactor parser to be more type-correct
gvanrossum Nov 6, 2022
80741b3
STORE_SUBSCR
gvanrossum Nov 7, 2022
415757f
Fewer jumps in ERROR_IF expansion
gvanrossum Nov 7, 2022
48c2a20
Add dummy variables for stack effects
gvanrossum Nov 7, 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
Expand ERROR_IF(), to include SHRINK_STACK()
  • Loading branch information
@gvanrossum
gvanrossum committed Nov 5, 2022
commit 4c990fde08902022b57bd2b6313f782b8866edb0
2 changes: 0 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,6 @@ GETITEM(PyObject *v, Py_ssize_t i) {

#define DEOPT_IF(cond, instname) if (cond) { goto miss; }

#define ERROR_IF(cond, label) if (cond) { goto label; }


#define GLOBALS() frame->f_globals
#define BUILTINS() frame->f_builtins
Expand Down
16 changes: 8 additions & 8 deletions Python/generated_cases.c.h
View file
Open in desktop

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

15 changes: 13 additions & 2 deletions Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,20 @@ def write_cases(f: io.TextIOBase, instrs: list[InstDef]):
while blocklines and not blocklines[-1].strip():
blocklines.pop()
# Write the body
ninputs = len(instr.inputs or ())
for line in blocklines:
f.write(line)
diff = len(instr.outputs or ()) - len(instr.inputs or ())
if m := re.match(r"(\s*)ERROR_IF\(([^,]+), (\w+)\);\s$", line):
space, cond, label = m.groups()
# ERROR_IF() must remove the inputs from the stack.
# The code block is responsible for DECREF()ing them.
if ninputs:
f.write(f"{space}if ({cond}) {{ STACK_SHRINK({ninputs}); goto {label}; }}\n")
else:
f.write(f"{space}if ({cond}) {{ goto {label}; }}\n")
else:
f.write(line)
noutputs = len(instr.outputs or ())
diff = noutputs - ninputs
if diff != 0:
f.write(f"{indent} STACK_GROW({diff});\n")
for i, output in enumerate(reversed(instr.outputs or ()), 1):
Expand Down