Skip to content

gh-104909: Split more LOAD_ATTR specializations #110317

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
markshannon merged 10 commits into from
Oct 4, 2023
Merged

gh-104909: Split more LOAD_ATTR specializations #110317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
416cc01
Split LOAD_ATTR_MODULE
gvanrossum Oct 3, 2023
c96a6da
Split LOAD_ATTR_WITH_HINT
gvanrossum Oct 3, 2023
de86f0c
Split _GUARD_TYPE_VERSION out of the latter
gvanrossum Oct 3, 2023
a45d861
Split LOAD_ATTR_CLASS
gvanrossum Oct 3, 2023
74c917b
Split LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES
gvanrossum Oct 3, 2023
0f9fa7f
Fix indent of DEOPT_IF in macros
gvanrossum Oct 3, 2023
ea0e772
Split LOAD_ATTR_METHOD_LAZY_DICT
gvanrossum Oct 3, 2023
b3e16a4
Split LOAD_ATTR_NONDESCRIPTOR_NO_DICT
gvanrossum Oct 3, 2023
6e8718e
Fix omission of _CHECK_ATTR_METHOD_LAZY_DICT
gvanrossum Oct 3, 2023
8ab398d
Merge remote-tracking branch 'upstream/main' into split-uops
gvanrossum Oct 3, 2023
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
Split LOAD_ATTR_WITH_HINT
  • Loading branch information
@gvanrossum
gvanrossum committed Oct 3, 2023
commit c96a6da166389ac9a5beab80bbdc1d641668f56b
85 changes: 50 additions & 35 deletions 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.

11 changes: 11 additions & 0 deletions Python/abstract_interp_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.

16 changes: 13 additions & 3 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,7 @@ dummy_func(
_LOAD_ATTR_MODULE +
unused/5;

inst(LOAD_ATTR_WITH_HINT, (unused/1, type_version/2, index/1, unused/5, owner -- attr, null if (oparg & 1))) {
op(_CHECK_ATTR_WITH_HINT, (type_version/2, owner -- owner)) {
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version);
Expand All @@ -1923,9 +1923,13 @@ dummy_func(
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
DEOPT_IF(dict == NULL);
assert(PyDict_CheckExact((PyObject *)dict));
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
uint16_t hint = index;
}

op(_LOAD_ATTR_WITH_HINT, (hint/1, owner -- attr, null if (oparg & 1))) {
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries);
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
if (DK_IS_UNICODE(dict->ma_keys)) {
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
DEOPT_IF(ep->me_key != name);
Expand All @@ -1943,6 +1947,12 @@ dummy_func(
DECREF_INPUTS();
}

macro(LOAD_ATTR_WITH_HINT) =
unused/1 +
_CHECK_ATTR_WITH_HINT +
_LOAD_ATTR_WITH_HINT +
unused/5;

op(_LOAD_ATTR_SLOT, (index/1, owner -- attr, null if (oparg & 1))) {
char *addr = (char *)owner + index;
attr = *(PyObject **)addr;
Expand Down
47 changes: 47 additions & 0 deletions 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.

51 changes: 29 additions & 22 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.