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
Appearance settings

Commit 8d490b3

Browse filesBrowse files
tomasr8tomasr8
authored
GH-131798: Narrow the return type of isinstance for some known arguments in the JIT (GH-133172)
1 parent 9859791 commit 8d490b3
Copy full SHA for 8d490b3

File tree

4 files changed

+152
-1
lines changed
Filter options

4 files changed

+152
-1
lines changed

‎Lib/test/test_capi/test_opt.py

Copy file name to clipboardExpand all lines: Lib/test/test_capi/test_opt.py
+115Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,121 @@ def testfunc(n):
19591959
self.assertNotIn("_GUARD_THIRD_NULL", uops)
19601960
self.assertNotIn("_GUARD_CALLABLE_ISINSTANCE", uops)
19611961

1962+
def test_call_isinstance_is_true(self):
1963+
def testfunc(n):
1964+
x = 0
1965+
for _ in range(n):
1966+
y = isinstance(42, int)
1967+
if y:
1968+
x += 1
1969+
return x
1970+
1971+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
1972+
self.assertEqual(res, TIER2_THRESHOLD)
1973+
self.assertIsNotNone(ex)
1974+
uops = get_opnames(ex)
1975+
self.assertIn("_CALL_ISINSTANCE", uops)
1976+
self.assertNotIn("_TO_BOOL_BOOL", uops)
1977+
self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
1978+
1979+
def test_call_isinstance_is_false(self):
1980+
def testfunc(n):
1981+
x = 0
1982+
for _ in range(n):
1983+
y = isinstance(42, str)
1984+
if not y:
1985+
x += 1
1986+
return x
1987+
1988+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
1989+
self.assertEqual(res, TIER2_THRESHOLD)
1990+
self.assertIsNotNone(ex)
1991+
uops = get_opnames(ex)
1992+
self.assertIn("_CALL_ISINSTANCE", uops)
1993+
self.assertNotIn("_TO_BOOL_BOOL", uops)
1994+
self.assertNotIn("_GUARD_IS_FALSE_POP", uops)
1995+
1996+
def test_call_isinstance_subclass(self):
1997+
def testfunc(n):
1998+
x = 0
1999+
for _ in range(n):
2000+
y = isinstance(True, int)
2001+
if y:
2002+
x += 1
2003+
return x
2004+
2005+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
2006+
self.assertEqual(res, TIER2_THRESHOLD)
2007+
self.assertIsNotNone(ex)
2008+
uops = get_opnames(ex)
2009+
self.assertIn("_CALL_ISINSTANCE", uops)
2010+
self.assertNotIn("_TO_BOOL_BOOL", uops)
2011+
self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
2012+
2013+
def test_call_isinstance_unknown_object(self):
2014+
def testfunc(n):
2015+
x = 0
2016+
for _ in range(n):
2017+
# The optimizer doesn't know the return type here:
2018+
bar = eval("42")
2019+
# This will only narrow to bool:
2020+
y = isinstance(bar, int)
2021+
if y:
2022+
x += 1
2023+
return x
2024+
2025+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
2026+
self.assertEqual(res, TIER2_THRESHOLD)
2027+
self.assertIsNotNone(ex)
2028+
uops = get_opnames(ex)
2029+
self.assertIn("_CALL_ISINSTANCE", uops)
2030+
self.assertNotIn("_TO_BOOL_BOOL", uops)
2031+
self.assertIn("_GUARD_IS_TRUE_POP", uops)
2032+
2033+
def test_call_isinstance_tuple_of_classes(self):
2034+
def testfunc(n):
2035+
x = 0
2036+
for _ in range(n):
2037+
# A tuple of classes is currently not optimized,
2038+
# so this is only narrowed to bool:
2039+
y = isinstance(42, (int, str))
2040+
if y:
2041+
x += 1
2042+
return x
2043+
2044+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
2045+
self.assertEqual(res, TIER2_THRESHOLD)
2046+
self.assertIsNotNone(ex)
2047+
uops = get_opnames(ex)
2048+
self.assertIn("_CALL_ISINSTANCE", uops)
2049+
self.assertNotIn("_TO_BOOL_BOOL", uops)
2050+
self.assertIn("_GUARD_IS_TRUE_POP", uops)
2051+
2052+
def test_call_isinstance_metaclass(self):
2053+
class EvenNumberMeta(type):
2054+
def __instancecheck__(self, number):
2055+
return number % 2 == 0
2056+
2057+
class EvenNumber(metaclass=EvenNumberMeta):
2058+
pass
2059+
2060+
def testfunc(n):
2061+
x = 0
2062+
for _ in range(n):
2063+
# Only narrowed to bool
2064+
y = isinstance(42, EvenNumber)
2065+
if y:
2066+
x += 1
2067+
return x
2068+
2069+
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
2070+
self.assertEqual(res, TIER2_THRESHOLD)
2071+
self.assertIsNotNone(ex)
2072+
uops = get_opnames(ex)
2073+
self.assertIn("_CALL_ISINSTANCE", uops)
2074+
self.assertNotIn("_TO_BOOL_BOOL", uops)
2075+
self.assertIn("_GUARD_IS_TRUE_POP", uops)
2076+
19622077

19632078
def global_identity(x):
19642079
return x

‎Misc/NEWS.d/next/Core_and_Builtins/2025-04-26-17-50-01.gh-issue-131798.XiOgw5.rst

Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Narrow the return type and constant-evaluate ``CALL_ISINSTANCE`` for a
2+
subset of known values in the JIT. Patch by Tomas Roun

‎Python/optimizer_bytecodes.c

Copy file name to clipboardExpand all lines: Python/optimizer_bytecodes.c
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,26 @@ dummy_func(void) {
890890
}
891891
}
892892

893+
op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res)) {
894+
// the result is always a bool, but sometimes we can
895+
// narrow it down to True or False
896+
res = sym_new_type(ctx, &PyBool_Type);
897+
PyTypeObject *inst_type = sym_get_type(instance);
898+
PyTypeObject *cls_o = (PyTypeObject *)sym_get_const(ctx, cls);
899+
if (inst_type && cls_o && sym_matches_type(cls, &PyType_Type)) {
900+
// isinstance(inst, cls) where both inst and cls have
901+
// known types, meaning we can deduce either True or False
902+
903+
// The below check is equivalent to PyObject_TypeCheck(inst, cls)
904+
if (inst_type == cls_o || PyType_IsSubtype(inst_type, cls_o)) {
905+
sym_set_const(res, Py_True);
906+
}
907+
else {
908+
sym_set_const(res, Py_False);
909+
}
910+
}
911+
}
912+
893913
op(_GUARD_IS_TRUE_POP, (flag -- )) {
894914
if (sym_is_const(ctx, flag)) {
895915
PyObject *value = sym_get_const(ctx, flag);

‎Python/optimizer_cases.c.h

Copy file name to clipboardExpand all lines: Python/optimizer_cases.c.h
+15-1Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.