Skip to content

gh-115816: Improve internal symbols API in optimizer #116028

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 15 commits into from
Feb 28, 2024
Merged

gh-115816: Improve internal symbols API in optimizer #116028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9696b67
Reorganize flag bits
gvanrossum Feb 27, 2024
cd120a4
Fix top/bottom tests (bottom has all properties off)
gvanrossum Feb 27, 2024
ffdf029
Add _Py_uop_sym_set_non_null in various places
gvanrossum Feb 27, 2024
7d44eed
Rename arg of _Py_uop_sym_set_type to typ
gvanrossum Feb 27, 2024
ac83bb6
Explain members of Symbol type
gvanrossum Feb 27, 2024
c6c7c66
sym_set_type() may result in bottom
gvanrossum Feb 27, 2024
0cda7a8
Add more tests
gvanrossum Feb 28, 2024
5b0c862
Add sym_set_const and its tests
gvanrossum Feb 28, 2024
785bafb
Simplify sym_new signature
gvanrossum Feb 28, 2024
17a8d67
Incorporate assertions into sym_is_bottom()
gvanrossum Feb 28, 2024
bc39039
Fix set_bottom name; add sym_set_const macro
gvanrossum Feb 28, 2024
c355bc6
Simplification and decrefs from code review
gvanrossum Feb 28, 2024
5362360
Merge remote-tracking branch 'origin/main' into new-symbols
gvanrossum Feb 28, 2024
761d2b1
Declare val_42/43 earlier.
gvanrossum Feb 28, 2024
b0509ce
Fix bug -- if sym->typ is NULL, don't cry bottom
gvanrossum Feb 28, 2024
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
12 changes: 7 additions & 5 deletions Include/internal/pycore_optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ extern PyTypeObject _PyUOpExecutor_Type;
extern PyTypeObject _PyUOpOptimizer_Type;

/* Symbols */
/* See explanation in optimizer_symbols.c */

struct _Py_UopsSymbol {
int flags;
PyTypeObject *typ;
// constant propagated value (might be NULL)
PyObject *const_val;
int flags; // 0 bits: Top; 2 or more bits: Bottom
PyTypeObject *typ; // Borrowed reference
PyObject *const_val; // Owned reference (!)
};

// Holds locals, stack, locals, stack ... co_consts (in that order)
Expand Down Expand Up @@ -92,7 +92,9 @@ extern _Py_UopsSymbol *_Py_uop_sym_new_const(_Py_UOpsContext *ctx, PyObject *con
extern _Py_UopsSymbol *_Py_uop_sym_new_null(_Py_UOpsContext *ctx);
extern bool _Py_uop_sym_matches_type(_Py_UopsSymbol *sym, PyTypeObject *typ);
extern void _Py_uop_sym_set_null(_Py_UopsSymbol *sym);
extern void _Py_uop_sym_set_type(_Py_UopsSymbol *sym, PyTypeObject *tp);
extern void _Py_uop_sym_set_non_null(_Py_UopsSymbol *sym);
extern void _Py_uop_sym_set_type(_Py_UopsSymbol *sym, PyTypeObject *typ);
extern void _Py_uop_sym_set_const(_Py_UopsSymbol *sym, PyObject *const_val);

extern int _Py_uop_abstractcontext_init(_Py_UOpsContext *ctx);
extern void _Py_uop_abstractcontext_fini(_Py_UOpsContext *ctx);
Expand Down
2 changes: 2 additions & 0 deletions Python/optimizer_analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,9 @@ remove_globals(_PyInterpreterFrame *frame, _PyUOpInstruction *buffer,
#define sym_new_null _Py_uop_sym_new_null
#define sym_matches_type _Py_uop_sym_matches_type
#define sym_set_null _Py_uop_sym_set_null
#define sym_set_non_null _Py_uop_sym_set_non_null
#define sym_set_type _Py_uop_sym_set_type
#define sym_set_const _Py_uop_sym_set_const
#define frame_new _Py_uop_frame_new
#define frame_pop _Py_uop_frame_pop

Expand Down
2 changes: 2 additions & 0 deletions Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
#define sym_new_null _Py_uop_sym_new_null
#define sym_matches_type _Py_uop_sym_matches_type
#define sym_set_null _Py_uop_sym_set_null
#define sym_set_non_null _Py_uop_sym_set_non_null
#define sym_set_type _Py_uop_sym_set_type
#define sym_set_const _Py_uop_sym_set_const
#define frame_new _Py_uop_frame_new
#define frame_pop _Py_uop_frame_pop

Expand Down
Loading