8000 gh-116968: Reimplement Tier 2 counters by gvanrossum · Pull Request #117144 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content
8000

gh-116968: Reimplement Tier 2 counters #117144

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.

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
merged 46 commits into from
Apr 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e7e819b
Baby steps: reimplement thresholds using adaptive counter abstractions
gvanrossum Mar 22, 2024
8c74dfa
Make temperature an adaptive counter like the rest
gvanrossum Mar 22, 2024
79036ff
Fix tests
gvanrossum Mar 22, 2024
54c1f8e
Remove dead adaptive_counter_jump_init()
gvanrossum Mar 22, 2024
015bb00
Fix no-GIL build failure in _COLD_EXIT
gvanrossum Mar 22, 2024
1730295
Use the right named constant in initial temperature
gvanrossum Mar 23, 2024
95f93b7
Add pycore_backoff.h, and include it, but don't use it yet
gvanrossum Mar 26, 2024
7df0f10
Reimplement adaptive counters in terms of backoff_counter
gvanrossum Mar 26, 2024
925cae7
Redefine T2 temperature as a backoff counter
gvanrossum Mar 27, 2024
f0c7fb0
Don't increment branch cache (bitmask) in INSTRUMENTED_INSTRUCTION
gvanrossum Mar 27, 2024
8f79a60
Don't increment branch cache (bitmask) in INSTRUMENTED_LINE
gvanrossum Mar 27, 2024
149e9c4
Don't update unreachable counters
gvanrossum Mar 27, 2024
1d76112
Simplify dynamic counter initialization for JUMP_BACKWARD
gvanrossum Mar 27, 2024
a5ffe02
Revert "Don't increment branch cache (bitmask) in INSTRUMENTED_LINE"
gvanrossum Mar 27, 2024
ce7726c
Different approach to avoid incrementing bitmask in INSTRUMENTED_LINE
gvanrossum Mar 27, 2024
e2c39f2
Different approach to avoid incrementing bitmask in INSTRUMENTED_INST…
gvanrossum Mar 27, 2024
8d22790
Fix dynamic counter initialization for JUMP_BACKWARD
gvanrossum Mar 27, 2024
cd8264e
Get rid of (unused) resume_threshold
gvanrossum Mar 27, 2024
d72c2ef
Hopeful fix for non-clang builds
gvanrossum Mar 27, 2024
f6bf194
In no-GIL mode, make INCREMENT_ADAPTIVE_COUNTER() a no-op
gvanrossum Mar 27, 2024
b991843
Revert "In no-GIL mode, make INCREMENT_ADAPTIVE_COUNTER() a no-op"
gvanrossum Mar 27, 2024
8000
9b9f26a
Fix comment and fix size of optimizer_backedge_threshold
gvanrossum Mar 27, 2024
354cd81
_COLD_EXIT is not conditional on ENABLE_SPECIALIZATION
gvanrossum Mar 27, 2024
c1de44f
Rewrite _COLD_EXIT using backoff_counter_t directly
gvanrossum Mar 27, 2024
1fe27c9
Rename increment,decrement to advance,pause
gvanrossum Mar 27, 2024
225ea17
Give up on restricting backoff to <= 12
gvanrossum Mar 27, 2024
63d8bc7
Rip out backoff thresholds
gvanrossum Mar 29, 2024
8aa2c75
Fix tests
gvanrossum Mar 29, 2024
7bd4daa
Fix initial temperature, clean up
gvanrossum Mar 29, 2024
3f1c58a
Merge branch 'main' into exp-backoff
gvanrossum Mar 29, 2024
8ce8068
Remove unused variable
gvanrossum Mar 29, 2024
7bb5618
Admit defeat: advance_backoff_counter() may be entered when value == 0
gvanrossum Mar 29, 2024
63e286c
Merge branch 'main' into exp-backoff
gvanrossum Apr 1, 2024
7f64392
Merge remote-tracking branch 'origin/main' into exp-backoff
gvanrossum Apr 2, 2024
8eee1b4
Put backoff field before value
gvanrossum Apr 2, 2024
42c1f26
Small cleanup in .h files
gvanrossum Apr 3, 2024
a80cd0a
Rename DECREMENT_ADAPTIVE_COUNTER to ADVANCE_...
gvanrossum Apr 3, 2024
545c60e
Rename ADAPTIVE_COUNTER_IS_ZERO to ..._TRIGGERS
gvanrossum Apr 3, 2024
6c0bb30
Rename backoff_counter_is_zero to ..._triggers
gvanrossum Apr 3, 2024
a7c9b6d
Rename reset_background_counter to restart_...
gvanrossum Apr 3, 2024
3fee35f
Make _Py_BackoffCounter a member of _Py_CODEUNIT
gvanrossum Apr 3, 2024
df6f34c
Refactor initial counter values.
gvanrossum Apr 3, 2024
72f6b0d
Export tier 2 threshold from _testinternalcapi
gvanrossum Apr 3, 2024
dcee362
Merge remote-tracking branch 'origin/main' into exp-backoff
gvanrossum Apr 3, 2024
f38d922
Add news
gvanrossum Apr 3, 2024
ef6366b
Fix blurb formatting (I hope)
gvanrossum Apr 4, 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
Different approach to avoid incrementing bitmask in INSTRUMENTED_LINE
  • Loading branch information
gvanrossum committed Mar 27, 2024
commit ce7726cb7431c6cf58c953943f55c1062ef0bcee
4 changes: 4 additions & 0 deletions Python/ceval.c
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DISPATCH();
}
if (_PyOpcode_Caches[original_opcode]) {
assert(original_opcode != POP_JUMP_IF_FALSE);
assert(original_opcode != POP_JUMP_IF_TRUE);
assert(original_opcode != POP_JUMP_IF_NONE);
assert(original_opcode != POP_JUMP_IF_NOT_NONE);
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr+1);
/* Prevent the underlying instruction from specializing
* and overwriting the instrumentation. */
Expand Down
0