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

nir: make use of new nir_cf_list_clone_and_reinsert() helper

Browse Source 
Reviewed-by: Thomas Helland <thomashelland90@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Timothy Arceri
2018-11-16 14:58:03 +11:00
parent 6b961eb534
commit 032f247921
1 changed files with 27 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/compiler/nir/nir_opt_loop_unroll.c
View File

@@ -169,32 +169,21 @@ simple_unroll(nir_loop *loop)
_mesa_hash_table_create(NULL, _mesa_hash_pointer, _mesa_hash_table_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal); _mesa_key_pointer_equal);
/* Clone the loop header */ /* Clone the loop header and insert before the loop */
nir_cf_list cloned_header; nir_cf_list_clone_and_reinsert(&lp_header, loop->cf_node.parent,
nir_cf_list_clone(&cloned_header, &lp_header, loop->cf_node.parent, nir_before_cf_node(&loop->cf_node),
remap_table); remap_table);
/* Insert cloned loop header before the loop */
nir_cf_reinsert(&cloned_header, nir_before_cf_node(&loop->cf_node));
/* Temp list to store the cloned loop body as we unroll */
nir_cf_list unrolled_lp_body;
/* Clone loop header and append to the loop body */
for (unsigned i = 0; i < loop->info->max_trip_count; i++) { for (unsigned i = 0; i < loop->info->max_trip_count; i++) {
/* Clone loop body */ /* Clone loop body and insert before the loop */
nir_cf_list_clone(&unrolled_lp_body, &loop_body, loop->cf_node.parent, nir_cf_list_clone_and_reinsert(&loop_body, loop->cf_node.parent,
remap_table); nir_before_cf_node(&loop->cf_node),
remap_table);
/* Insert unrolled loop body before the loop */ /* Clone loop header and insert after loop body */
nir_cf_reinsert(&unrolled_lp_body, nir_before_cf_node(&loop->cf_node)); nir_cf_list_clone_and_reinsert(&lp_header, loop->cf_node.parent,
nir_before_cf_node(&loop->cf_node),
/* Clone loop header */ remap_table);
nir_cf_list_clone(&cloned_header, &lp_header, loop->cf_node.parent,
remap_table);
/* Insert loop header after loop body */
nir_cf_reinsert(&cloned_header, nir_before_cf_node(&loop->cf_node));
} }
/* Remove the break from the loop terminator and add instructions from /* Remove the break from the loop terminator and add instructions from
@@ -207,11 +196,9 @@ simple_unroll(nir_loop *loop)
nir_after_block(limiting_term->break_block)); nir_after_block(limiting_term->break_block));
/* Clone so things get properly remapped */ /* Clone so things get properly remapped */
nir_cf_list cloned_break_list; nir_cf_list_clone_and_reinsert(&break_list, loop->cf_node.parent,
nir_cf_list_clone(&cloned_break_list, &break_list, loop->cf_node.parent, nir_before_cf_node(&loop->cf_node),
remap_table); remap_table);
nir_cf_reinsert(&cloned_break_list, nir_before_cf_node(&loop->cf_node));
/* Remove the loop */ /* Remove the loop */
nir_cf_node_remove(&loop->cf_node); nir_cf_node_remove(&loop->cf_node);
@@ -394,19 +381,16 @@ complex_unroll(nir_loop *loop, nir_loop_terminator *unlimit_term,
/* Temp lists to store the cloned loop as we unroll */ /* Temp lists to store the cloned loop as we unroll */
nir_cf_list unrolled_lp_body; nir_cf_list unrolled_lp_body;
nir_cf_list cloned_header;
for (unsigned i = 0; i < num_times_to_clone; i++) { for (unsigned i = 0; i < num_times_to_clone; i++) {
/* Clone loop header */
nir_cf_list_clone(&cloned_header, &lp_header, loop->cf_node.parent,
remap_table);
nir_cursor cursor = nir_cursor cursor =
get_complex_unroll_insert_location(unroll_loc, get_complex_unroll_insert_location(unroll_loc,
unlimit_term->continue_from_then); unlimit_term->continue_from_then);
/* Insert cloned loop header */ /* Clone loop header and insert in if branch */
nir_cf_reinsert(&cloned_header, cursor); nir_cf_list_clone_and_reinsert(&lp_header, loop->cf_node.parent,
cursor, remap_table);
cursor = cursor =
get_complex_unroll_insert_location(unroll_loc, get_complex_unroll_insert_location(unroll_loc,
@@ -432,28 +416,24 @@ complex_unroll(nir_loop *loop, nir_loop_terminator *unlimit_term,
if (!limiting_term_second) { if (!limiting_term_second) {
assert(unroll_loc->type == nir_cf_node_if); assert(unroll_loc->type == nir_cf_node_if);
nir_cf_list_clone(&cloned_header, &lp_header, loop->cf_node.parent,
remap_table);
nir_cursor cursor = nir_cursor cursor =
get_complex_unroll_insert_location(unroll_loc, get_complex_unroll_insert_location(unroll_loc,
unlimit_term->continue_from_then); unlimit_term->continue_from_then);
/* Insert cloned loop header */ /* Clone loop header and insert in if branch */
nir_cf_reinsert(&cloned_header, cursor); nir_cf_list_clone_and_reinsert(&lp_header, loop->cf_node.parent,
cursor, remap_table);
/* Clone so things get properly remapped, and insert break block from
* the limiting terminator.
*/
nir_cf_list cloned_break_blk;
nir_cf_list_clone(&cloned_break_blk, &limit_break_list,
loop->cf_node.parent, remap_table);
cursor = cursor =
get_complex_unroll_insert_location(unroll_loc, get_complex_unroll_insert_location(unroll_loc,
unlimit_term->continue_from_then); unlimit_term->continue_from_then);
nir_cf_reinsert(&cloned_break_blk, cursor); /* Clone so things get properly remapped, and insert break block from
* the limiting terminator.
*/
nir_cf_list_clone_and_reinsert(&limit_break_list, loop->cf_node.parent,
cursor, remap_table);
nir_cf_delete(&limit_break_list); nir_cf_delete(&limit_break_list);
} }