Skip to content

Tier 2 cleanups and tweaks #115534

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

Merged
gvanrossum merged 20 commits into from
Feb 20, 2024
Merged

Tier 2 cleanups and tweaks #115534

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
06f1e37
Rename get_{uop,counter}_optimizer to new_*_optimizer
gvanrossum Feb 15, 2024
182c023
Remove unneeded header from specialize.c
gvanrossum Feb 15, 2024
d862825
Use _PyUOpName() instead of _PyOpcode_uop_name[]
gvanrossum Feb 15, 2024
6dc477d
Add target to executor iterator items
gvanrossum Feb 15, 2024
65a01df
Add executor methods to get underlying opcode/oparg
gvanrossum Feb 15, 2024
044ab16
Use standardized format for printing uops
gvanrossum Feb 15, 2024
984ed1b
Tweak _PyUOpPrint usage
gvanrossum Feb 15, 2024
edf843b
Switch ceval.c to _PyUOpPrint
gvanrossum Feb 15, 2024
65c5c04
Rearrange ADD_TO_TRACE() assignments
gvanrossum Feb 15, 2024
527b78e
Revert "Remove unneeded header from specialize.c"
gvanrossum Feb 15, 2024
c9677a1
Use _PyUOpName() in pystats printing code
gvanrossum Feb 15, 2024
7a34e16
Fix JIT build (don't use lltrace ifndef Py_DEBUG)
gvanrossum Feb 15, 2024
94eeb1b
Don't use snprintf()
gvanrossum Feb 16, 2024
206b54a
Fix uop names in older data files in summarize_stats.py
gvanrossum Feb 16, 2024
b982f74
Merge main; improvements to test_opt.py
gvanrossum Feb 16, 2024
6b268f8
Add offsets to ADD_TO_TRACE debug message
gvanrossum Feb 16, 2024
0d20105
Merge remote-tracking branch 'origin/main' into opt-tweaks
gvanrossum Feb 20, 2024
a4fb372
Fix up after merge
gvanrossum Feb 20, 2024
eb12922
Always do a range check in _PyUOpName
gvanrossum Feb 20, 2024
1eccb79
Merge remote-tracking branch 'origin/main' into opt-tweaks
gvanrossum Feb 20, 2024
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
Prev Previous commit
Next Next commit
Switch ceval.c to _PyUOpPrint
  • Loading branch information
@gvanrossum
gvanrossum committed Feb 15, 2024
commit edf843b2830ad4a9fd4cab773d64c7841ca1823d
51 changes: 32 additions & 19 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,10 @@ static const _Py_CODEUNIT _Py_INTERPRETER_TRAMPOLINE_INSTRUCTIONS[] = {

extern const struct _PyCode_DEF(8) _Py_InitCleanup;

extern const char *_PyUOpName(int index);
#ifdef Py_DEBUG
extern void _PyUOpPrint(_PyUOpInstruction *uop);
#endif


/* Disable unused label warnings. They are handy for debugging, even
if computed gotos aren't used. */
Expand Down Expand Up @@ -1015,14 +1018,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int

for (;;) {
uopcode = next_uop->opcode;
DPRINTF(3,
"%4d: uop %s, oparg %d, operand %" PRIu64 ", target %d, stack_level %d\n",
(int)(next_uop - current_executor->trace),
_PyUOpName(uopcode),
next_uop->oparg,
next_uop->operand,
next_uop->target,
#ifdef Py_DEBUG
if (lltrace >= 3) {
printf("%4d uop: ", (int)(next_uop - current_executor->trace));
_PyUOpPrint(next_uop);
printf(" stack_level=%d\n",
(int)(stack_pointer - _PyFrame_Stackbase(frame)));
}
#endif
next_uop++;
OPT_STAT_INC(uops_executed);
UOP_STAT_INC(uopcode, execution_count);
Expand All @@ -1037,9 +1040,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
default:
#ifdef Py_DEBUG
{
fprintf(stderr, "Unknown uop %d, oparg %d, operand %" PRIu64 " @ %d\n",
opcode, next_uop[-1].oparg, next_uop[-1].operand,
(int)(next_uop - current_executor->trace - 1));
printf("Unknown uop: ");
_PyUOpPrint(&next_uop[-1]);
printf(" @ %d\n", (int)(next_uop - current_executor->trace - 1));
Py_FatalError("Unknown uop");
}
#else
Expand Down Expand Up @@ -1067,10 +1070,15 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
pop_1_error_tier_two:
STACK_SHRINK(1);
error_tier_two:
DPRINTF(2, "Error: [UOp %d (%s), oparg %d, operand %" PRIu64 ", target %d @ %d -> %s]\n",
uopcode, _PyUOpName(uopcode), next_uop[-1].oparg, next_uop[-1].operand, next_uop[-1].target,
(int)(next_uop - current_executor->trace - 1),
_PyOpcode_OpName[frame->instr_ptr->op.code]);
#ifdef Py_DEBUG
if (lltrace >= 2) {
printf("Error: [UOp ");
_PyUOpPrint(&next_uop[-1]);
printf(" @ %d -> %s]\n",
(int)(next_uop - current_executor->trace - 1),
_PyOpcode_OpName[frame->instr_ptr->op.code]);
}
#endif
OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
frame->return_offset = 0; // Don't leave this random
_PyFrame_SetStackPointer(frame, stack_pointer);
Expand All @@ -1080,10 +1088,15 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
// Jump here from DEOPT_IF()
deoptimize:
next_instr = next_uop[-1].target + _PyCode_CODE(_PyFrame_GetCode(frame));
DPRINTF(2, "DEOPT: [UOp %d (%s), oparg %d, operand %" PRIu64 ", target %d @ %d -> %s]\n",
uopcode, _PyUOpName(uopcode), next_uop[-1].oparg, next_uop[-1].operand, next_uop[-1].target,
(int)(next_uop - current_executor->trace - 1),
_PyOpcode_OpName[frame->instr_ptr->op.code]);
#ifdef Py_DEBUG
if (lltrace >= 2) {
printf("DEOPT: [UOp ");
_PyUOpPrint(&next_uop[-1]);
printf(" @ %d -> %s]\n",
(int)(next_uop - current_executor->trace - 1),
_PyOpcode_OpName[frame->instr_ptr->op.code]);
}
#endif
OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
UOP_STAT_INC(uopcode, miss);
Py_DECREF(current_executor);
Expand Down