https://github.com/python/cpython/commit/7c2bd9b2266665ff4010b6c6c175bab18e08e4f8
commit: 7c2bd9b2266665ff4010b6c6c175bab18e08e4f8
branch: main
author: Donghee Na <[email protected]>
committer: corona10 <[email protected]>
date: 2024-12-03T00:14:40+09:00
summary:
gh-115999: Use light-weight lock for UNPACK_SEQUENCE_LIST (gh-127514)
files:
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_metadata.h
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
diff --git a/Include/internal/pycore_opcode_metadata.h
b/Include/internal/pycore_opcode_metadata.h
index d63c8df8ca6690..81dde66a6f26c2 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -2148,7 +2148,7 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[266] = {
[UNARY_NOT] = { true, INSTR_FMT_IX, HAS_PURE_FLAG },
[UNPACK_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG },
[UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG },
- [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG |
HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG },
+ [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG |
HAS_DEOPT_FLAG },
[UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG |
HAS_DEOPT_FLAG },
[UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG |
HAS_DEOPT_FLAG },
[WITH_EXCEPT_START] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG },
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 1825bb3a5abc80..89fce193f40bd8 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -112,7 +112,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_UNPACK_SEQUENCE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
[_UNPACK_SEQUENCE_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
- [_UNPACK_SEQUENCE_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
+ [_UNPACK_SEQUENCE_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
[_UNPACK_EX] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_STORE_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
[_DELETE_ATTR] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index c07ec42ec68f8b..e96674c3502ef1 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1438,14 +1438,9 @@ dummy_func(
inst(UNPACK_SEQUENCE_LIST, (unused/1, seq -- values[oparg])) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
DEOPT_IF(!PyList_CheckExact(seq_o));
- #ifdef Py_GIL_DISABLED
- PyCriticalSection cs;
- PyCriticalSection_Begin(&cs, seq_o);
- #endif
+ DEOPT_IF(!LOCK_OBJECT(seq_o));
if (PyList_GET_SIZE(seq_o) != oparg) {
- #ifdef Py_GIL_DISABLED
- PyCriticalSection_End(&cs);
- #endif
+ UNLOCK_OBJECT(seq_o);
DEOPT_IF(true);
}
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1453,9 +1448,7 @@ dummy_func(
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
- #ifdef Py_GIL_DISABLED
- PyCriticalSection_End(&cs);
- #endif
+ UNLOCK_OBJECT(seq_o);
DECREF_INPUTS();
}
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index c91257b06cad11..580814657608db 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1728,18 +1728,12 @@
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
- #ifdef Py_GIL_DISABLED
- PyCriticalSection cs;
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_Begin(&cs, seq_o);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ if (!LOCK_OBJECT(seq_o)) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
+ }
if (PyList_GET_SIZE(seq_o) != oparg) {
- #ifdef Py_GIL_DISABLED
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_End(&cs);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ UNLOCK_OBJECT(seq_o);
if (true) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
@@ -1750,11 +1744,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
- #ifdef Py_GIL_DISABLED
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_End(&cs);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ UNLOCK_OBJECT(seq_o);
PyStackRef_CLOSE(seq);
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 45bcc4242af9d7..e1f951558de7da 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -8040,18 +8040,9 @@
values = &stack_pointer[-1];
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
DEOPT_IF(!PyList_CheckExact(seq_o), UNPACK_SEQUENCE);
- #ifdef Py_GIL_DISABLED
- PyCriticalSection cs;
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_Begin(&cs, seq_o);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ DEOPT_IF(!LOCK_OBJECT(seq_o), UNPACK_SEQUENCE);
if (PyList_GET_SIZE(seq_o) != oparg) {
- #ifdef Py_GIL_DISABLED
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_End(&cs);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ UNLOCK_OBJECT(seq_o);
DEOPT_IF(true, UNPACK_SEQUENCE);
}
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -8059,11 +8050,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
- #ifdef Py_GIL_DISABLED
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyCriticalSection_End(&cs);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- #endif
+ UNLOCK_OBJECT(seq_o);
PyStackRef_CLOSE(seq);
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
