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
markshannon 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
Use specialization stats
  • Loading branch information
@markshannon
markshannon committed Jun 8, 2021
commit d8909438f8a6a82c61db6e384b90d17b434cc2c5
6 changes: 6 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3499,6 +3499,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
DEOPT_IF(dict->ma_keys->dk_version != cache1->dk_version_or_hint, LOAD_ATTR);
res = dict->ma_values[cache0->index];
DEOPT_IF(res == NULL, LOAD_ATTR);
STAT_INC(loadattr_hit);
record_cache_hit(cache0);
STAT_INC(loadattr_hit);

@cfbolz cfbolz Jun 14, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just casually reading through some of the code, it looks like the STAT_INC(loadattr_hit); is duplicated here (see two lines up).

@markshannon markshannon Jun 14, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Thanks Carl. #26718

Py_INCREF(res);
Expand All @@ -3519,6 +3520,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + cache0->index;
res = ep->me_value;
DEOPT_IF(res == NULL, LOAD_ATTR);
STAT_INC(loadattr_hit);
record_cache_hit(cache0);
Py_INCREF(res);
SET_TOP(res);
Expand Down Expand Up @@ -3546,6 +3548,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
DEOPT_IF(ep->me_key != name, LOAD_ATTR);
res = ep->me_value;
DEOPT_IF(res == NULL, LOAD_ATTR);
STAT_INC(loadattr_hit);
record_cache_hit(cache0);
Py_INCREF(res);
SET_TOP(res);
Expand All @@ -3565,6 +3568,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
char *addr = (char *)owner + cache0->index;
res = *(PyObject **)addr;
DEOPT_IF(res == NULL, LOAD_ATTR);
STAT_INC(loadattr_hit);
record_cache_hit(cache0);
Py_INCREF(res);
SET_TOP(res);
Expand Down Expand Up @@ -4455,10 +4459,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)

LOAD_ATTR_miss:
{
STAT_INC(loadattr_miss);
_PyAdaptiveEntry *cache = &GET_CACHE()->adaptive;
record_cache_miss(cache);
if (too_many_cache_misses(cache)) {
next_instr[-1] = _Py_MAKECODEUNIT(LOAD_ATTR_ADAPTIVE, _Py_OPARG(next_instr[-1]));
STAT_INC(loadattr_deopt);
cache_backoff(cache);
}
oparg = cache->original_oparg;
Expand Down
2 changes: 2 additions & 0 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,12 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
}

fail:
STAT_INC(specialization_failure);
assert(!PyErr_Occurred());
cache_backoff(cache0);
return 0;
success:
STAT_INC(specialization_success);
assert(!PyErr_Occurred());
cache0->counter = saturating_start();
return 0;
Expand Down