python / cpython

Sponsor

Sponsor python/cpython
Notifications
Star 38.8k
Fork 19.3k

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.

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

Jump to bottom

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

Merged

markshannon merged 17 commits into python:main from faster-cpython:specialize-load-attr

Jun 10, 2021

Contributor

markshannon commented Jun 8, 2021 •

edited by bedevere-bot

Implements four specializations of LOAD_ATTR:

LOAD_ATTR_SLOT for slots.
LOAD_ATTR_SPLIT_KEYS for attributes in instance dictionaries that have split keys.
LOAD_ATTR_HINT for attributes in instance dictionaries that do not have split keys.
LOAD_ATTR_MODULE for module attributes

There are more specializations of LOAD_ATTR that we want to implement, but this PR is large enough already.

https://bugs.python.org/issue44337

markshannon added 11 commits


          Specialize LOAD_ATTR with LOAD_ATTR_SLOT and LOAD_ATTR_SPLIT_KEYS

8db0653


          Move dict-common.h to internal/pycore_dict.h

35522bc


          Add LOAD_ATTR_COMBINED_KEYS specialized opcode.

3ca2c7c


          Quicken in function if loopy

3d50df3


          Specialize LOAD_ATTR for module attributes.

85dd177


          Set dict version to zero before setting index

e54f76b


          Don't crash if module has no dictionary

eb08f91


          Rename LOAD_ATTR_COMBINED_KEYS to LOAD_ATTR_WITH_HINT. Add NEWS item.

a03abb3


          Fix name and use wider cache slot.


          Remove rebase artifact

d2e0940


          Use specialization stats

d890943

markshannon requested a review from methane as a code owner

the-knights-who-say-ni added the CLA signed label

bedevere-bot added the awaiting core review label


          Use _PyDict_GetItemHint instead of _Py_dict_lookup to determine index…

f9e999c

… in dictionary when specializing.

markshannon added the 🔨 test-with-buildbots label

bedevere-bot commented Jun 8, 2021

🤖 New build scheduled with the buildbot fleet by @markshannon for commit f9e999c 🤖

If you want to schedule another build, you need to add the "🔨 test-with-buildbots" label again.

bedevere-bot removed the 🔨 test-with-buildbots label

methane approved these changes

bedevere-bot added awaiting merge and removed awaiting core review labels

markshannon added 3 commits


          Assert that address is in bounds (ASAN thinks it might not be).

e858ea1


          Fix off by one error

a0ed9e2


          Fix compiler warnings and check slot offset can be stored in index field

b07f219

markshannon added the 🔨 test-with-buildbots label

bedevere-bot commented Jun 9, 2021

🤖 New build scheduled with the buildbot fleet by @markshannon for commit b07f219 🤖

If you want to schedule another build, you need to add the "🔨 test-with-buildbots" label again.

bedevere-bot removed the 🔨 test-with-buildbots label


          Merge branch 'main' into specialize-load-attr

6d9ef8d

markshannon added the 🔨 test-with-buildbots label

bedevere-bot commented Jun 9, 2021

🤖 New build scheduled with the buildbot fleet by @markshannon for commit 6d9ef8d 🤖

If you want to schedule another build, you need to add the "🔨 test-with-buildbots" label again.

bedevere-bot removed the 🔨 test-with-buildbots label

Member

pablogsal commented Jun 9, 2021 •

edited

@markshannon You may want to check out https://bugs.python.org/msg395432 . This shows that the ASAN failures are not false positives as there is obviously something corrupted and we are reading that memory.

Contributor Author

markshannon commented Jun 9, 2021

Hopefully #26626 will fix the address sanitizer failures

markshannon closed this

markshannon reopened this

markshannon closed this


          Merge branch 'main' into specialize-load-attr

41cb98f

markshannon reopened this

markshannon added the 🔨 test-with-buildbots label

bedevere-bot commented Jun 9, 2021

🤖 New build scheduled with the buildbot fleet by @markshannon for commit 41cb98f 🤖

If you want to schedule another build, you need to add the "🔨 test-with-buildbots" label again.

bedevere-bot removed the 🔨 test-with-buildbots label

markshannon merged commit e117c02 into python:main

83 checks passed

83 checks passed

Docs

Details

Docs

Details

Check for source changes

Details

Check for source changes

Details

Check if generated files are up to date

Details

Check if generated files are up to date

Details

Windows (x86)

Details

Windows (x86)

Details

Windows (x64)

Details

Windows (x64)

Details

macOS

Details

macOS

Details

Ubuntu

Details

Ubuntu

Details

Ubuntu SSL tests with OpenSSL

Details

Ubuntu SSL tests with OpenSSL

Details

Azure Pipelines PR #20210609.43 succeeded

Details

Travis CI - Pull Request Build Passed

Details

bedevere/issue-number Issue number 44337 found

Details

bedevere/news News entry found in Misc/NEWS.d

buildbot/AMD64 Arch Linux Asan Debug PR Build done.

Details

buildbot/AMD64 Arch Linux Asan PR Build done.

Details

buildbot/AMD64 Arch Linux TraceRefs PR Build done.

Details

buildbot/AMD64 Debian PGO PR Build done.

Details

buildbot/AMD64 Debian root PR Build done.

Details

buildbot/AMD64 Fedora Stable Clang Installed PR Build done.

Details

buildbot/AMD64 Fedora Stable Clang PR Build done.

Details

buildbot/AMD64 Fedora Stable LTO + PGO PR Build done.

Details

buildbot/AMD64 Fedora Stable LTO PR Build done.

Details

buildbot/AMD64 Fedora Stable PR Build done.

Details

buildbot/AMD64 Fedora Stable Refleaks PR Build done.

Details

buildbot/AMD64 FreeBSD Non-Debug PR Build done.

Details

buildbot/AMD64 FreeBSD Shared PR Build done.

Details

buildbot/AMD64 RHEL7 LTO + PGO PR Build done.

Details

buildbot/AMD64 RHEL7 LTO PR Build done.

Details

buildbot/AMD64 RHEL7 PR Build done.

Details

buildbot/AMD64 RHEL7 Refleaks PR Build done.

Details

buildbot/AMD64 RHEL8 FIPS Only Blake2 Builtin Hash PR Build done.

Details

buildbot/AMD64 RHEL8 LTO + PGO PR Build done.

Details

buildbot/AMD64 RHEL8 LTO PR Build done.

Details

buildbot/AMD64 RHEL8 PR Build done.

Details

buildbot/AMD64 RHEL8 Refleaks PR Build done.

Details

buildbot/AMD64 Ubuntu Shared PR Build done.

Details

buildbot/AMD64 Windows10 PR Build done.

Details

buildbot/AMD64 Windows10 Pro PR Build done.

Details

buildbot/AMD64 Windows8.1 Non-Debug PR Build done.

Details

buildbot/AMD64 Windows8.1 Refleaks PR Build done.

Details

buildbot/PPC64 Fedora PR Build done.

Details

buildbot/PPC64LE Fedora Stable Clang Installed PR Build done.

Details

buildbot/PPC64LE Fedora Stable Clang PR Build done.

Details

buildbot/PPC64LE Fedora Stable LTO + PGO PR Build done.

Details

buildbot/PPC64LE Fedora Stable LTO PR Build done.

Details

buildbot/PPC64LE Fedora Stable PR Build done.

Details

buildbot/PPC64LE Fedora Stable Refleaks PR Build done.

Details

buildbot/PPC64LE RHEL7 LTO + PGO PR Build done.

Details

buildbot/PPC64LE RHEL7 LTO PR Build done.

Details

buildbot/PPC64LE RHEL7 PR Build done.

Details

buildbot/PPC64LE RHEL7 Refleaks PR Build done.

Details

buildbot/PPC64LE RHEL8 LTO + PGO PR Build done.

Details

buildbot/PPC64LE RHEL8 LTO PR Build done.

Details

buildbot/PPC64LE RHEL8 PR Build done.

Details

buildbot/PPC64LE RHEL8 Refleaks PR Build done.

Details

buildbot/aarch64 Fedora Stable PR Build done.

Details

buildbot/aarch64 RHEL8 PR Build done.

Details

buildbot/s390x Debian PR Build done.

Details

buildbot/s390x Fedora Clang Installed PR Build done.

Details

buildbot/s390x Fedora Clang PR Build done.

Details

buildbot/s390x Fedora LTO + PGO PR Build done.

Details

buildbot/s390x Fedora LTO PR Build done.

Details

buildbot/s390x Fedora PR Build done.

Details

buildbot/s390x Fedora Refleaks PR Build done.

Details

buildbot/s390x RHEL7 LTO + PGO PR Build done.

Details

buildbot/s390x RHEL7 LTO PR Build done.

Details

buildbot/s390x RHEL7 PR Build done.

Details

buildbot/s390x RHEL7 Refleaks PR Build done.

Details

buildbot/s390x RHEL8 LTO + PGO PR Build done.

Details

buildbot/s390x RHEL8 LTO PR Build done.

Details

buildbot/s390x RHEL8 PR Build done.

Details

buildbot/s390x RHEL8 Refleaks PR Build done.

Details

buildbot/s390x SLES PR Build done.

Details

buildbot/x86 Gentoo Installed with X PR Build done.

Details

buildbot/x86 Gentoo Non-Debug with X PR Build done.

Details

buildbot/x86-64 macOS PR Build done.

Details

bedevere-bot removed the awaiting merge label

markshannon deleted the faster-cpython:specialize-load-attr branch

cfbolz reviewed

  
                    DEOPT_IF(res == NULL, LOAD_ATTR);

                    STAT_INC(loadattr_hit);

                    record_cache_hit(cache0);

                    STAT_INC(loadattr_hit);

cfbolz Jun 14, 2021
Contributor

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

markshannon Jun 14, 2021
Author Contributor

Thanks Carl. #26718

gvanrossum mentioned this pull request

bpo-43693: Turn localspluskinds into an object #26749

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment