summaryrefslogtreecommitdiffstats
path: root/Python/specialize.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2023-09-06 15:54:59 (GMT)
committerGitHub <noreply@github.com>2023-09-06 15:54:59 (GMT)
commita0773b89dfe5cd2190d539905dd89e7f6455668e (patch)
treee11c7306e6ed7750265eda6ba8fa49f329bc0f85 /Python/specialize.c
parent8ff11425783806f8cb78e99f667546b1f7f3428e (diff)
downloadcpython-a0773b89dfe5cd2190d539905dd89e7f6455668e.zip
cpython-a0773b89dfe5cd2190d539905dd89e7f6455668e.tar.gz
cpython-a0773b89dfe5cd2190d539905dd89e7f6455668e.tar.bz2
gh-108753: Enhance pystats (#108754)
Statistics gathering is now off by default. Use the "-X pystats" command line option or set the new PYTHONSTATS environment variable to 1 to turn statistics gathering on at Python startup. Statistics are no longer dumped at exit if statistics gathering was off or statistics have been cleared. Changes: * Add PYTHONSTATS environment variable. * sys._stats_dump() now returns False if statistics are not dumped because they are all equal to zero. * Add PyConfig._pystats member. * Add tests on sys functions and on setting PyConfig._pystats to 1. * Add Include/cpython/pystats.h and Include/internal/pycore_pystats.h header files. * Rename '_py_stats' variable to '_Py_stats'. * Exclude Include/cpython/pystats.h from the Py_LIMITED_API. * Move pystats.h include from object.h to Python.h. * Add _Py_StatsOn() and _Py_StatsOff() functions. Remove '_py_stats_struct' variable from the API: make it static in specialize.c. * Document API in Include/pystats.h and Include/cpython/pystats.h. * Complete pystats documentation in Doc/using/configure.rst. * Don't write "all zeros" stats: if _stats_off() and _stats_clear() or _stats_dump() were called. * _PyEval_Fini() now always call _Py_PrintSpecializationStats() which does nothing if stats are all zeros. Co-authored-by: Michael Droettboom <mdboom@gmail.com>
Diffstat (limited to 'Python/specialize.c')
-rw-r--r--Python/specialize.c98
1 files changed, 66 insertions, 32 deletions
diff --git a/Python/specialize.c b/Python/specialize.c
index aa40b33..e072167 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -13,17 +13,17 @@
#include "pycore_pylifecycle.h" // _PyOS_URandomNonblock()
#include "pycore_runtime.h" // _Py_ID()
-
#include <stdlib.h> // rand()
+
/* For guidance on adding or extending families of instructions see
* ./adaptive.md
*/
#ifdef Py_STATS
GCStats _py_gc_stats[NUM_GENERATIONS] = { 0 };
-PyStats _py_stats_struct = { .gc_stats = &_py_gc_stats[0] };
-PyStats *_py_stats = NULL;
+static PyStats _Py_stats_struct = { .gc_stats = _py_gc_stats };
+PyStats *_Py_stats = NULL;
#define ADD_STAT_TO_DICT(res, field) \
do { \
@@ -83,7 +83,7 @@ add_stat_dict(
int opcode,
const char *name) {
- SpecializationStats *stats = &_py_stats_struct.opcode_stats[opcode].specialization;
+ SpecializationStats *stats = &_Py_stats_struct.opcode_stats[opcode].specialization;
PyObject *d = stats_to_dict(stats);
if (d == NULL) {
return -1;
@@ -93,7 +93,6 @@ add_stat_dict(
return err;
}
-#ifdef Py_STATS
PyObject*
_Py_GetSpecializationStats(void) {
PyObject *stats = PyDict_New();
@@ -120,7 +119,6 @@ _Py_GetSpecializationStats(void) {
}
return stats;
}
-#endif
#define PRINT_STAT(i, field) \
@@ -218,7 +216,8 @@ print_gc_stats(FILE *out, GCStats *stats)
}
static void
-print_stats(FILE *out, PyStats *stats) {
+print_stats(FILE *out, PyStats *stats)
+{
print_spec_stats(out, stats->opcode_stats);
print_call_stats(out, &stats->call_stats);
print_object_stats(out, &stats->object_stats);
@@ -226,18 +225,56 @@ print_stats(FILE *out, PyStats *stats) {
}
void
+_Py_StatsOn(void)
+{
+ _Py_stats = &_Py_stats_struct;
+}
+
+void
+_Py_StatsOff(void)
+{
+ _Py_stats = NULL;
+}
+
+void
_Py_StatsClear(void)
{
- for (int i = 0; i < NUM_GENERATIONS; i++) {
- _py_gc_stats[i] = (GCStats) { 0 };
+ memset(&_py_gc_stats, 0, sizeof(_py_gc_stats));
+ memset(&_Py_stats_struct, 0, sizeof(_Py_stats_struct));
+ _Py_stats_struct.gc_stats = _py_gc_stats;
+}
+
+static int
+mem_is_zero(unsigned char *ptr, size_t size)
+{
+ for (size_t i=0; i < size; i++) {
+ if (*ptr != 0) {
+ return 0;
+ }
+ ptr++;
}
- _py_stats_struct = (PyStats) { 0 };
- _py_stats_struct.gc_stats = _py_gc_stats;
+ return 1;
}
-void
+int
_Py_PrintSpecializationStats(int to_file)
{
+ PyStats *stats = &_Py_stats_struct;
+#define MEM_IS_ZERO(DATA) mem_is_zero((unsigned char*)DATA, sizeof(*(DATA)))
+ int is_zero = (
+ MEM_IS_ZERO(stats->gc_stats) // is a pointer
+ && MEM_IS_ZERO(&stats->opcode_stats)
+ && MEM_IS_ZERO(&stats->call_stats)
+ && MEM_IS_ZERO(&stats->object_stats)
+ );
+#undef MEM_IS_ZERO
+ if (is_zero) {
+ // gh-108753: -X pystats command line was used, but then _stats_off()
+ // and _stats_clear() have been called: in this case, avoid printing
+ // useless "all zeros" statistics.
+ return 0;
+ }
+
FILE *out = stderr;
if (to_file) {
/* Write to a file instead of stderr. */
@@ -268,26 +305,25 @@ _Py_PrintSpecializationStats(int to_file)
else {
fprintf(out, "Specialization stats:\n");
}
- print_stats(out, &_py_stats_struct);
+ print_stats(out, stats);
if (out != stderr) {
fclose(out);
}
+ return 1;
}
-#ifdef Py_STATS
-
#define SPECIALIZATION_FAIL(opcode, kind) \
do { \
- if (_py_stats) { \
- _py_stats->opcode_stats[opcode].specialization.failure_kinds[kind]++; \
+ if (_Py_stats) { \
+ _Py_stats->opcode_stats[opcode].specialization.failure_kinds[kind]++; \
} \
} while (0)
-#endif
-#endif
+#endif // Py_STATS
+
#ifndef SPECIALIZATION_FAIL
-#define SPECIALIZATION_FAIL(opcode, kind) ((void)0)
+# define SPECIALIZATION_FAIL(opcode, kind) ((void)0)
#endif
// Initialize warmup counters and insert superinstructions. This cannot fail.
@@ -1067,7 +1103,7 @@ load_attr_fail_kind(DescriptorClassification kind)
}
Py_UNREACHABLE();
}
-#endif
+#endif // Py_STATS
static int
specialize_class_load_attr(PyObject *owner, _Py_CODEUNIT *instr,
@@ -1306,7 +1342,7 @@ binary_subscr_fail_kind(PyTypeObject *container_type, PyObject *sub)
}
return SPEC_FAIL_OTHER;
}
-#endif
+#endif // Py_STATS
static int
function_kind(PyCodeObject *code) {
@@ -1545,7 +1581,7 @@ _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *ins
}
goto fail;
}
-#endif
+#endif // Py_STATS
SPECIALIZATION_FAIL(STORE_SUBSCR, SPEC_FAIL_OTHER);
fail:
STAT_INC(STORE_SUBSCR, failure);
@@ -1690,7 +1726,7 @@ meth_descr_call_fail_kind(int ml_flags)
return SPEC_FAIL_CALL_BAD_CALL_FLAGS;
}
}
-#endif
+#endif // Py_STATS
static int
specialize_method_descriptor(PyMethodDescrObject *descr, _Py_CODEUNIT *instr,
@@ -1871,7 +1907,7 @@ call_fail_kind(PyObject *callable)
}
return SPEC_FAIL_OTHER;
}
-#endif
+#endif // Py_STATS
/* TODO:
@@ -1995,7 +2031,7 @@ binary_op_fail_kind(int oparg, PyObject *lhs, PyObject *rhs)
}
Py_UNREACHABLE();
}
-#endif
+#endif // Py_STATS
void
_Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
@@ -2102,7 +2138,7 @@ compare_op_fail_kind(PyObject *lhs, PyObject *rhs)
}
return SPEC_FAIL_OTHER;
}
-#endif
+#endif // Py_STATS
void
_Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
@@ -2165,7 +2201,7 @@ unpack_sequence_fail_kind(PyObject *seq)
}
return SPEC_FAIL_OTHER;
}
-#endif
+#endif // Py_STATS
void
_Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr, int oparg)
@@ -2206,7 +2242,6 @@ success:
}
#ifdef Py_STATS
-
int
_PySpecialization_ClassifyIterator(PyObject *iter)
{
@@ -2277,8 +2312,7 @@ int
}
return SPEC_FAIL_OTHER;
}
-
-#endif
+#endif // Py_STATS
void
_Py_Specialize_ForIter(PyObject *iter, _Py_CODEUNIT *instr, int oparg)
@@ -2431,7 +2465,7 @@ _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr)
goto failure;
}
SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_OTHER);
-#endif
+#endif // Py_STATS
failure:
STAT_INC(TO_BOOL, failure);
instr->op.code = TO_BOOL;