Skip to content
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

gh-100288: Specialise LOAD_ATTR_METHOD for managed dictionaries #100289

Merged
merged 5 commits into from
Dec 23, 2022
Merged

gh-100288: Specialise LOAD_ATTR_METHOD for managed dictionaries #100289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55a29e9
Specialize LOAD_ATTR for managed dicts
Fidget-Spinner Dec 16, 2022
e209b9e
Remove a temp file
Fidget-Spinner Dec 16, 2022
9e7862b
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 16, 2022
1aecb3c
Access the correct dict
Fidget-Spinner Dec 16, 2022
fe02743
Merge branch 'more_load_attr' of https://github.com/Fidget-Spinner/cp…
Fidget-Spinner Dec 16, 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
Access the correct dict
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Dec 16, 2022
commit 1aecb3c9b9091d04db269a2526db16bec761a904
6 changes: 4 additions & 2 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,8 +2738,10 @@ dummy_func(
assert(self_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(self);
DEOPT_IF(_PyDictOrValues_IsValues(dorv), LOAD_ATTR);
PyDictKeysObject *keys = ((PyHeapTypeObject *)self_cls)->ht_cached_keys;
DEOPT_IF(keys->dk_version != read_u32(cache->keys_version), LOAD_ATTR);
PyObject *dict = _PyDictOrValues_GetDict(dorv);
PyDictKeysObject *keys = (dict == NULL) ? NULL : ((PyDictObject *)dict)->ma_keys;
// Note: cache->keys_version can be 0 when dict is NULL.
DEOPT_IF(keys != NULL && keys->dk_version != read_u32(cache->keys_version), LOAD_ATTR);
STAT_INC(LOAD_ATTR, hit);
PyObject *res = read_obj(cache->descr);
assert(res != NULL);
Expand Down
6 changes: 4 additions & 2 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.

9 changes: 7 additions & 2 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,11 +1014,13 @@ PyObject *descr, DescriptorClassification kind)
PyDictKeysObject *keys;
if (owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
keys = ((PyHeapTypeObject *)owner_cls)->ht_cached_keys;
if (_PyDictOrValues_IsValues(dorv)) {
keys = ((PyHeapTypeObject *)owner_cls)->ht_cached_keys;
dictkind = MANAGED_VALUES;
}
else {
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
keys = dict != NULL ? dict->ma_keys : NULL;
// User has directly accessed __dict__.
dictkind = MANAGED_DICT;
}
Expand Down Expand Up @@ -1046,7 +1048,7 @@ PyObject *descr, DescriptorClassification kind)
}
}
}
if (dictkind == MANAGED_VALUES || dictkind == OFFSET_DICT || dictkind == MANAGED_DICT) {
if (dictkind == MANAGED_VALUES || dictkind == OFFSET_DICT || (dictkind == MANAGED_DICT && keys != NULL)) {
Py_ssize_t index = _PyDictKeys_StringLookup(keys, name);
if (index != DKIX_EMPTY) {
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_SHADOWED);
Expand All @@ -1067,6 +1069,9 @@ PyObject *descr, DescriptorClassification kind)
_py_set_opcode(instr, LOAD_ATTR_METHOD_WITH_VALUES);
break;
case MANAGED_DICT:
if (keys == NULL) {
write_u32(cache->keys_version, 0);
}
_py_set_opcode(instr, LOAD_ATTR_METHOD_MANAGED_DICT);
break;
case OFFSET_DICT:
Expand Down