Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-139109: Replace_CHECK_STACK_SPACE with_CHECK_STACK_SPACE_OPERAND in JIT optiimizer#144394

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
63 changes: 30 additions & 33 deletionsLib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,7 +1022,6 @@ def return_hello():
# Constant narrowing allows constant folding for second comparison
self.assertLessEqual(count_ops(ex, "_COMPARE_OP_STR"), 1)

@unittest.skip("gh-139109 WIP")
def test_combine_stack_space_checks_sequential(self):
def dummy12(x):
return x - 1
Expand All@@ -1046,12 +1045,14 @@ def testfunc(n):
self.assertEqual(uop_names.count("_PUSH_FRAME"), 2)
self.assertEqual(uop_names.count("_RETURN_VALUE"), 2)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE"), 0)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"), 1)
# sequential calls: max(12, 13) == 13
largest_stack = _testinternalcapi.get_co_framesize(dummy13.__code__)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands)
# Each call gets its own _CHECK_STACK_SPACE_OPERAND
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"), 2)
# Each _CHECK_STACK_SPACE_OPERAND has the framesize of its function
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy12.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy13.__code__)), uops_and_operands)

@unittest.skip("gh-139109 WIP")
def test_combine_stack_space_checks_nested(self):
def dummy12(x):
return x + 3
Expand All@@ -1074,15 +1075,12 @@ def testfunc(n):
self.assertEqual(uop_names.count("_PUSH_FRAME"), 2)
self.assertEqual(uop_names.count("_RETURN_VALUE"), 2)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE"), 0)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"), 1)
# nested calls: 15 + 12 == 27
largest_stack = (
_testinternalcapi.get_co_framesize(dummy15.__code__) +
_testinternalcapi.get_co_framesize(dummy12.__code__)
)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"), 2)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy15.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy12.__code__)), uops_and_operands)

@unittest.skip("gh-139109 WIP")
def test_combine_stack_space_checks_several_calls(self):
def dummy12(x):
return x + 3
Expand DownExpand Up@@ -1110,15 +1108,14 @@ def testfunc(n):
self.assertEqual(uop_names.count("_PUSH_FRAME"), 4)
self.assertEqual(uop_names.count("_RETURN_VALUE"), 4)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE"), 0)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"),1)
# max(12, 18 + max(12, 13)) == 31
largest_stack = (
_testinternalcapi.get_co_framesize(dummy18.__code__) +
_testinternalcapi.get_co_framesize(dummy13.__code__)
)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"),4)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy12.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy13.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy18.__code__)), uops_and_operands)

@unittest.skip("gh-139109 WIP")
def test_combine_stack_space_checks_several_calls_different_order(self):
# same as `several_calls` but with top-level calls reversed
def dummy12(x):
Expand DownExpand Up@@ -1147,15 +1144,15 @@ def testfunc(n):
self.assertEqual(uop_names.count("_PUSH_FRAME"), 4)
self.assertEqual(uop_names.count("_RETURN_VALUE"), 4)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE"), 0)
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"),1)
# max(18 + max(12, 13), 12) == 31
largest_stack = (
_testinternalcapi.get_co_framesize(dummy18.__code__) +
_testinternalcapi.get_co_framesize(dummy13.__code__)
)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands)

@unittest.skip("gh-139109 WIP")
self.assertEqual(uop_names.count("_CHECK_STACK_SPACE_OPERAND"),4)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy12.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy13.__code__)), uops_and_operands)
self.assertIn(("_CHECK_STACK_SPACE_OPERAND",
_testinternalcapi.get_co_framesize(dummy18.__code__)), uops_and_operands)

@unittest.skip("reopen when we combine multiple stack space checks into one")
def test_combine_stack_space_complex(self):
def dummy0(x):
return x
Expand DownExpand Up@@ -1205,7 +1202,7 @@ def testfunc(n):
("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands
)

@unittest.skip("gh-139109 WIP")
@unittest.skip("reopen when we combine multiple stack space checks into one")
def test_combine_stack_space_checks_large_framesize(self):
# Create a function with a large framesize. This ensures _CHECK_STACK_SPACE is
# actually doing its job. Note that the resulting trace hits
Expand DownExpand Up@@ -1267,7 +1264,7 @@ def testfunc(n):
("_CHECK_STACK_SPACE_OPERAND", largest_stack), uops_and_operands
)

@unittest.skip("gh-139109 WIP")
@unittest.skip("reopen when we combine multiple stack space checks into one")
def test_combine_stack_space_checks_recursion(self):
def dummy15(x):
while x > 0:
Expand Down
1 change: 0 additions & 1 deletionPython/bytecodes.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5362,7 +5362,6 @@ dummy_func(
tier2 op(_CHECK_STACK_SPACE_OPERAND, (framesize/2 --)) {
assert(framesize <= INT_MAX);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, framesize));
DEOPT_IF(tstate->py_recursion_remaining <= 1);
}

op(_SAVE_RETURN_OFFSET, (--)) {
Expand Down
26 changes: 0 additions & 26 deletionsPython/executor_cases.c.h
View file
Open in desktop

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

10 changes: 7 additions & 3 deletionsPython/optimizer_bytecodes.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1088,13 +1088,17 @@ dummy_func(void) {
}

op(_CHECK_STACK_SPACE, (unused, unused, unused[oparg] -- unused, unused, unused[oparg])) {
assert((this_instr + 4)->opcode == _PUSH_FRAME);
PyCodeObject *co = get_code_with_logging((this_instr + 4));
if (co == NULL) {
ctx->done = true;
break;
}
ADD_OP(_CHECK_STACK_SPACE_OPERAND, 0, co->co_framesize);
}

op (_CHECK_STACK_SPACE_OPERAND, (framesize/2 -- )) {
(void)framesize;
/* We should never see _CHECK_STACK_SPACE_OPERANDs.
* They are only created at the end of this pass. */
Py_UNREACHABLE();
}

op(_PUSH_FRAME, (new_frame -- )) {
Expand Down
8 changes: 7 additions & 1 deletionPython/optimizer_cases.c.h
View file
Open in desktop

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

Loading
[8]ページ先頭
©2009-2026 Movatter.jp