summaryrefslogtreecommitdiffstats
path: root/Python/specialize.c
diff options
context:
space:
mode:
authorMark Shannon <mark@hotpy.org>2022-06-30 21:03:37 (GMT)
committerGitHub <noreply@github.com>2022-06-30 21:03:37 (GMT)
commit113b309f18103343a195f7c53c41763acf295167 (patch)
tree4c4792ad8d608f454e0895fda41539b546d347b7 /Python/specialize.c
parent6c405381918a358a62ce72798dd37c2a3d2a9be2 (diff)
downloadcpython-113b309f18103343a195f7c53c41763acf295167.zip
cpython-113b309f18103343a195f7c53c41763acf295167.tar.gz
cpython-113b309f18103343a195f7c53c41763acf295167.tar.bz2
[3.11] GH-93354: Use exponential backoff to avoid excessive specialization attempts (GH-93355) (GH-93379)
Co-authored-by: Mark Shannon <mark@hotpy.org> Co-authored-by: Ɓukasz Langa <lukasz@langa.pl>
Diffstat (limited to 'Python/specialize.c')
-rw-r--r--Python/specialize.c47
1 files changed, 23 insertions, 24 deletions
diff --git a/Python/specialize.c b/Python/specialize.c
index 80d952c..cf7bc32 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -316,7 +316,7 @@ _PyCode_Quicken(PyCodeObject *code)
}
static inline int
-initial_counter_value(void) {
+miss_counter_start(void) {
/* Starting value for the counter.
* This value needs to be not too low, otherwise
* it would cause excessive de-optimization.
@@ -738,12 +738,12 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name)
fail:
STAT_INC(LOAD_ATTR, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
success:
STAT_INC(LOAD_ATTR, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
}
@@ -820,12 +820,12 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name)
fail:
STAT_INC(STORE_ATTR, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
success:
STAT_INC(STORE_ATTR, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
}
@@ -1027,14 +1027,13 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name)
success:
STAT_INC(LOAD_METHOD, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
fail:
STAT_INC(LOAD_METHOD, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
-
}
int
@@ -1110,12 +1109,12 @@ _Py_Specialize_LoadGlobal(
fail:
STAT_INC(LOAD_GLOBAL, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
success:
STAT_INC(LOAD_GLOBAL, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
}
@@ -1239,12 +1238,12 @@ _Py_Specialize_BinarySubscr(
fail:
STAT_INC(BINARY_SUBSCR, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
success:
STAT_INC(BINARY_SUBSCR, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
}
@@ -1343,12 +1342,12 @@ _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *ins
fail:
STAT_INC(STORE_SUBSCR, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return 0;
success:
STAT_INC(STORE_SUBSCR, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
return 0;
}
@@ -1646,12 +1645,12 @@ _Py_Specialize_Precall(PyObject *callable, _Py_CODEUNIT *instr, int nargs,
if (fail) {
STAT_INC(PRECALL, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
}
else {
STAT_INC(PRECALL, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
}
return 0;
}
@@ -1678,12 +1677,12 @@ _Py_Specialize_Call(PyObject *callable, _Py_CODEUNIT *instr, int nargs,
if (fail) {
STAT_INC(CALL, failure);
assert(!PyErr_Occurred());
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
}
else {
STAT_INC(CALL, success);
assert(!PyErr_Occurred());
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
}
return 0;
}
@@ -1831,11 +1830,11 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
}
SPECIALIZATION_FAIL(BINARY_OP, binary_op_fail_kind(oparg, lhs, rhs));
STAT_INC(BINARY_OP, failure);
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return;
success:
STAT_INC(BINARY_OP, success);
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
}
@@ -1958,11 +1957,11 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
SPECIALIZATION_FAIL(COMPARE_OP, compare_op_fail_kind(lhs, rhs));
failure:
STAT_INC(COMPARE_OP, failure);
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return;
success:
STAT_INC(COMPARE_OP, success);
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
}
#ifdef Py_STATS
@@ -2008,11 +2007,11 @@ _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr, int oparg)
SPECIALIZATION_FAIL(UNPACK_SEQUENCE, unpack_sequence_fail_kind(seq));
failure:
STAT_INC(UNPACK_SEQUENCE, failure);
- cache->counter = ADAPTIVE_CACHE_BACKOFF;
+ cache->counter = adaptive_counter_backoff(cache->counter);
return;
success:
STAT_INC(UNPACK_SEQUENCE, success);
- cache->counter = initial_counter_value();
+ cache->counter = miss_counter_start();
}
#ifdef Py_STATS