https://github.com/python/cpython/commit/794546fd53dffa1903a2d0fbe8d745889978f5dc
commit: 794546fd53dffa1903a2d0fbe8d745889978f5dc
branch: main
author: Brandt Bucher <[email protected]>
committer: brandtbucher <[email protected]>
date: 2024-07-24T09:16:30-07:00
summary:
GH-118093: Remove invalidated executors from side exits (GH-121885)
files:
M Include/internal/pycore_uop_metadata.h
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/optimizer.c
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index ea48f9d20607bd..4c18f66d7420af 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -260,7 +260,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_CHECK_FUNCTION] = HAS_DEOPT_FLAG,
[_INTERNAL_INCREMENT_OPT_COUNTER] = 0,
[_DYNAMIC_EXIT] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG,
- [_START_EXECUTOR] = HAS_DEOPT_FLAG,
+ [_START_EXECUTOR] = 0,
[_FATAL_ERROR] = 0,
[_CHECK_VALIDITY_AND_SET_IP] = HAS_DEOPT_FLAG,
[_DEOPT] = 0,
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 480045069c2942..9dd7cf37beecf0 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -4624,6 +4624,10 @@ dummy_func(
_PyOpcode_OpName[target->op.code]);
}
#endif
+ if (exit->executor && !exit->executor->vm_data.valid) {
+ exit->temperature = initial_temperature_backoff_counter();
+ Py_CLEAR(exit->executor);
+ }
if (exit->executor == NULL) {
_Py_BackoffCounter temperature = exit->temperature;
if (!backoff_counter_triggers(temperature)) {
@@ -4743,7 +4747,7 @@ dummy_func(
#ifndef _Py_JIT
current_executor = (_PyExecutorObject*)executor;
#endif
- DEOPT_IF(!((_PyExecutorObject *)executor)->vm_data.valid);
+ assert(((_PyExecutorObject *)executor)->vm_data.valid);
}
tier2 op(_FATAL_ERROR, (--)) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index e9f73f032bf2a4..2a4428e4a52cf0 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -4986,6 +4986,10 @@
_PyOpcode_OpName[target->op.code]);
}
#endif
+ if (exit->executor && !exit->executor->vm_data.valid) {
+ exit->temperature = initial_temperature_backoff_counter();
+ Py_CLEAR(exit->executor);
+ }
if (exit->executor == NULL) {
_Py_BackoffCounter temperature = exit->temperature;
if (!backoff_counter_triggers(temperature)) {
@@ -5156,10 +5160,7 @@
#ifndef _Py_JIT
current_executor = (_PyExecutorObject*)executor;
#endif
- if (!((_PyExecutorObject *)executor)->vm_data.valid) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
+ assert(((_PyExecutorObject *)executor)->vm_data.valid);
break;
}
diff --git a/Python/optimizer.c b/Python/optimizer.c
index a43eed45f097e7..73316b3587f221 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -1587,42 +1587,36 @@ _Py_Executors_InvalidateDependency(PyInterpreterState
*interp, void *obj, int is
_Py_BloomFilter_Add(&obj_filter, obj);
/* Walk the list of executors */
/* TO DO -- Use a tree to avoid traversing as many objects */
- bool no_memory = false;
PyObject *invalidate = PyList_New(0);
if (invalidate == NULL) {
- PyErr_Clear();
- no_memory = true;
+ goto error;
}
/* Clearing an executor can deallocate others, so we need to make a list of
* executors to invalidate first */
for (_PyExecutorObject *exec = interp->executor_list_head; exec != NULL;) {
assert(exec->vm_data.valid);
_PyExecutorObject *next = exec->vm_data.links.next;
- if (bloom_filter_may_contain(&exec->vm_data.bloom, &obj_filter)) {
- unlink_executor(exec);
- if (no_memory) {
- exec->vm_data.valid = 0;
- } else {
- if (PyList_Append(invalidate, (PyObject *)exec) < 0) {
- PyErr_Clear();
- no_memory = true;
- exec->vm_data.valid = 0;
- }
- }
- if (is_invalidation) {
- OPT_STAT_INC(executors_invalidated);
- }
+ if (bloom_filter_may_contain(&exec->vm_data.bloom, &obj_filter) &&
+ PyList_Append(invalidate, (PyObject *)exec))
+ {
+ goto error;
}
exec = next;
}
- if (invalidate != NULL) {
- for (Py_ssize_t i = 0; i < PyList_GET_SIZE(invalidate); i++) {
- _PyExecutorObject *exec = (_PyExecutorObject
*)PyList_GET_ITEM(invalidate, i);
- executor_clear(exec);
+ for (Py_ssize_t i = 0; i < PyList_GET_SIZE(invalidate); i++) {
+ _PyExecutorObject *exec = (_PyExecutorObject
*)PyList_GET_ITEM(invalidate, i);
+ executor_clear(exec);
+ if (is_invalidation) {
+ OPT_STAT_INC(executors_invalidated);
}
- Py_DECREF(invalidate);
}
+ Py_DECREF(invalidate);
return;
+error:
+ PyErr_Clear();
+ Py_XDECREF(invalidate);
+ // If we're truly out of memory, wiping out everything is a fine fallback:
+ _Py_Executors_InvalidateAll(interp, is_invalidation);
}
/* Invalidate all executors */
_______________________________________________
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]
