Skip to content

GH-111848: Set the IP when de-optimizing #112065

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
markshannon merged 14 commits into from
Nov 15, 2023
Merged

GH-111848: Set the IP when de-optimizing #112065

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
317db3a
Replace jumps with deopts in tier 2
markshannon Nov 5, 2023
2db61cc
Fewer special cases of uop names
markshannon Nov 11, 2023
f361328
Fix refleak
markshannon Nov 11, 2023
2de3451
Merge branch 'main' into jumps-to-deopts
markshannon Nov 11, 2023
69cee8d
Update test
markshannon Nov 11, 2023
bb9a1a2
Add target field to uop IR
markshannon Nov 12, 2023
9cda14b
Remove redundant SET_IP and _CHECK_VALIDITY micro-ops
markshannon Nov 12, 2023
6c61feb
Extend whitelist of non-escaping API functions.
markshannon Nov 12, 2023
0a093fd
Add more functions to whitelist
markshannon Nov 12, 2023
18a6511
Merge branch 'main' into deopts-with-ip
markshannon Nov 12, 2023
222ee17
Tidy up
markshannon Nov 12, 2023
4d1e295
Add another non-escaping function
markshannon Nov 12, 2023
b5737c8
Fix type annotation
markshannon Nov 15, 2023
8e2f0f6
Address review comments
markshannon Nov 15, 2023
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
Fewer special cases of uop names
  • Loading branch information
@markshannon
markshannon committed Nov 11, 2023
commit 2db61ccc925c329710cef63cdd09197482fee210
29 changes: 18 additions & 11 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ PyTypeObject _PyUOpExecutor_Type = {
.tp_methods = executor_methods,
};

/* TO DO -- Generate this table */
/* TO DO -- Generate these tables */
static const uint16_t
_PyUop_Replacements[OPCODE_METADATA_SIZE] = {
[_ITER_JUMP_RANGE] = _GUARD_NOT_EXHAUSTED_RANGE,
Expand Down Expand Up @@ -764,6 +764,16 @@ translate_bytecode_to_trace(
#define SET_BIT(array, bit) (array[(bit)>>5] |= (1<<((bit)&31)))
#define BIT_IS_SET(array, bit) (array[(bit)>>5] & (1<<((bit)&31)))

static bool
is_branch(opcode) {
/* Currently there are no jumps in the buffer,
* but we expect the optimizer to add them
* in the future. */
assert(opcode != _POP_JUMP_IF_FALSE &&
opcode != _POP_JUMP_IF_TRUE);
return false;
}

/* Count the number of used uops, and mark them in the bit vector `used`.
* This can be done in a single pass using simple reachability analysis,
* as there are no backward jumps.
Expand All @@ -785,16 +795,13 @@ compute_used(_PyUOpInstruction *buffer, uint32_t *used)
}
/* All other micro-ops fall through, so i+1 is reachable */
SET_BIT(used, i+1);
switch(opcode) {
case NOP:
/* Don't count NOPs as used */
count--;
UNSET_BIT(used, i);
break;
case _POP_JUMP_IF_FALSE:
case _POP_JUMP_IF_TRUE:
/* Mark target as reachable */
SET_BIT(used, buffer[i].oparg);
if (is_branch(opcode)) {
/* Mark target as reachable */
SET_BIT(used, buffer[i].oparg);
}
if (opcode == NOP) {
count--;
UNSET_BIT(used, i);
}
}
return count;
Expand Down