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: Further optimize_CALL_ISINSTANCE for class tuples#134543
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
Open
tomasr8 wants to merge3 commits intopython:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+182 −6
Open
Changes fromall commits
Commits
Show all changes
3 commits Select commitHold shift + click to select a range
File 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
105 changes: 102 additions & 3 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 |
|---|---|---|
| @@ -2105,17 +2105,116 @@ def testfunc(n): | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertIn("_GUARD_IS_TRUE_POP", uops) | ||
| deftest_call_isinstance_tuple_of_classes_is_true(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| y = isinstance(42, (int, str)) | ||
| if y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_CALL_ISINSTANCE", uops) | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertNotIn("_GUARD_IS_TRUE_POP", uops) | ||
| self.assertIn("_BUILD_TUPLE", uops) | ||
| self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops) | ||
Comment on lines +2124 to +2125 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more.
LOAD_CONSTLOAD_CONST_BUILD_TUPLE_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW To optimize this, we'd need some special handling for | ||
| def test_call_isinstance_tuple_of_classes_is_false(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| y = isinstance(42, (bool, str)) | ||
| if not y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_CALL_ISINSTANCE", uops) | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertNotIn("_GUARD_IS_FALSE_POP", uops) | ||
| self.assertIn("_BUILD_TUPLE", uops) | ||
| self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops) | ||
| def test_call_isinstance_tuple_of_classes_true_unknown(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| # One of the classes is unknown, but we can still | ||
| # narrow to True | ||
| y = isinstance(42, (eval('str'), int)) | ||
| if y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_CALL_ISINSTANCE", uops) | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertNotIn("_GUARD_IS_TRUE_POP", uops) | ||
| self.assertIn("_BUILD_TUPLE", uops) | ||
| self.assertIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops) | ||
| def test_call_isinstance_tuple_of_classes_unknown_not_narrowed(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| # One of the classes is unknown, so we can't narrow | ||
| # to True or False, only bool | ||
| y = isinstance(42, (str, eval('int'))) | ||
| if y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
| uops = get_opnames(ex) | ||
| self.assertIn("_CALL_ISINSTANCE", uops) | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertIn("_GUARD_IS_TRUE_POP", uops) | ||
| def test_call_isinstance_empty_tuple(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| y = isinstance(42, ()) | ||
| if not y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
| uops = get_opnames(ex) | ||
| self.assertNotIn("_CALL_ISINSTANCE", uops) | ||
| self.assertNotIn("_TO_BOOL_BOOL", uops) | ||
| self.assertNotIn("_GUARD_IS_FALSE_POP", uops) | ||
| self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops) | ||
| self.assertNotIn("_POP_CALL_LOAD_CONST_INLINE_BORROW", uops) | ||
| self.assertNotIn("_POP_CALL_ONE_LOAD_CONST_INLINE_BORROW", uops) | ||
| self.assertNotIn("_POP_CALL_TWO_LOAD_CONST_INLINE_BORROW", uops) | ||
| def test_call_isinstance_tuple_unknown_length(self): | ||
| def testfunc(n): | ||
| x = 0 | ||
| for _ in range(n): | ||
| # tuple with an unknown length, we only narrow to bool | ||
| tup = tuple(eval('(int, str)')) | ||
| y = isinstance(42, tup) | ||
| if y: | ||
| x += 1 | ||
| return x | ||
| res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) | ||
| self.assertEqual(res, TIER2_THRESHOLD) | ||
| self.assertIsNotNone(ex) | ||
2 changes: 2 additions & 0 deletionsMisc/NEWS.d/next/Core_and_Builtins/2025-05-22-22-19-56.gh-issue-131798.kxRt1-.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 @@ | ||
| Optimize ``_CALL_ISINSTANCE`` in the JIT when the second argument is a tuple | ||
| of classes. |
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 |
|---|---|---|
| @@ -938,6 +938,9 @@ dummy_func(void) { | ||
| } | ||
| op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res)) { | ||
| // The below define is equivalent to PyObject_TypeCheck(inst, cls) | ||
| #define sym_IS_SUBTYPE(inst, cls) ((inst) == (cls) || PyType_IsSubtype(inst, cls)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I'm not sure about this define, maybe it's fine to duplicate this logic? | ||
| // the result is always a bool, but sometimes we can | ||
| // narrow it down to True or False | ||
| res = sym_new_type(ctx, &PyBool_Type); | ||
| @@ -947,14 +950,54 @@ dummy_func(void) { | ||
| // isinstance(inst, cls) where both inst and cls have | ||
| // known types, meaning we can deduce either True or False | ||
| PyObject *out = Py_False; | ||
| if (sym_IS_SUBTYPE(inst_type, cls_o)) { | ||
| out = Py_True; | ||
| } | ||
| sym_set_const(res, out); | ||
| REPLACE_OP(this_instr, _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)out); | ||
| } | ||
| else if (inst_type && sym_matches_type(cls, &PyTuple_Type)) { | ||
| // isinstance(inst, tup) where inst has a known type and tup is a tuple. | ||
| // We can deduce True if inst is an instance of at least one of | ||
| // the items in the tuple. | ||
| // We can deduce False if all items in the tuple have known types and | ||
| // inst is not an instance of any of them. | ||
| int length = sym_tuple_length(cls); | ||
| if (length != -1) { | ||
| // We cannot do anything about tuples with unknown length | ||
| bool all_items_known = true; | ||
| PyObject *out = NULL; | ||
| for (int i = 0; i < length; i++) { | ||
| JitOptSymbol *item = sym_tuple_getitem(ctx, cls, i); | ||
| if (!sym_has_type(item)) { | ||
| // There is an unknown item in the tuple, | ||
| // we can no longer deduce False. | ||
| all_items_known = false; | ||
| continue; | ||
| } | ||
| PyTypeObject *cls_o = (PyTypeObject *)sym_get_const(ctx, item); | ||
| if (cls_o && | ||
| sym_matches_type(item, &PyType_Type) && | ||
| sym_IS_SUBTYPE(inst_type, cls_o)) | ||
| { | ||
| out = Py_True; | ||
| break; | ||
| } | ||
| } | ||
| if (!out && all_items_known) { | ||
| // We haven't deduced True, but all items in the tuple are known | ||
| // so we can deduce False | ||
| out = Py_False; | ||
| } | ||
| if (out) { | ||
| sym_set_const(res, out); | ||
| REPLACE_OP(this_instr, _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)out); | ||
| } | ||
| } | ||
| } | ||
| #undef sym_IS_SUBTYPE | ||
| } | ||
| op(_GUARD_IS_TRUE_POP, (flag -- )) { | ||
34 changes: 33 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.