10000 bpo-44337: Port LOAD_ATTR to PEP 659 adaptive interpreter by markshannon · Pull Request #26595 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-44337: Port LOAD_ATTR to PEP 659 adaptive interpreter #26595

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 17 commits into from
Jun 10, 2021
Merged

bpo-44337: Port LOAD_ATTR to PEP 659 adaptive interpreter #26595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8db0653
Specialize LOAD_ATTR with LOAD_ATTR_SLOT and LOAD_ATTR_SPLIT_KEYS
markshannon May 26, 2021
35522bc
Move dict-common.h to internal/pycore_dict.h
markshannon Jun 1, 2021
3ca2c7c
Add LOAD_ATTR_COMBINED_KEYS specialized opcode.
markshannon Jun 1, 2021
3d50df3
Quicken in function if loopy
markshannon Jun 2, 2021
85dd177
Specialize LOAD_ATTR for module attributes.
markshannon Jun 3, 2021
e54f76b
Set dict version to zero before setting index
markshannon Jun 7, 2021
eb08f91
Don't crash if module has no dictionary
markshannon Jun 7, 2021
a03abb3
Rename LOAD_ATTR_COMBINED_KEYS to LOAD_ATTR_WITH_HINT. Add NEWS item.
markshannon Jun 8, 2021
1079964
Fix name and use wider cache slot.
markshannon Jun 8, 2021
d2e0940
Remove rebase artifact
markshannon Jun 8, 2021
d890943
Use specialization stats
markshannon Jun 8, 2021
f9e999c
Use _PyDict_GetItemHint instead of _Py_dict_lookup to determine index…
markshannon Jun 8, 2021
e858ea1
Assert that address is in bounds (ASAN thinks it might not be).
markshannon Jun 9, 2021
a0ed9e2
Fix off by one error
markshannon Jun 9, 2021
b07f219
Fix compiler warnings and check slot offset can be stored in index field
markshannon Jun 9, 2021
6d9ef8d
Merge branch 'main' into specialize-load-attr
markshannon Jun 9, 2021
41cb98f
Merge branch 'main' into specialize-load-attr
markshannon Jun 9, 2021
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
Fix name and use wider cache slot.
  • Loading branch information
@markshannon
markshannon committed Jun 8, 2021
commit 10799646c86f9cd5014056d9cb7f3fc437fc7843
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3540,9 +3540,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
DEOPT_IF(dict == NULL, LOAD_ATTR);
assert(PyDict_CheckExact((PyObject *)dict));
PyObject *name = GETITEM(names, cache0->original_oparg);
uint16_t hint = cache0->index;
uint32_t hint = cache1->dk_version_or_hint;
DEOPT_IF(hint > dict->ma_keys->dk_nentries, LOAD_ATTR);
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + (size_t)hint;
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
DEOPT_IF(ep->me_key != name, LOAD_ATTR);
res = ep->me_value;
DEOPT_IF(res == NULL, LOAD_ATTR);
Expand Down
10 changes: 5 additions & 5 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ _Py_Quicken(PyCodeObject *code) {
return 0;
}

int
special_module_load_attr(
static int
specialize_module_load_attr(
PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
_PyAdaptiveEntry *cache0, _PyLoadAttrCache *cache1)
{
Expand Down Expand Up @@ -267,7 +267,7 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
_PyAdaptiveEntry *cache0 = &cache->adaptive;
_PyLoadAttrCache *cache1 = &cache[-1].load_attr;
if (PyModule_CheckExact(owner)) {
int err = special_module_load_attr(owner, instr, name, cache0, cache1);
int err = specialize_module_load_attr(owner, instr, name, cache0, cache1);
if (err) {
goto fail;
}
Expand Down Expand Up @@ -346,12 +346,12 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
if (hint != (uint32_t)hint) {
goto fail;
}
cache0->index = (uint16_t)hint;
cache1->dk_version_or_hint = (uint32_t)hint;
cache1->tp_version = type->tp_version_tag;
*instr = _Py_MAKECODEUNIT(LOAD_ATTR_WITH_HINT, _Py_OPARG(*instr));
goto success;

}

fail:
assert(!PyErr_Occurred());
cache_backoff(cache0);
Expand Down
0