Skip to content

gh-126835: make CFG optimizer skip over NOP's when looking for const sequence construction #129703

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
Eclips4 merged 12 commits into from
Feb 9, 2025
Merged

gh-126835: make CFG optimizer skip over NOP's when looking for const sequence construction #129703

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
20e61ee
Make `is_constant_sequence` NOP aware
WolframAlph Feb 5, 2025
8b6d294
implement `get_constant_sequence`
WolframAlph Feb 6, 2025
0845cd7
disable debugging code
WolframAlph Feb 6, 2025
d3768ac
address review
WolframAlph Feb 6, 2025
96ff172
address review
WolframAlph Feb 8, 2025
ed7431d
add tests
WolframAlph Feb 8, 2025
f539224
disable debug code
WolframAlph Feb 8, 2025
5866faa
update tests
WolframAlph Feb 8, 2025
578d66b
update tests
WolframAlph Feb 8, 2025
cd92614
update tests
WolframAlph Feb 9, 2025
1574122
Update Lib/test/test_peepholer.py
iritkatriel Feb 9, 2025
16c66f9
Update Lib/test/test_peepholer.py
WolframAlph Feb 9, 2025
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
address review
  • Loading branch information
@WolframAlph
WolframAlph committed Feb 8, 2025
commit 96ff172a6221743710ae73590be152ed39b24e36
18 changes: 10 additions & 8 deletions Python/flowgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ basicblock_insert_instruction(basicblock *block, int pos, cfg_instr *instr) {
}

/* For debugging purposes only */
#if 0
#if 1
static void
dump_instr(cfg_instr *i)
{
Expand Down Expand Up @@ -1396,7 +1396,6 @@ nop_out(basicblock *bb, int start, int count)
INSTR_SET_OP0(&bb->b_instr[start], NOP);
count--;
}
assert(start >= -1);
}

/* Replace LOAD_CONST c1, LOAD_CONST c2 ... LOAD_CONST cn, BUILD_TUPLE n
Expand All @@ -1417,13 +1416,14 @@ fold_tuple_of_constants(basicblock *bb, int n, PyObject *consts, PyObject *const
PyObject *newconst;
RETURN_IF_ERROR(get_constant_sequence(bb, n-1, seq_size, consts, &newconst));
if (newconst == NULL) {
/* not a const sequence */
return SUCCESS;
Comment thread
WolframAlph marked this conversation as resolved.
}
assert(PyTuple_GET_SIZE(newconst) == seq_size);
assert(PyTuple_CheckExact(newconst) && PyTuple_GET_SIZE(newconst) == seq_size);
int index = add_const(newconst, consts, const_cache);
RETURN_IF_ERROR(index);
INSTR_SET_OP1(&bb->b_instr[n], LOAD_CONST, index);
nop_out(bb, n-1, seq_size);
INSTR_SET_OP1(&bb->b_instr[n], LOAD_CONST, index);
return SUCCESS;
}

Expand All @@ -1446,9 +1446,10 @@ optimize_if_const_list_or_set(basicblock *bb, int n, PyObject *consts, PyObject
PyObject *newconst;
RETURN_IF_ERROR(get_constant_sequence(bb, n-1, seq_size, consts, &newconst));
if (newconst == NULL) {
/* not a const sequence */
return SUCCESS;
}
assert(PyTuple_GET_SIZE(newconst) == seq_size);
assert(PyTuple_CheckExact(newconst) && PyTuple_GET_SIZE(newconst) == seq_size);
int build = instr->i_opcode;
int extend = build == BUILD_LIST ? LIST_EXTEND : SET_UPDATE;
if (build == BUILD_SET) {
Expand All @@ -1461,10 +1462,11 @@ optimize_if_const_list_or_set(basicblock *bb, int n, PyObject *consts, PyObject
}
int index = add_const(newconst, consts, const_cache);
RETURN_IF_ERROR(index);
INSTR_SET_OP1(&bb->b_instr[n], extend, 1);
INSTR_SET_OP1(&bb->b_instr[n-1], LOAD_CONST, index);
nop_out(bb, n-1, seq_size);
assert(n >= 2);
INSTR_SET_OP1(&bb->b_instr[n-2], build, 0);
nop_out(bb, n-3, seq_size-2);
INSTR_SET_OP1(&bb->b_instr[n-1], LOAD_CONST, index);
INSTR_SET_OP1(&bb->b_instr[n], extend, 1);
return SUCCESS;
}

Expand Down