OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/cf: return cursor after insertion of cf_list

Browse Source 
This will be useful to cut code from one location and paste it at
another place and later keep pasting after the previous insertions.

v2: update comment (Jason)
    deal with stiching 2 empty blocks (Jason)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16036>
This commit is contained in:
Lionel Landwerlin
2022-04-19 15:05:04 +03:00
committed by Marge Bot
parent 7fb9fdd86c
commit d65cf403f3
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler/nir/nir_control_flow.c
View File

@@ -547,9 +547,12 @@ update_if_uses(nir_cf_node *node)
/** /**
* Stitch two basic blocks together into one. The aggregate must have the same * Stitch two basic blocks together into one. The aggregate must have the same
* predecessors as the first and the same successors as the second. * predecessors as the first and the same successors as the second.
*
* Returns a cursor pointing at the end of the before block (i.e.m between the
* two blocks) once stiched together.
*/ */
static void static nir_cursor
stitch_blocks(nir_block *before, nir_block *after) stitch_blocks(nir_block *before, nir_block *after)
{ {
/* /*
@@ -567,7 +570,11 @@ stitch_blocks(nir_block *before, nir_block *after)
remove_phi_src(after->successors[1], after); remove_phi_src(after->successors[1], after);
unlink_block_successors(after); unlink_block_successors(after);
exec_node_remove(&after->cf_node.node); exec_node_remove(&after->cf_node.node);
return nir_after_block(before);
} else { } else {
nir_instr *last_before_instr = nir_block_last_instr(before);
move_successors(after, before); move_successors(after, before);
foreach_list_typed(nir_instr, instr, node, &after->instr_list) { foreach_list_typed(nir_instr, instr, node, &after->instr_list) {
@@ -576,6 +583,9 @@ stitch_blocks(nir_block *before, nir_block *after)
exec_list_append(&before->instr_list, &after->instr_list); exec_list_append(&before->instr_list, &after->instr_list);
exec_node_remove(&after->cf_node.node); exec_node_remove(&after->cf_node.node);
return last_before_instr ? nir_after_instr(last_before_instr) :
nir_before_block(before);
} }
} }
@@ -777,13 +787,17 @@ relink_jump_halt_cf_node(nir_cf_node *node, nir_block *end_block)
} }
} }
void /**
* Inserts a list at a given cursor. Returns the cursor at the end of the
* insertion (i.e., at the end of the instructions contained in cf_list).
*/
nir_cursor
nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor) nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor)
{ {
nir_block *before, *after; nir_block *before, *after;
if (exec_list_is_empty(&cf_list->list)) if (exec_list_is_empty(&cf_list->list))
return; return cursor;
nir_function_impl *cursor_impl = nir_function_impl *cursor_impl =
nir_cf_node_get_function(&nir_cursor_current_block(cursor)->cf_node); nir_cf_node_get_function(&nir_cursor_current_block(cursor)->cf_node);
@@ -802,7 +816,7 @@ nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor)
stitch_blocks(before, stitch_blocks(before,
nir_cf_node_as_block(nir_cf_node_next(&before->cf_node))); nir_cf_node_as_block(nir_cf_node_next(&before->cf_node)));
stitch_blocks(nir_cf_node_as_block(nir_cf_node_prev(&after->cf_node)), return stitch_blocks(nir_cf_node_as_block(nir_cf_node_prev(&after->cf_node)),
after); after);
} }

2
src/compiler/nir/nir_control_flow.h
View File

@@ -138,7 +138,7 @@ typedef struct {
void nir_cf_extract(nir_cf_list *extracted, nir_cursor begin, nir_cursor end); void nir_cf_extract(nir_cf_list *extracted, nir_cursor begin, nir_cursor end);
void nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor); nir_cursor nir_cf_reinsert(nir_cf_list *cf_list, nir_cursor cursor);
void nir_cf_delete(nir_cf_list *cf_list); void nir_cf_delete(nir_cf_list *cf_list);