Skip to content

GH-93354: Fix specialization cache miss counters #93860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Fidget-Spinner wants to merge 3 commits into from
Closed

GH-93354: Fix specialization cache miss counters #93860

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b66fc3a
Fix specialization cache miss counters
Fidget-Spinner Jun 15, 2022
00e225e
fix name
Fidget-Spinner Jun 15, 2022
98f56f3
Apply Guido's suggestions
Fidget-Spinner Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,10 +1546,16 @@ eval_frame_handle_pending(PyThreadState *tstate)
}

#define ADAPTIVE_COUNTER_IS_ZERO(cache) \
(cache)->counter < (1<<ADAPTIVE_BACKOFF_BITS)
((cache)->counter < (1<<ADAPTIVE_BACKOFF_BITS))

#define DECREMENT_ADAPTIVE_COUNTER(cache) \
(cache)->counter -= (1<<ADAPTIVE_BACKOFF_BITS)
((cache)->counter -= (1<<ADAPTIVE_BACKOFF_BITS))

#define ADAPTIVE_COUNTER_CODE_IS_ZERO(codeunit) \
(*(codeunit) < (1<<ADAPTIVE_BACKOFF_BITS))

#define DECREMENT_ADAPTIVE_COUNTER_CODE(codeunit) \
(*(codeunit) -= (1<<ADAPTIVE_BACKOFF_BITS))

static int
trace_function_entry(PyThreadState *tstate, _PyInterpreterFrame *frame)
Expand Down Expand Up @@ -5609,8 +5615,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
STAT_INC(opcode, miss);
/* The counter is always the first cache entry: */
_Py_CODEUNIT *counter = (_Py_CODEUNIT *)next_instr;
*counter -= 1;
if (*counter == 0) {
DECREMENT_ADAPTIVE_COUNTER_CODE(counter);
if (ADAPTIVE_COUNTER_CODE_IS_ZERO(counter)) {

@markshannon markshannon Jun 15, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the adaptive counter. It is the miss counter. It's not the same thing.

@Fidget-Spinner Fidget-Spinner Jun 15, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh thanks. I shouldn't code while sleep deprived 🤦 . Sorry.

int adaptive_opcode = _PyOpcode_Adaptive[opcode];
assert(adaptive_opcode);
_Py_SET_OPCODE(next_instr[-1], adaptive_opcode);
Expand Down