8000 GH-98831: Typed stack effects, and more instructions converted by gvanrossum · Pull Request #99764 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-98831: Typed stack effects, and more instructions converted #99764

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 34 commits into from
Dec 8, 2022
Merged

GH-98831: Typed stack effects, and more instructions converted #99764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6860ed7
Make BINARY_OP_INPLACE_ADD_UNICODE a legit super instruction
gvanrossum Nov 22, 2022
dcba32e
COMPARE_OP
gvanrossum Nov 24, 2022
30cb8cd
COMPARE_OP_FLOAT_JUMP
gvanrossum Nov 24, 2022
6af0a5d
COMPARE_OP_INT_JUMP
gvanrossum Nov 24, 2022
039efbf
COMPARE_OP_STR_JUMP
gvanrossum Nov 24, 2022
2fd8822
Support typed stack effects
gvanrossum Nov 25, 2022
14bbd50
Refactor common code of analyze_{super,macro}
gvanrossum Nov 25, 2022
00a2495
Reverse temporary variable numbering
gvanrossum Nov 25, 2022
f01dff5
STORE_ATTR
gvanrossum Nov 25, 2022
71ee089
DELETE_ATTR
gvanrossum Nov 25, 2022
966da1a
STORE_GLOBAL
gvanrossum Nov 25, 2022
7c94591
STORE_ATTR_INSTANCE_VALUE
gvanrossum Nov 25, 2022
2c76046
STORE_ATTR_WITH_HINT
gvanrossum Nov 25, 2022
d0f29f8
STORE_ATTR_SLOT, and complete the store_attr family
gvanrossum Nov 25, 2022
001c418
Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
gvanrossum Nov 26, 2022
05caa7e
DELETE_SUBSCR
8000 gvanrossum Nov 26, 2022
8d445ae
PRINT_EXPR
gvanrossum Nov 26, 2022
c1f3034
INTERPRETER_EXIT (a bit weird, ends in return)
gvanrossum Nov 26, 2022
e2f376b
RETURN_VALUE
gvanrossum Nov 26, 2022
53c204e
GET_AITER (had to restructure it some)
gvanrossum Nov 26, 2022
e0ba8bf
Typo in TODO comment
gvanrossum Nov 26, 2022
f7a54d7
Emit PREDICT() macros right before DISPATCH()
gvanrossum Nov 28, 2022
6ae9e6e
LIST_APPEND (a bit unhappy with it)
gvanrossum Nov 26, 2022
34aa393
SET_ADD (also a bit unhappy with it)
gvanrossum Nov 26, 2022
e144db3
Move all cache effects to the front of the effects list
gvanrossum Dec 8, 2022
029bf07
Rename _JUMP_ON_SIGN to _JUMP_IF
gvanrossum Dec 8, 2022
fa3135f
Change ERROR_IF(err != 0, ...) to ERROR_IF(err, ...)
gvanrossum Dec 8, 2022
445f20b
Change ERROR_IF(1, ...) to ERROR_IF(true, ...)
gvanrossum Dec 8, 2022
32b4ac0
Revert "Make BINARY_OP_INPLACE_ADD_UNICODE a legit super instruction"
gvanrossum Dec 8, 2022
0ef4da7
Emit PEEKs in super/macro instructions in correct order
gvanrossum Dec 8, 2022
7d19466
Use JUMPBY(n) instead of next_instr += n
gvanrossum Dec 8, 2022
99e8ec6
Rename local variables type to typ
gvanrossum Dec 8, 2022
c08dbdb
Remove unused op names
gvanrossum Dec 8, 2022
c6dfeec
Merge branch 'main' into typed-stack-effects
gvanrossum Dec 8, 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
INTERPRETER_EXIT (a bit weird, ends in return)
  • Loading branch information
@gvanrossum
gvanrossum committed Dec 3, 2022
commit c1f303487c1b11ff875f489bb9e3218e414a4d6c
7 changes: 3 additions & 4 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ do { \
static PyObject *value, *value1, *value2, *left, *right, *res, *sum, *prod, *sub;
static PyObject *container, *start, *stop, *v, *lhs, *rhs;
static PyObject *list, *tuple, *dict, *owner;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to have the generator also build a header with all of these lines? You would need to run the generator at least once before the red squiggles go away, but then we don't have to worry about manually maintaining this blob of stuff.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this part of the tooling is kind of annoying. But having the generator also update bytecodes.c seems sneaky (and slightly dangerous).

static PyObject *exit_func, *lasti, *val;
static PyObject *exit_func, *lasti, *val, *retval;
static size_t jump;
// Dummy variables for cache effects
static _Py_CODEUNIT when_to_jump_mask, invert, counter, index, hint;
Expand Down Expand Up @@ -589,11 +589,10 @@ dummy_func(
goto error;
}

// stack effect: (__0 -- )
inst(INTERPRETER_EXIT) {
inst(INTERPRETER_EXIT, (retval --)) {
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
PyObject *retval = POP();
STACK_SHRINK(1); // Since we're not going to DISPATCH()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually needed? Or just the "right" thing to do?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without it the assert(EMPTY()) on the next line fails. I'm kind of hoping that when asserts are off, the compil 8486 er sees that the stack pointer is dead at this point and won't bother to generate code for it. Then again, the original had POP() which also adjusts the stack pointer.

assert(EMPTY());
/* Restore previous cframe and return. */
tstate->cframe = cframe.previous;
Expand Down
3 changes: 2 additions & 1 deletion 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.

0