Skip to content

GH-119258: Handle STORE_ATTR_WITH_HINT in tier two #119481

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 4 commits into from
May 28, 2024
Merged

GH-119258: Handle STORE_ATTR_WITH_HINT in tier two #119481

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f70d9e
Handle STORE_ATTR_WITH_HINT in tier two
brandtbucher May 23, 2024
cd597c8
Make _PyDict_SendEvent visible on Windows
brandtbucher May 24, 2024
7f3af1f
Fix unused variable warning
brandtbucher May 24, 2024
3ecf6e3
make regen-all
brandtbucher May 24, 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
2 changes: 1 addition & 1 deletion Include/internal/pycore_dict.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ dict_next_version(PyInterpreterState *interp)
((INTERP)->dict_state.global_version += DICT_VERSION_INCREMENT)
#endif

void
PyAPI_FUNC(void)
Copy link
Member

@markshannon markshannon May 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Why does this symbol need to be exposed?
It isn't used by the JIT.

It is used, via the _PyDict_NotifyEvent inline function.

_PyDict_SendEvent(int watcher_bits,
PyDict_WatchEvent event,
PyDictObject *mp,
Expand Down
3 changes: 2 additions & 1 deletion Include/internal/pycore_opcode_metadata.h
View file
Open in desktop

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

30 changes: 15 additions & 15 deletions Include/internal/pycore_uop_ids.h
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions Include/internal/pycore_uop_metadata.h
View file
Open in desktop

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

9 changes: 6 additions & 3 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,10 +2135,8 @@ dummy_func(
_GUARD_DORV_NO_DICT +
_STORE_ATTR_INSTANCE_VALUE;

inst(STORE_ATTR_WITH_HINT, (unused/1, type_version/2, hint/1, value, owner --)) {
op(_STORE_ATTR_WITH_HINT, (hint/1, value, owner --)) {
PyTypeObject *tp = Py_TYPE(owner);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
PyTypeObject *tp = Py_TYPE(owner);

This is only used in the assert, AFAICT, so will generate a compiler warning for non-debug builds.

assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version);
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);

PyDictObject *dict = _PyObject_GetManagedDict(owner);
DEOPT_IF(dict == NULL);
Expand Down Expand Up @@ -2174,6 +2172,11 @@ dummy_func(
Py_DECREF(owner);
}

macro(STORE_ATTR_WITH_HINT) =
unused/1 +
_GUARD_TYPE_VERSION +
_STORE_ATTR_WITH_HINT;

op(_STORE_ATTR_SLOT, (index/1, value, owner --)) {
char *addr = (char *)owner + index;
STAT_INC(STORE_ATTR, hit);
Expand Down
63 changes: 62 additions & 1 deletion Python/executor_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.

81 changes: 44 additions & 37 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.

5 changes: 4 additions & 1 deletion Python/optimizer_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.