Skip to content

gh-134584: Eliminate redundant refcounting from UNPACK_SEQUENCE family #142952

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

Open
cocolato wants to merge 1 commit into
base: main
Choose a base branch
from
+263 −98
Open

gh-134584: Eliminate redundant refcounting from UNPACK_SEQUENCE family #142952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions 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.

15 changes: 8 additions & 7 deletions Include/internal/pycore_uop_ids.h
View file
Open in desktop

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

36 changes: 19 additions & 17 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.

69 changes: 69 additions & 0 deletions Lib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,75 @@ def testfunc(n, m):
uops = get_opnames(ex)
self.assertIn("_FOR_ITER_TIER_TWO", uops)

def test_unpack_sequence_generic(self):
def testfunc(x):
i = 0
while i < x:
i += 1
# Use an iterator to force generic UNPACK_SEQUENCE
a, b = iter((1, 2))
return a, b

res = testfunc(TIER2_THRESHOLD)
self.assertEqual(res, (1, 2))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_UNPACK_SEQUENCE", uops)

def test_unpack_sequence_two_tuple(self):
def testfunc(x):
i = 0
while i < x:
i += 1
t = (i, i)
a, b = t
return a, b

res = testfunc(TIER2_THRESHOLD)
self.assertEqual(res, (TIER2_THRESHOLD, TIER2_THRESHOLD))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_UNPACK_SEQUENCE_TWO_TUPLE", uops)
self.assertNotIn("_POP_TOP", uops)

def test_unpack_sequence_tuple(self):
def testfunc(x):
i = 0
while i < x:
i += 1
t = (i, i, i)
a, b, c = t
return a, b, c

res = testfunc(TIER2_THRESHOLD)
self.assertEqual(res, (TIER2_THRESHOLD, TIER2_THRESHOLD, TIER2_THRESHOLD))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_UNPACK_SEQUENCE_TUPLE", uops)
self.assertNotIn("_POP_TOP", uops)

def test_unpack_sequence_list(self):
def testfunc(x):
i = 0
while i < x:
i += 1
a, b = [1, 2]
return a, b

res = testfunc(TIER2_THRESHOLD)
self.assertEqual(res, (1, 2))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_UNPACK_SEQUENCE_LIST", uops)


@requires_specialization
@unittest.skipIf(Py_GIL_DISABLED, "optimizer not yet supported in free-threaded builds")
Expand Down
35 changes: 21 additions & 14 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,33 +1576,38 @@ dummy_func(
(void)counter;
}

op(_UNPACK_SEQUENCE, (seq -- unused[oparg], top[0])) {
PyObject *seq_o = PyStackRef_AsPyObjectSteal(seq);
op(_UNPACK_SEQUENCE, (seq -- unused[oparg], top[0], s)) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
int res = _PyEval_UnpackIterableStackRef(tstate, seq_o, oparg, -1, top);
Py_DECREF(seq_o);
ERROR_IF(res == 0);
if (res == 0) {
PyStackRef_CLOSE(seq);
ERROR_IF(1);
}
s = seq;
INPUTS_DEAD();
}

macro(UNPACK_SEQUENCE) = _SPECIALIZE_UNPACK_SEQUENCE + _UNPACK_SEQUENCE;
macro(UNPACK_SEQUENCE) = _SPECIALIZE_UNPACK_SEQUENCE + _UNPACK_SEQUENCE + POP_TOP;

macro(UNPACK_SEQUENCE_TWO_TUPLE) =
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TWO_TUPLE;
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TWO_TUPLE + POP_TOP;

op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) {
op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0, s)) {
assert(oparg == 2);
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(PyTuple_CheckExact(seq_o));
DEOPT_IF(PyTuple_GET_SIZE(seq_o) != 2);
STAT_INC(UNPACK_SEQUENCE, hit);
val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0));
val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1));
PyStackRef_CLOSE(seq);
s = seq;
INPUTS_DEAD();
}

macro(UNPACK_SEQUENCE_TUPLE) =
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TUPLE;
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TUPLE + POP_TOP;

op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) {
op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg], s)) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(PyTuple_CheckExact(seq_o));
DEOPT_IF(PyTuple_GET_SIZE(seq_o) != oparg);
Expand All @@ -1611,13 +1616,14 @@ dummy_func(
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
DECREF_INPUTS();
s = seq;
INPUTS_DEAD();
}

macro(UNPACK_SEQUENCE_LIST) =
_GUARD_TOS_LIST + unused/1 + _UNPACK_SEQUENCE_LIST;
_GUARD_TOS_LIST + unused/1 + _UNPACK_SEQUENCE_LIST + POP_TOP;

op(_UNPACK_SEQUENCE_LIST, (seq -- values[oparg])) {
op(_UNPACK_SEQUENCE_LIST, (seq -- values[oparg], s)) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(PyList_CheckExact(seq_o));
DEOPT_IF(!LOCK_OBJECT(seq_o));
Expand All @@ -1631,7 +1637,8 @@ dummy_func(
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
UNLOCK_OBJECT(seq_o);
DECREF_INPUTS();
s = seq;
INPUTS_DEAD();
}

inst(UNPACK_EX, (seq -- unused[oparg & 0xFF], unused, unused[oparg >> 8], top[0])) {
Expand Down
Loading
Loading