Skip to content

GH-93678: refactor compiler so that optimizer does not need the assembler and compiler structs #93842

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 16 commits into from
Jun 21, 2022
Merged

GH-93678: refactor compiler so that optimizer does not need the assembler and compiler structs #93842

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6d38e85
optimize_cfg does not require a struct compiler*
iritkatriel Jun 14, 2022
db0be36
optimize_cfg does not require a struct assembler*
iritkatriel Jun 14, 2022
82be9a5
do not pass the whole assembler to functions that need only a_entry
iritkatriel Jun 14, 2022
a2da370
Create struct assember just before assemble_emit. The other optimizer…
iritkatriel Jun 14, 2022
c26a2bb
assemble_jump_offsets doesn't need the compiler
iritkatriel Jun 14, 2022
36d2410
duplicate_exits_without_lineno can use b_next links to iterate
iritkatriel Jun 14, 2022
7f06d70
stackdepth doesn't need the compiler
iritkatriel Jun 14, 2022
5cd8fc9
push_cold_blocks_to_end and duplicate_exits_without_lineno do not nee…
iritkatriel Jun 15, 2022
b1e9f7c
remove 3 unused fields from struct assembler
iritkatriel Jun 15, 2022
b5f58d1
remove obsolete comment
iritkatriel Jun 15, 2022
c4a125e
code review followup
iritkatriel Jun 15, 2022
39f03c0
entry --> entryblock for consistency
iritkatriel Jun 15, 2022
c233570
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 15, 2022
482742a
Merge remote-tracking branch 'upstream/main' into reduce_dependencty_…
iritkatriel Jun 17, 2022
28ba5d9
Merge remote-tracking branch 'upstream/main' into reduce_dependencty_…
iritkatriel Jun 20, 2022
51b78f7
Merge branch 'main' into reduce_dependencty_on_compiler
iritkatriel Jun 20, 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
push_cold_blocks_to_end and duplicate_exits_without_lineno do not nee… 
…d the compiler - insert new blocks as b_list successor of the curent block rather than at the head of the list
  • Loading branch information
@iritkatriel
iritkatriel committed Jun 15, 2022
commit 5cd8fc94fa9f23de558c5d68c797b5b7fce3a0a2
48 changes: 33 additions & 15 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,20 +854,26 @@ compiler_set_qualname(struct compiler *c)
/* Allocate a new block and return a pointer to it.
Returns NULL on error.
*/
static basicblock *
new_basicblock()
{
basicblock *b = (basicblock *)PyObject_Calloc(1, sizeof(basicblock));
if (b == NULL) {
PyErr_NoMemory();
Comment thread
markshannon marked this conversation as resolved.
return NULL;
}
return b;
}

static basicblock *
compiler_new_block(struct compiler *c)
{
basicblock *b;
struct compiler_unit *u;

u = c->u;
b = (basicblock *)PyObject_Calloc(1, sizeof(basicblock));
basicblock *b = new_basicblock();
if (b == NULL) {
PyErr_NoMemory();
return NULL;
}
/* Extend the singly linked list of blocks with new block. */
struct compiler_unit *u = c->u;
b->b_list = u->u_blocks;
u->u_blocks = b;
return b;
Expand All @@ -883,13 +889,25 @@ compiler_use_next_block(struct compiler *c, basicblock *block)
}

static basicblock *
compiler_copy_block(struct compiler *c, basicblock *block)
new_basicblock_after(basicblock *prev)
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
{
basicblock *result = new_basicblock();
if (result == NULL) {
return NULL;
}
result->b_list = prev->b_list;
prev->b_list = result;
return result;
}

static basicblock *
copy_basicblock(basicblock *block)
{
/* Cannot copy a block if it has a fallthrough, since
* a block can only have one fallthrough predecessor.
*/
assert(BB_NO_FALLTHROUGH(block));
basicblock *result = compiler_new_block(c);
basicblock *result = new_basicblock_after(block);
if (result == NULL) {
return NULL;
}
Expand Down Expand Up @@ -7385,7 +7403,7 @@ mark_cold(basicblock *entry) {
}

static int
push_cold_blocks_to_end(struct compiler *c, basicblock *entry, int code_flags) {
push_cold_blocks_to_end(basicblock *entry, int code_flags) {
if (entry->b_next == NULL) {
/* single basicblock, no need to reorder */
return 0;
Expand All @@ -7398,7 +7416,7 @@ push_cold_blocks_to_end(struct compiler *c, basicblock *entry, int code_flags) {
/* an explicit jump instead of fallthrough */
for (basicblock *b = entry; b != NULL; b = b->b_next) {
if (b->b_cold && BB_HAS_FALLTHROUGH(b) && b->b_next && b->b_next->b_warm) {
basicblock *explicit_jump = compiler_new_block(c);
basicblock *explicit_jump = new_basicblock_after(b);
if (explicit_jump == NULL) {
return -1;
}
Expand Down Expand Up @@ -8251,7 +8269,7 @@ trim_unused_consts(basicblock *entryblock, PyObject *consts);

/* Duplicates exit BBs, so that line numbers can be propagated to them */
static int
duplicate_exits_without_lineno(basicblock *entryblock, struct compiler *c);
duplicate_exits_without_lineno(basicblock *entryblock);

static int
extend_block(basicblock *bb);
Expand Down Expand Up @@ -8576,7 +8594,7 @@ assemble(struct compiler *c, int addNone)
if (optimize_cfg(entryblock, consts, c->c_const_cache)) {
goto error;
}
if (duplicate_exits_without_lineno(entryblock, c)) {
if (duplicate_exits_without_lineno(entryblock)) {
return NULL;
}
if (trim_unused_consts(entryblock, consts)) {
Expand All @@ -8601,7 +8619,7 @@ assemble(struct compiler *c, int addNone)
}
convert_exception_handlers_to_nops(entryblock);

if (push_cold_blocks_to_end(c, entryblock, code_flags) < 0) {
if (push_cold_blocks_to_end(entryblock, code_flags) < 0) {
goto error;
}

Expand Down Expand Up @@ -9496,15 +9514,15 @@ is_exit_without_lineno(basicblock *b) {
* copy the line number from the sole predecessor block.
*/
static int
duplicate_exits_without_lineno(basicblock *entryblock, struct compiler *c)
duplicate_exits_without_lineno(basicblock *entryblock)
{
/* Copy all exit blocks without line number that are targets of a jump.
*/
for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
if (b->b_iused > 0 && is_jump(&b->b_instr[b->b_iused-1])) {
basicblock *target = b->b_instr[b->b_iused-1].i_target;
if (is_exit_without_lineno(target) && target->b_predecessors > 1) {
basicblock *new_target = compiler_copy_block(c, target);
basicblock *new_target = copy_basicblock(target);
if (new_target == NULL) {
return -1;
}
Expand Down