Skip to content

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

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

Closed
gvanrossum wants to merge 14 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bfebb3c
Reorganize flag bits
gvanrossum Feb 27, 2024
5c71732
Fix top/bottom tests (bottom has all properties off)
gvanrossum Feb 27, 2024
40eb855
Add _Py_uop_sym_set_non_null in various places
gvanrossum Feb 27, 2024
ef31003
Rename arg of _Py_uop_sym_set_type to typ
gvanrossum Feb 27, 2024
13a60a8
Explain members of Symbol type
gvanrossum Feb 27, 2024
5ec08cd
sym_set_type() may result in bottom
gvanrossum Feb 27, 2024
21c41ea
Add more tests
gvanrossum Feb 28, 2024
3dd01ef
Add sym_set_const and its tests
gvanrossum Feb 28, 2024
02f9aeb
Simplify sym_new signature
gvanrossum Feb 28, 2024
b4cd4f8
Incorporate assertions into sym_is_bottom()
gvanrossum Feb 28, 2024
a61d47a
Fix set_bottom name; add sym_set_const macro
gvanrossum Feb 28, 2024
9359f94
gh-114914: Avoid keeping dead StreamWriter alive (#115661)
CendioOssman Feb 28, 2024
a395ba4
gh-112997: Don't log arguments in asyncio unless debugging (#115667)
CendioOssman Feb 28, 2024
ab5339f
gh-105858: Improve AST node constructors (#105880)
JelleZijlstra 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
Prev Previous commit
Next Next commit
Add sym_set_const and its tests
  • Loading branch information
@gvanrossum
gvanrossum committed Feb 28, 2024
commit 3dd01ef03d28e04f33fc8a295fdded552b1001e8
1 change: 1 addition & 0 deletions Include/internal/pycore_optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ 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_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
154 changes: 112 additions & 42 deletions Python/optimizer_symbols.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ sym_set_flag(_Py_UopsSymbol *sym, int flag)
}

static inline void
_Py_uop_sym_set_bottom(_Py_UopsSymbol *sym)
set_bottom(_Py_UopsSymbol *sym)
{
sym_set_flag(sym, IS_NULL | NOT_NULL);
sym->typ = NULL;
Expand Down Expand Up @@ -116,17 +116,46 @@ void
_Py_uop_sym_set_type(_Py_UopsSymbol *sym, PyTypeObject *typ)
{
assert(typ != NULL && PyType_Check(typ));
if (sym->flags & IS_NULL ||
(sym->typ != NULL && sym->typ != typ))
{
_Py_uop_sym_set_bottom(sym);
if (sym->flags & IS_NULL) {
set_bottom(sym);
return;
}
if (sym->typ != NULL) {
if (sym->typ != typ) {
set_bottom(sym);
}
return;
}
sym_set_flag(sym, NOT_NULL);
sym->typ = typ;
}

void
_Py_uop_sym_set_const(_Py_UopsSymbol *sym, PyObject *const_val)
{
assert(const_val != NULL);
if (sym->flags & IS_NULL) {
set_bottom(sym);
return;
}
PyTypeObject *typ = Py_TYPE(const_val);
if (sym->typ != NULL && sym->typ != typ) {
set_bottom(sym);
return;
}
if (sym->const_val != NULL) {
if (sym->const_val != const_val) {
// TODO: What if they're equal?
set_bottom(sym);
}
return;
}
// May be a no-op
sym_set_flag(sym, NOT_NULL);
sym->typ = typ;
sym->const_val = Py_NewRef(const_val);
}


void
_Py_uop_sym_set_null(_Py_UopsSymbol *sym)
{
Expand Down Expand Up @@ -322,45 +351,86 @@ _Py_uop_symbols_test(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(ignored))
_Py_UOpsContext *ctx = &context;
_Py_uop_abstractcontext_init(ctx);

_Py_UopsSymbol *top = _Py_uop_sym_new_unknown(ctx);
if (top == NULL) {
return NULL;
_Py_UopsSymbol *sym = _Py_uop_sym_new_unknown(ctx);
if (sym == NULL) {
goto fail;
}
TEST_PREDICATE(!_Py_uop_sym_is_null(top), "top is NULL");
TEST_PREDICATE(!_Py_uop_sym_is_not_null(top), "top is not NULL");
TEST_PREDICATE(!_Py_uop_sym_matches_type(top, &PyLong_Type), "top matches a type");
TEST_PREDICATE(!_Py_uop_sym_is_const(top), "top is a constant");
TEST_PREDICATE(_Py_uop_sym_get_const(top) == NULL, "top as constant is not NULL");
TEST_PREDICATE(!_Py_uop_sym_is_bottom(top), "top is bottom");

_Py_UopsSymbol *bottom = make_bottom(ctx);
if (bottom == NULL) {
return NULL;
TEST_PREDICATE(!_Py_uop_sym_is_null(sym), "top is NULL");
TEST_PREDICATE(!_Py_uop_sym_is_not_null(sym), "top is not NULL");
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyLong_Type), "top matches a type");
TEST_PREDICATE(!_Py_uop_sym_is_const(sym), "top is a constant");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == NULL, "top as constant is not NULL");
TEST_PREDICATE(!_Py_uop_sym_is_bottom(sym), "top is bottom");

sym = make_bottom(ctx);
if (sym == NULL) {
goto fail;
}
TEST_PREDICATE(!_Py_uop_sym_is_null(bottom), "bottom is NULL is not false");
TEST_PREDICATE(!_Py_uop_sym_is_not_null(bottom), "bottom is not NULL is not false");
TEST_PREDICATE(!_Py_uop_sym_matches_type(bottom, &PyLong_Type), "bottom matches a type");
TEST_PREDICATE(!_Py_uop_sym_is_const(bottom), "bottom is a constant is not false");
TEST_PREDICATE(_Py_uop_sym_get_const(bottom) == NULL, "bottom as constant is not NULL");
TEST_PREDICATE(_Py_uop_sym_is_bottom(bottom), "bottom isn't bottom");

_Py_UopsSymbol *int_type = _Py_uop_sym_new_type(ctx, &PyLong_Type);
if (int_type == NULL) {
return NULL;
TEST_PREDICATE(!_Py_uop_sym_is_null(sym), "bottom is NULL is not false");
TEST_PREDICATE(!_Py_uop_sym_is_not_null(sym), "bottom is not NULL is not false");
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyLong_Type), "bottom matches a type");
TEST_PREDICATE(!_Py_uop_sym_is_const(sym), "bottom is a constant is not false");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == NULL, "bottom as constant is not NULL");
TEST_PREDICATE(_Py_uop_sym_is_bottom(sym), "bottom isn't bottom");

sym = _Py_uop_sym_new_type(ctx, &PyLong_Type);
if (sym == NULL) {
goto fail;
}
TEST_PREDICATE(!_Py_uop_sym_is_null(sym), "int_type is NULL");
TEST_PREDICATE(_Py_uop_sym_is_not_null(sym), "int_type isn't not NULL");
TEST_PREDICATE(_Py_uop_sym_matches_type(sym, &PyLong_Type), "inconsistent type");
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyFloat_Type), "int matches float");
TEST_PREDICATE(!_Py_uop_sym_is_const(sym), "int_type is a constant");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == NULL, "int_type as constant is not NULL");

_Py_uop_sym_set_type(sym, &PyLong_Type); // Should be a no-op
TEST_PREDICATE(_Py_uop_sym_matches_type(sym, &PyLong_Type), "inconsistent type");

_Py_uop_sym_set_type(sym, &PyFloat_Type); // Should make it bottom
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyLong_Type), "(int and float) matches int");
TEST_PREDICATE(_Py_uop_sym_is_bottom(sym), "(int and float) isn't bottom");

PyObject *val_42 = PyLong_FromLong(42);
assert(val_42 != NULL);
assert(_Py_IsImmortal(val_42));

PyObject *val_43 = PyLong_FromLong(43);
assert(val_43 != NULL);
assert(_Py_IsImmortal(val_43));

sym = _Py_uop_sym_new_type(ctx, &PyLong_Type);
if (sym == NULL) {
goto fail;
}
_Py_uop_sym_set_const(sym, val_42);
TEST_PREDICATE(!_Py_uop_sym_is_null(sym), "int_val is NULL");
TEST_PREDICATE(_Py_uop_sym_is_not_null(sym), "int_val isn't not NULL");
TEST_PREDICATE(_Py_uop_sym_matches_type(sym, &PyLong_Type), "inconsistent type");
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyFloat_Type), "int matches float");
TEST_PREDICATE(_Py_uop_sym_is_const(sym), "int_val is not a constant");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) != NULL, "int_val as constant is NULL");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == val_42, "int_val as constant isn't val_42");

_Py_uop_sym_set_type(sym, &PyLong_Type); // Should be a no-op
TEST_PREDICATE(_Py_uop_sym_matches_type(sym, &PyLong_Type), "inconsistent type");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == val_42, "int_val as constant isn't val_42");

_Py_uop_sym_set_type(sym, &PyFloat_Type); // Should make it bottom
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyLong_Type), "(42 and float) matches int");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == NULL, "(42 and float) as constant isn't NULL");
TEST_PREDICATE(_Py_uop_sym_is_bottom(sym), "(42 and float) isn't bottom");

// Another int_val, to test contradiction by setting const
sym = _Py_uop_sym_new_type(ctx, &PyLong_Type);
if (sym == NULL) {
goto fail;
}
TEST_PREDICATE(!_Py_uop_sym_is_null(int_type), "int_type is NULL");
TEST_PREDICATE(_Py_uop_sym_is_not_null(int_type), "int_type isn't not NULL");
TEST_PREDICATE(_Py_uop_sym_matches_type(int_type, &PyLong_Type), "inconsistent type");
TEST_PREDICATE(!_Py_uop_sym_matches_type(int_type, &PyFloat_Type), "int matches float");
TEST_PREDICATE(!_Py_uop_sym_is_const(int_type), "int_type is a constant");
TEST_PREDICATE(_Py_uop_sym_get_const(int_type) == NULL, "int_type as constant is not NULL");

_Py_uop_sym_set_type(int_type, &PyLong_Type); // Should be a no-op
TEST_PREDICATE(_Py_uop_sym_matches_type(int_type, &PyLong_Type), "inconsistent type");

_Py_uop_sym_set_type(int_type, &PyFloat_Type); // Should make it bottom
TEST_PREDICATE(!_Py_uop_sym_matches_type(int_type, &PyLong_Type), "(int and float) matches int");
TEST_PREDICATE(_Py_uop_sym_is_bottom(int_type), "(int and float) isn't bottom");
_Py_uop_sym_set_const(sym, val_42);
_Py_uop_sym_set_const(sym, val_43); // Should make it bottom
TEST_PREDICATE(!_Py_uop_sym_matches_type(sym, &PyLong_Type), "(42 and 43) matches int");
TEST_PREDICATE(_Py_uop_sym_get_const(sym) == NULL, "(42 and 43) as constant isn't NULL");
TEST_PREDICATE(_Py_uop_sym_is_bottom(sym), "(42 and 43) isn't bottom");

_Py_uop_abstractcontext_fini(ctx);
Py_RETURN_NONE;
Expand Down