Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-118095: Use broader specializations in tier 1, for better tier 2 support of calls. #118322

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 19 commits into from
May 4, 2024
Merged

GH-118095: Use broader specializations in tier 1, for better tier 2 support of calls. #118322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0b157ab
Add CALL_PY_GENERAL and CALL_BOUND_METHOD_GENERAL call specializations.
markshannon Apr 26, 2024
2262f98
Add CALL_NON_PY_GENERAL call specialization
markshannon Apr 26, 2024
4af43c2
Remove CALL_PY_WITH_DEFAULTS specialization
markshannon Apr 26, 2024
b7795e3
Fix JIT build
markshannon Apr 26, 2024
e5c7dce
Use CALL_NON_PY_GENERAL in more cases when otherwise failing to speci…
markshannon Apr 30, 2024
61abb3b
Delete unused code
markshannon May 2, 2024
b49bc86
Make sure that function version number is checked when tracing throug…
markshannon May 3, 2024
f42519d
whitespace
markshannon May 3, 2024
3294632
Merge branch 'main' into tier-2-call
markshannon May 3, 2024
1a2dcfe
Check verion on function, not method
markshannon May 3, 2024
62ff43c
Lower WASI C recursion limit again
markshannon May 3, 2024
71c6d41
Get test passing on wasi
markshannon May 3, 2024
0b40773
Lower WASI C recursion limit again
markshannon May 3, 2024
02cdf2f
Yet another attempt to get the WASI build to work
markshannon May 3, 2024
1831eb3
Skip test for WASI
markshannon May 3, 2024
7819b1c
Skip another test for WASI
markshannon May 3, 2024
857d152
Address some review comments
markshannon May 4, 2024
839d16e
Use _SAVE_RETURN_OFFSET in general call instructions
markshannon May 4, 2024
1d5c0a7
Merge branch 'main' into tier-2-call
markshannon May 4, 2024
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
Address some review comments
  • Loading branch information
@markshannon
markshannon committed May 4, 2024
commit 857d152acc589038f46ab727e217d35ddb9579f6
2 changes: 1 addition & 1 deletion Include/internal/pycore_opcode_metadata.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Include/internal/pycore_uop_metadata.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Lib/test/test_call.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def f():
class C:
def m(self):
pass
callables = [ f, C.m, [].__len__ ]
callables = [f, C.m, [].__len__]
for c in callables:
for _ in range(1000):
try:
Expand Down
8 changes: 4 additions & 4 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3213,8 +3213,8 @@ dummy_func(
_PUSH_FRAME;

op(_CHECK_IS_NOT_PY_CALLABLE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
DEOPT_IF(PyFunction_Check(callable));
DEOPT_IF(Py_TYPE(callable) == &PyMethod_Type);
EXIT_IF(PyFunction_Check(callable));
EXIT_IF(Py_TYPE(callable) == &PyMethod_Type);
}
Comment on lines +3215 to +3220
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher May 3, 2024

Choose a reason for hiding this comment

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

Maybe these are better as exits so we can handle more cases? If we trace through this, it'd be a shame if we couldn't then stitch a function or method into the call site if its polymorphic.

Suggested change
op(_CHECK_IS_NOT_PY_CALLABLE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
DEOPT_IF(PyFunction_Check(callable));
DEOPT_IF(Py_TYPE(callable) == &PyMethod_Type);
}
op(_CHECK_IS_NOT_PY_CALLABLE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
EXIT_IF(PyFunction_Check(callable));
EXIT_IF(Py_TYPE(callable) == &PyMethod_Type);
}


op(_CALL_NON_PY_GENERAL, (callable, self_or_null, args[oparg] -- res)) {
Expand Down Expand Up @@ -3247,8 +3247,8 @@ dummy_func(
_CHECK_PERIODIC;

op(_CHECK_CALL_BOUND_METHOD_EXACT_ARGS, (callable, null, unused[oparg] -- callable, null, unused[oparg])) {
DEOPT_IF(null != NULL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type);
EXIT_IF(null != NULL);
EXIT_IF(Py_TYPE(callable) != &PyMethod_Type);
}

op(_INIT_CALL_BOUND_METHOD_EXACT_ARGS, (callable, unused, unused[oparg] -- func, self, unused[oparg])) {
Expand Down
18 changes: 15 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void
dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
Copy link
Copy Markdown
Member

@brandtbucher brandtbucher May 3, 2024

Choose a reason for hiding this comment

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

Are the changes in this function intentional, or left over from debugging?

Copy link
Copy Markdown
Member Author

@markshannon markshannon May 4, 2024

Choose a reason for hiding this comment

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

Left over from debugging, I needed them as dump_stack was too slow for a realistic number (many millions) of instructions for finding bugs.

It might be worth making this change, but that's for another PR.

{
PyObject **stack_base = _PyFrame_Stackbase(frame);
// PyObject *exc = PyErr_GetRaisedException();
PyObject *exc = PyErr_GetRaisedException();
printf(" stack=[");
for (PyObject **ptr = stack_base; ptr < stack_pointer; ptr++) {
if (ptr != stack_base) {
Expand All @@ -117,12 +117,24 @@ dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
printf("<nil>");
continue;
}
if (
*ptr == Py_None
|| PyBool_Check(*ptr)
|| PyLong_CheckExact(*ptr)
|| PyFloat_CheckExact(*ptr)
|| PyUnicode_CheckExact(*ptr)
) {
if (PyObject_Print(*ptr, stdout, 0) == 0) {
continue;
}
PyErr_Clear();
}
// Don't call __repr__(), it might recurse into the interpreter.
printf("<%s at %p>", Py_TYPE(*ptr)->tp_name, (void *)(*ptr));
}
printf("]\n");
// fflush(stdout);
// PyErr_SetRaisedException(exc);
fflush(stdout);
PyErr_SetRaisedException(exc);
}

static void
Expand Down