https://github.com/python/cpython/commit/26d328b2ba26374fb8d9ffe8215ecef7c5e3f7a2
commit: 26d328b2ba26374fb8d9ffe8215ecef7c5e3f7a2
branch: main
author: Michael Droettboom <[email protected]>
committer: brandtbucher <[email protected]>
date: 2024-03-28T15:23:08-07:00
summary:
GH-117121: Add pystats to JIT builds (GH-117346)
files:
M Python/ceval.c
M Python/ceval_macros.h
M Tools/jit/template.c
diff --git a/Python/ceval.c b/Python/ceval.c
index cd51011450c3d5..d34db61eecbae2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -990,7 +990,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate,
_PyInterpreterFrame *frame, int
#define DPRINTF(level, ...)
#endif
- OPT_STAT_INC(traces_executed);
+ ; // dummy statement after a label, before a declaration
uint16_t uopcode;
#ifdef Py_STATS
uint64_t trace_uop_execution_counter = 0;
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
index f2536ed3602c69..1194c11f8ba607 100644
--- a/Python/ceval_macros.h
+++ b/Python/ceval_macros.h
@@ -392,6 +392,7 @@ stack_pointer = _PyFrame_GetStackPointer(frame);
#ifdef _Py_JIT
#define GOTO_TIER_TWO(EXECUTOR) \
do { \
+ OPT_STAT_INC(traces_executed); \
jit_func jitted = (EXECUTOR)->jit_code; \
next_instr = jitted(frame, stack_pointer, tstate); \
Py_DECREF(tstate->previous_executor); \
@@ -406,6 +407,7 @@ do { \
#else
#define GOTO_TIER_TWO(EXECUTOR) \
do { \
+ OPT_STAT_INC(traces_executed); \
next_uop = (EXECUTOR)->trace; \
assert(next_uop->opcode == _START_EXECUTOR || next_uop->opcode ==
_COLD_EXIT); \
goto enter_tier_two; \
diff --git a/Tools/jit/template.c b/Tools/jit/template.c
index 9b4fc2af9671eb..f8be4d7f78facd 100644
--- a/Tools/jit/template.c
+++ b/Tools/jit/template.c
@@ -43,6 +43,7 @@
#undef GOTO_TIER_TWO
#define GOTO_TIER_TWO(EXECUTOR) \
do { \
+ OPT_STAT_INC(traces_executed); \
__attribute__((musttail)) \
return ((jit_func)((EXECUTOR)->jit_code))(frame, stack_pointer, tstate); \
} while (0)
@@ -88,6 +89,10 @@ _JIT_ENTRY(_PyInterpreterFrame *frame, PyObject
**stack_pointer, PyThreadState *
PATCH_VALUE(uint64_t, _operand, _JIT_OPERAND)
PATCH_VALUE(uint32_t, _target, _JIT_TARGET)
PATCH_VALUE(uint16_t, _exit_index, _JIT_EXIT_INDEX)
+
+ OPT_STAT_INC(uops_executed);
+ UOP_STAT_INC(opcode, execution_count);
+
// The actual instruction definitions (only one will be used):
if (opcode == _JUMP_TO_TOP) {
CHECK_EVAL_BREAKER();
@@ -106,9 +111,11 @@ _JIT_ENTRY(_PyInterpreterFrame *frame, PyObject
**stack_pointer, PyThreadState *
GOTO_TIER_ONE(NULL);
exit_to_tier1:
tstate->previous_executor = (PyObject *)current_executor;
+ UOP_STAT_INC(opcode, miss);
GOTO_TIER_ONE(_PyCode_CODE(_PyFrame_GetCode(frame)) + _target);
exit_to_trace:
{
+ UOP_STAT_INC(opcode, miss);
_PyExitData *exit = ¤t_executor->exits[_exit_index];
Py_INCREF(exit->executor);
tstate->previous_executor = (PyObject *)current_executor;
_______________________________________________
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]
