Skip to content

gh-87092: bring compiler code closer to a preprocessing-opt-assembler organisation #97644

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 12 commits into from
Oct 5, 2022
+62 −40
Merged

gh-87092: bring compiler code closer to a preprocessing-opt-assembler organisation #97644

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
27102b2
add unit test for const trimming
iritkatriel Sep 20, 2022
9827030
move trim_unused_consts to assembly stage
iritkatriel Sep 20, 2022
103c9ae
move a few things around
iritkatriel Sep 20, 2022
bab900a
remove redundant assert and move another up to just after the value w…
iritkatriel Sep 20, 2022
9736e75
move push_cold_blocks_to_end up
iritkatriel Sep 21, 2022
eb6cd76
reduce repetition: create basicblock_append_instructions and call it …
iritkatriel Sep 29, 2022
fa0b95d
move remove_redundant_nops call into convert_exception_handlers_to_no…
iritkatriel Sep 29, 2022
8a2f28e
move check_loads function to optimization stage
iritkatriel Sep 29, 2022
85751ea
mark's review comments
iritkatriel Oct 3, 2022
5f78cc7
fix comment
iritkatriel Oct 3, 2022
e44b087
Call it preprocessing
iritkatriel Oct 4, 2022
4f15173
Merge branch 'main' into compiler_refactor
iritkatriel Oct 4, 2022
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
move remove_redundant_nops call into convert_exception_handlers_to_no… 
…ps. rename calculate_jump_targets --> translate_jump_labels_to_targets
  • Loading branch information
@iritkatriel
iritkatriel committed Sep 29, 2022
commit fa0b95d728a1eef9c6e9cd7dc03df82c60a7dc7d
27 changes: 16 additions & 11 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7495,6 +7495,9 @@ convert_exception_handlers_to_nops(basicblock *entryblock) {
}
}
}
for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
remove_redundant_nops(b);
}
}

static inline void
Expand Down Expand Up @@ -8299,7 +8302,7 @@ dump_basicblock(const basicblock *b)


static int
calculate_jump_targets(basicblock *entryblock);
translate_jump_labels_to_targets(basicblock *entryblock);

static int
optimize_cfg(cfg_builder *g, PyObject *consts, PyObject *const_cache);
Expand Down Expand Up @@ -8637,7 +8640,7 @@ assemble(struct compiler *c, int addNone)
nlocalsplus -= numdropped;

/** Desugaring **/
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
if (calculate_jump_targets(g->g_entryblock)) {
if (translate_jump_labels_to_targets(g->g_entryblock)) {
goto error;
}
if (mark_except_handlers(g->g_entryblock) < 0) {
Expand All @@ -8655,14 +8658,18 @@ assemble(struct compiler *c, int addNone)
if (optimize_cfg(g, consts, c->c_const_cache)) {
goto error;
}

/** line numbers (TODO: move this to desugaring stage) */
if (duplicate_exits_without_lineno(g) < 0) {
goto error;
}
propagate_line_numbers(g->g_entryblock);
guarantee_lineno_for_exits(g->g_entryblock, c->u->u_firstlineno);

/** Assembly **/
if (push_cold_blocks_to_end(g, code_flags) < 0) {
Comment thread
iritkatriel marked this conversation as resolved.
goto error;
}
propagate_line_numbers(g->g_entryblock);
guarantee_lineno_for_exits(g->g_entryblock, c->u->u_firstlineno);

int maxdepth = stackdepth(g->g_entryblock, code_flags);
if (maxdepth < 0) {
Expand All @@ -8672,16 +8679,12 @@ assemble(struct compiler *c, int addNone)

convert_exception_handlers_to_nops(g->g_entryblock);

for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
remove_redundant_nops(b);
}

/** Assembly **/
/* Order of basic blocks must have been determined by now */
if (normalize_jumps(g) < 0) {
goto error;
}

/* TODO: move this into optimize_cfg */
if (add_checks_for_loads_of_unknown_variables(g->g_entryblock, c) < 0) {
goto error;
}
Expand All @@ -8695,6 +8698,8 @@ assemble(struct compiler *c, int addNone)
goto error;
}



/* Create assembler */
if (!assemble_init(&a, c->u->u_firstlineno))
goto error;
Expand Down Expand Up @@ -9464,7 +9469,7 @@ propagate_line_numbers(basicblock *entryblock) {

/* Calculate the actual jump target from the target_label */
static int
calculate_jump_targets(basicblock *entryblock)
translate_jump_labels_to_targets(basicblock *entryblock)
{
int max_label = -1;
for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
Expand Down Expand Up @@ -9783,7 +9788,7 @@ _PyCompile_OptimizeCfg(PyObject *instructions, PyObject *consts)
if (const_cache == NULL) {
goto error;
}
if (calculate_jump_targets(g.g_entryblock)) {
if (translate_jump_labels_to_targets(g.g_entryblock)) {
goto error;
}
if (optimize_cfg(&g, consts, const_cache) < 0) {
Expand Down