Skip to content

bpo-44338: Port LOAD_GLOBAL to PEP 659 adaptive interpreter #26638

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 11 commits into from
Jun 14, 2021
Merged

bpo-44338: Port LOAD_GLOBAL to PEP 659 adaptive interpreter #26638

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e57707
Add specializations of LOAD_GLOBAL.
markshannon Jun 2, 2021
b970dfc
Add more stats.
markshannon Jun 4, 2021
2b7aad1
Remove old opcache; it is no longer used.
markshannon Jun 8, 2021
20daa07
Use _PyDict_GetItemHint instead of _Py_dict_lookup
markshannon Jun 9, 2021
704d217
Check globals version as well as builtins
markshannon Jun 10, 2021
a7746e0
Correctly round sizeof() for code object.
markshannon Jun 10, 2021
8ad3e55
Add NEWS
markshannon Jun 10, 2021
aec7872
Remove some code duplication and fix up stats printing.
markshannon Jun 11, 2021
b4431be
Add casts and comment on which type of cache entries are used.
markshannon Jun 11, 2021
f043576
Fix a couple of copy and paste errors
markshannon Jun 11, 2021
72a7bcc
Merge branch 'main' into specialize-load-global
markshannon Jun 14, 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 _PyDict_GetItemHint instead of _Py_dict_lookup
  • Loading branch information
@markshannon
markshannon committed Jun 10, 2021
commit 20daa07e62e5f681ea416d0a62929fae148eb2c1
14 changes: 5 additions & 9 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,18 +386,14 @@ _Py_Specialize_LoadGlobal(
_PyAdaptiveEntry *cache0 = &cache->adaptive;
_PyLoadGlobalCache *cache1 = &cache[-1].load_global;
assert(PyUnicode_CheckExact(name));
Py_hash_t hash = PyObject_Hash(name);
if (hash == -1) {
return -1;
}
if (!PyDict_CheckExact(globals)) {
goto fail;
}
if (((PyDictObject *)globals)->ma_keys->dk_kind == DICT_KEYS_SPLIT) {
if (((PyDictObject *)globals)->ma_keys->dk_kind != DICT_KEYS_UNICODE) {
goto fail;
}
PyObject *value;
Py_ssize_t index = _Py_dict_lookup((PyDictObject *)globals, name, hash, &value);
PyObject *value = NULL;
Py_ssize_t index = _PyDict_GetItemHint((PyDictObject *)globals, name, -1, &value);
assert (index != DKIX_ERROR);
if (index != DKIX_EMPTY) {
if (index != (uint16_t)index) {
Expand All @@ -415,10 +411,10 @@ _Py_Specialize_LoadGlobal(
if (!PyDict_CheckExact(builtins)) {
goto fail;
}
if (((PyDictObject *)builtins)->ma_keys->dk_kind == DICT_KEYS_SPLIT) {
if (((PyDictObject *)builtins)->ma_keys->dk_kind != DICT_KEYS_UNICODE) {
goto fail;
}
index = _Py_dict_lookup((PyDictObject *)builtins, name, hash, &value);
index = _PyDict_GetItemHint((PyDictObject *)builtins, name, -1, &value);
assert (index != DKIX_ERROR);
if (index != (uint16_t)index) {
goto fail;
Expand Down