Skip to content

gh-102859: Remove JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP #102870

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
iritkatriel merged 9 commits into from
Mar 22, 2023
Merged

gh-102859: Remove JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP #102870

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e63ce0
gh-102859: remove opcodes JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP
iritkatriel Mar 21, 2023
96602a0
add news
iritkatriel Mar 21, 2023
22ed3a6
fix peepholer
iritkatriel Mar 21, 2023
08c0826
Merge remote-tracking branch 'upstream/main' into remove-JUMP_IF_FALS…
iritkatriel Mar 21, 2023
0097e54
fix optimizations
iritkatriel Mar 21, 2023
12595f6
init 'target'
iritkatriel Mar 21, 2023
b2bf829
Merge branch 'main' into remove-JUMP_IF_FALSE_OR_POP
iritkatriel Mar 22, 2023
ddb3003
make remove_redundant_nops_and_pairs safe
iritkatriel Mar 22, 2023
ab2dfe1
Merge remote-tracking branch 'upstream/main' into remove-JUMP_IF_FALS…
iritkatriel Mar 22, 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
fix optimizations
  • Loading branch information
@iritkatriel
iritkatriel committed Mar 21, 2023
commit 0097e54f60ad17b971e54d94c848b2270c48124e
46 changes: 44 additions & 2 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9103,7 +9103,6 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
if (! is_copy_of_load_const) {
opcode = inst->i_opcode;
oparg = inst->i_oparg;
nextop = i+1 < bb->b_iused ? bb->b_instr[i+1].i_opcode : 0;
if (HAS_TARGET(opcode)) {
assert(inst->i_target->b_iused > 0);
target = &inst->i_target->b_instr[0];
Expand All @@ -9113,6 +9112,7 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
target = &nop;
}
Comment thread
carljm marked this conversation as resolved.
}
nextop = i+1 < bb->b_iused ? bb->b_instr[i+1].i_opcode : 0;
assert(!IS_ASSEMBLER_OPCODE(opcode));
switch (opcode) {
/* Remove LOAD_CONST const; conditional jump */
Expand Down Expand Up @@ -9276,6 +9276,48 @@ inline_small_exit_blocks(basicblock *bb) {
return 0;
}


static int
remove_redundant_nops_and_pairs(basicblock *entryblock)
{
bool done = false;

while (! done) {
done = true;
struct cfg_instr *prev_instr = NULL;
struct cfg_instr *instr = NULL;
for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
remove_redundant_nops(b);
for (int i = 0; i < b->b_iused; i++) {
prev_instr = instr;
instr = &b->b_instr[i];
int prev_opcode = prev_instr ? prev_instr->i_opcode : 0;
int prev_oparg = prev_instr ? prev_instr->i_oparg : 0;
int opcode = instr->i_opcode;
bool is_redundant_pair = false;
if (opcode == POP_TOP) {
if (prev_opcode == LOAD_CONST) {
is_redundant_pair = true;
}
else if (prev_opcode == COPY && prev_oparg == 1) {
is_redundant_pair = true;
}
}
if (is_redundant_pair) {
INSTR_SET_OP0(prev_instr, NOP);
INSTR_SET_OP0(instr, NOP);
done = false;
}
}
if (! BB_HAS_FALLTHROUGH(b)) {
instr = NULL;
}
}
}
return SUCCESS;
}


static int
remove_redundant_nops(basicblock *bb) {
/* Remove NOPs when legal to do so. */
Expand Down Expand Up @@ -9514,9 +9556,9 @@ optimize_cfg(cfg_builder *g, PyObject *consts, PyObject *const_cache)
assert(no_empty_basic_blocks(g));
for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
RETURN_IF_ERROR(optimize_basic_block(const_cache, b, consts));
remove_redundant_nops(b);
assert(b->b_predecessors == 0);
}
RETURN_IF_ERROR(remove_redundant_nops_and_pairs(g->g_entryblock));
for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
RETURN_IF_ERROR(inline_small_exit_blocks(b));
}
Expand Down