Skip to content

GH-108614: Add RESUME_CHECK instruction #108630

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

Jump to bottom
Merged
merged 9 commits into from
Sep 7, 2023
Merged

GH-108614: Add RESUME_CHECK instruction #108630

merged 9 commits into from
Sep 7, 2023

Conversation

markshannon
Copy link
Member

@markshannon markshannon commented Aug 29, 2023 •
edited by bedevere-bot
Loading

Minimizes overhead of checking for instrumentation and signals in the tier 2 interpreter, and reduces the need for #if TIER_ONE special casing.

@bedevere-bot bedevere-bot mentioned this pull request Aug 29, 2023
Closed
brandtbucher
brandtbucher reviewed Aug 29, 2023
View reviewed changes
@Giangpro89 Giangpro89 mentioned this pull request Aug 30, 2023
Closed
@markshannon markshannon changed the title GH-108614: Add RESUME_QUICK instruction GH-108614: Add RESUME_CHECK instruction Aug 30, 2023
@brandtbucher brandtbucher self-requested a review August 31, 2023 16:20
hoodmane
hoodmane reviewed Sep 4, 2023
View reviewed changes
iritkatriel
iritkatriel reviewed Sep 4, 2023
View reviewed changes
@markshannon markshannon merged commit 0858328 into python:main Sep 7, 2023
@brettcannon
Copy link
Member

I think this may have broken the Emscripten builds:

In file included from ../../Python/ceval.c:767:
../../Python/generated_cases.c.h:31:22: error: use of undeclared identifier 'emscripten_signal_clock'
            DEOPT_IF(emscripten_signal_clock == 0, RESUME);
                     ^
../../Python/generated_cases.c.h:32:13: error: use of undeclared identifier 'emscripten_signal_clock'
            emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
            ^
2 errors generated.
emcc: error: 'ccache /opt/emsdk/upstream/bin/clang -target wasm32-unknown-emscripten -fignore-exceptions -mllvm -combiner-global-alias-analysis=false -mllvm -enable-emscripten-sjlj -mllvm -disable-lsr -DEMSCRIPTEN -D__EMSCRIPTEN_major__=3 -D__EMSCRIPTEN_minor__=1 -D__EMSCRIPTEN_tiny__=22 -Werror=implicit-function-declaration -I/opt/buildbot/.emscripten_cache/sysroot/include/SDL --sysroot=/opt/buildbot/.emscripten_cache/sysroot -Xclang -iwithsysroot/include/compat -c -fno-strict-overflow -Wsign-compare -Wunreachable-code -DNDEBUG -g3 -O3 -Wall -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I../../Include/internal -IObjects -IInclude -IPython -I. -I../../Include -fPIC -DPy_BUILD_CORE ../../Python/ceval.c -o Python/ceval.o' failed (returned 1)
make: *** [Makefile:2691: Python/ceval.o] Error 1
make: *** Waiting for unfinished jobs....
emmake: error: 'make -j2 all' failed (returned 2)

@markshannon markshannon deleted the quick-resume branch September 8, 2023 09:37
@vstinner
Copy link
Member

According to @iritkatriel bisect, this change introduced a regression: #109198

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

@hoodmane hoodmane hoodmane left review comments

@iritkatriel iritkatriel iritkatriel approved these changes

@brandtbucher brandtbucher Awaiting requested review from brandtbucher

+1 more reviewer

@Giangpro89 Giangpro89 Giangpro89 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@markshannon @brettcannon @vstinner @iritkatriel @hoodmane @brandtbucher @Giangpro89 @bedevere-bot