mirror of
https://github.com/python/cpython
synced 2024-09-15 23:06:25 +00:00
GH-117457: Correct pystats uop "miss" counts (GH-117477)
This commit is contained in:
parent
b5e60918af
commit
0edde64a41
|
@ -1083,7 +1083,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
|
|||
}
|
||||
#endif
|
||||
OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
|
||||
UOP_STAT_INC(uopcode, miss);
|
||||
Py_DECREF(current_executor);
|
||||
tstate->previous_executor = NULL;
|
||||
DISPATCH();
|
||||
|
@ -1091,7 +1090,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
|
|||
exit_to_trace:
|
||||
assert(next_uop[-1].format == UOP_FORMAT_EXIT);
|
||||
OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
|
||||
UOP_STAT_INC(uopcode, miss);
|
||||
uint32_t exit_index = next_uop[-1].exit_index;
|
||||
assert(exit_index < current_executor->exit_count);
|
||||
_PyExitData *exit = ¤t_executor->exits[exit_index];
|
||||
|
|
670
Python/executor_cases.c.h
generated
670
Python/executor_cases.c.h
generated
File diff suppressed because it is too large
Load diff
|
@ -100,7 +100,10 @@ def tier2_replace_deopt(
|
|||
out.emit(next(tkn_iter))
|
||||
emit_to(out, tkn_iter, "RPAREN")
|
||||
next(tkn_iter) # Semi colon
|
||||
out.emit(") JUMP_TO_JUMP_TARGET();\n")
|
||||
out.emit(") {\n")
|
||||
out.emit("UOP_STAT_INC(uopcode, miss);\n")
|
||||
out.emit("JUMP_TO_JUMP_TARGET();\n");
|
||||
out.emit("}\n")
|
||||
|
||||
|
||||
def tier2_replace_exit_if(
|
||||
|
@ -115,7 +118,10 @@ def tier2_replace_exit_if(
|
|||
out.emit(next(tkn_iter))
|
||||
emit_to(out, tkn_iter, "RPAREN")
|
||||
next(tkn_iter) # Semi colon
|
||||
out.emit(") JUMP_TO_JUMP_TARGET();\n")
|
||||
out.emit(") {\n")
|
||||
out.emit("UOP_STAT_INC(uopcode, miss);\n")
|
||||
out.emit("JUMP_TO_JUMP_TARGET();\n")
|
||||
out.emit("}\n")
|
||||
|
||||
|
||||
def tier2_replace_oparg(
|
||||
|
|
|
@ -85,7 +85,7 @@ _JIT_ENTRY(_PyInterpreterFrame *frame, PyObject **stack_pointer, PyThreadState *
|
|||
// Locals that the instruction implementations expect to exist:
|
||||
PATCH_VALUE(_PyExecutorObject *, current_executor, _JIT_EXECUTOR)
|
||||
int oparg;
|
||||
int opcode = _JIT_OPCODE;
|
||||
int uopcode = _JIT_OPCODE;
|
||||
// Other stuff we need handy:
|
||||
PATCH_VALUE(uint16_t, _oparg, _JIT_OPARG)
|
||||
PATCH_VALUE(uint64_t, _operand, _JIT_OPERAND)
|
||||
|
@ -93,14 +93,14 @@ _JIT_ENTRY(_PyInterpreterFrame *frame, PyObject **stack_pointer, PyThreadState *
|
|||
PATCH_VALUE(uint16_t, _exit_index, _JIT_EXIT_INDEX)
|
||||
|
||||
OPT_STAT_INC(uops_executed);
|
||||
UOP_STAT_INC(opcode, execution_count);
|
||||
UOP_STAT_INC(uopcode, execution_count);
|
||||
|
||||
// The actual instruction definitions (only one will be used):
|
||||
if (opcode == _JUMP_TO_TOP) {
|
||||
if (uopcode == _JUMP_TO_TOP) {
|
||||
CHECK_EVAL_BREAKER();
|
||||
PATCH_JUMP(_JIT_TOP);
|
||||
}
|
||||
switch (opcode) {
|
||||
switch (uopcode) {
|
||||
#include "executor_cases.c.h"
|
||||
default:
|
||||
Py_UNREACHABLE();
|
||||
|
@ -113,11 +113,9 @@ _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;
|
||||
|
|
Loading…
Reference in a new issue