Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32k
gh-131798: JIT: Narrow the return type of_GET_LEN to int#133345
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
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
23 commits Select commitHold shift + click to select a range
cabe8f1 gh-131798: JIT: Narrow the return type of _GET_LEN to int
Zheaoli1f8a607 Add news
Zheaolif2f71d9 Fix typo
Zheaoli1662b47 Fix review idea
Zheaoli52ce698 Fix review idea
Zheaolib1640ed Fix review idea
Zheaolicf17d92 fix review idea
Zheaolic401539 fix review idea
Zheaoli619a846 fix review idea
Zheaoli9adefc3 fix review idea
Zheaoli9c6efcb fix review idea
Zheaoli69b929b Merge branch 'main' into manjusaka/get-len
Zheaolid1e3a2b fix review idea
Zheaolie0e3745 fix review idea
Zheaoli81c4996 fix review idea
Zheaoli93e1e86 fix review idea
Zheaoli6b5282f fix review idea
Zheaoli2eefeb3 fix review idea
Zheaoli9c58f2c fix review idea
Zheaolif9822e9 fix review idea
Zheaoli6a06aff fix review idea
Zheaoli6d92614 fix review idea
Zheaoli5cfbad4 format code
ZheaoliFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
44 changes: 44 additions & 0 deletionsLib/test/test_capi/test_opt.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1925,6 +1925,50 @@ def testfunc(n): | ||
| self.assertNotIn("_GUARD_NOS_INT", uops) | ||
| self.assertNotIn("_GUARD_TOS_INT", uops) | ||
| def test_get_len_with_const_tuple(self): | ||
| def testfunc(n): | ||
| x = 0.0 | ||
| for _ in range(n): | ||
| match (1, 2, 3, 4): | ||
| case [_, _, _, _]: | ||
| x += 1.0 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(int(res), TIER2_THRESHOLD) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_GUARD_NOS_INT", uops) | ||
Zheaoli marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| self.assertNotIn("_GET_LEN", uops) | ||
| self.assertIn("_LOAD_CONST_INLINE_BORROW", uops) | ||
| def test_get_len_with_non_const_tuple(self): | ||
| def testfunc(n): | ||
| x = 0.0 | ||
| for _ in range(n): | ||
| match object(), object(): | ||
| case [_, _]: | ||
| x += 1.0 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(int(res), TIER2_THRESHOLD) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_GUARD_NOS_INT", uops) | ||
| self.assertNotIn("_GET_LEN", uops) | ||
| self.assertIn("_LOAD_CONST_INLINE_BORROW", uops) | ||
| def test_get_len_with_non_tuple(self): | ||
| def testfunc(n): | ||
| x = 0.0 | ||
| for _ in range(n): | ||
| match [1, 2, 3, 4]: | ||
| case [_, _, _, _]: | ||
| x += 1.0 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(int(res), TIER2_THRESHOLD) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_GUARD_NOS_INT", uops) | ||
| self.assertIn("_GET_LEN", uops) | ||
| def test_binary_op_subscr_tuple_int(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
2 changes: 2 additions & 0 deletionsMisc/NEWS.d/next/Core_and_Builtins/2025-05-03-22-31-53.gh-issue-131798.fQ0ato.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Allow the JIT to remove int guards after ``_GET_LEN`` by setting the return | ||
| type to int. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1116,6 +1116,25 @@ dummy_func(void) { | ||
| res = sym_new_type(ctx, &PyLong_Type); | ||
| } | ||
| op(_GET_LEN, (obj -- obj, len)) { | ||
| int tuple_length = sym_tuple_length(obj); | ||
| if (tuple_length == -1) { | ||
| len = sym_new_type(ctx, &PyLong_Type); | ||
Zheaoli marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| else { | ||
| assert(tuple_length >= 0); | ||
| PyObject *temp = PyLong_FromLong(tuple_length); | ||
| if (temp == NULL) { | ||
| goto error; | ||
| } | ||
| if (_Py_IsImmortal(temp)) { | ||
| REPLACE_OP(this_instr, _LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)temp); | ||
| } | ||
| len = sym_new_const(ctx, temp); | ||
Zheaoli marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| Py_DECREF(temp); | ||
| } | ||
| } | ||
| op(_GUARD_CALLABLE_LEN, (callable, unused, unused -- callable, unused, unused)) { | ||
| PyObject *len = _PyInterpreterState_GET()->callable_cache.len; | ||
| if (sym_get_const(ctx, callable) == len) { | ||
23 changes: 22 additions & 1 deletionPython/optimizer_cases.c.h
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.