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

nir/opt_peephole_select: fixup for new foreach_block()

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott
2016-04-12 15:03:41 -04:00
committed by Jason Ekstrand
parent e5f37701ab
commit 480a182ccd
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/compiler/nir/nir_opt_peephole_select.c
View File

@@ -47,11 +47,6 @@
* swizzle. * swizzle.
*/ */
struct peephole_select_state {
void *mem_ctx;
bool progress;
};
static bool static bool
block_check_for_allowed_instrs(nir_block *block) block_check_for_allowed_instrs(nir_block *block)
{ {
@@ -130,23 +125,21 @@ block_check_for_allowed_instrs(nir_block *block)
} }
static bool static bool
nir_opt_peephole_select_block(nir_block *block, void *void_state) nir_opt_peephole_select_block(nir_block *block, void *mem_ctx)
{ {
struct peephole_select_state *state = void_state;
/* If the block is empty, then it certainly doesn't have any phi nodes, /* If the block is empty, then it certainly doesn't have any phi nodes,
* so we can skip it. This also ensures that we do an early skip on the * so we can skip it. This also ensures that we do an early skip on the
* end block of the function which isn't actually attached to the CFG. * end block of the function which isn't actually attached to the CFG.
*/ */
if (exec_list_is_empty(&block->instr_list)) if (exec_list_is_empty(&block->instr_list))
return true; return false;
if (nir_cf_node_is_first(&block->cf_node)) if (nir_cf_node_is_first(&block->cf_node))
return true; return false;
nir_cf_node *prev_node = nir_cf_node_prev(&block->cf_node); nir_cf_node *prev_node = nir_cf_node_prev(&block->cf_node);
if (prev_node->type != nir_cf_node_if) if (prev_node->type != nir_cf_node_if)
return true; return false;
nir_if *if_stmt = nir_cf_node_as_if(prev_node); nir_if *if_stmt = nir_cf_node_as_if(prev_node);
nir_cf_node *then_node = nir_if_first_then_node(if_stmt); nir_cf_node *then_node = nir_if_first_then_node(if_stmt);
@@ -155,7 +148,7 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
/* We can only have one block in each side ... */ /* We can only have one block in each side ... */
if (nir_if_last_then_node(if_stmt) != then_node || if (nir_if_last_then_node(if_stmt) != then_node ||
nir_if_last_else_node(if_stmt) != else_node) nir_if_last_else_node(if_stmt) != else_node)
return true; return false;
nir_block *then_block = nir_cf_node_as_block(then_node); nir_block *then_block = nir_cf_node_as_block(then_node);
nir_block *else_block = nir_cf_node_as_block(else_node); nir_block *else_block = nir_cf_node_as_block(else_node);
@@ -163,7 +156,7 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
/* ... and those blocks must only contain "allowed" instructions. */ /* ... and those blocks must only contain "allowed" instructions. */
if (!block_check_for_allowed_instrs(then_block) || if (!block_check_for_allowed_instrs(then_block) ||
!block_check_for_allowed_instrs(else_block)) !block_check_for_allowed_instrs(else_block))
return true; return false;
/* At this point, we know that the previous CFG node is an if-then /* At this point, we know that the previous CFG node is an if-then
* statement containing only moves to phi nodes in this block. We can * statement containing only moves to phi nodes in this block. We can
@@ -195,7 +188,7 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
break; break;
nir_phi_instr *phi = nir_instr_as_phi(instr); nir_phi_instr *phi = nir_instr_as_phi(instr);
nir_alu_instr *sel = nir_alu_instr_create(state->mem_ctx, nir_op_bcsel); nir_alu_instr *sel = nir_alu_instr_create(mem_ctx, nir_op_bcsel);
nir_src_copy(&sel->src[0].src, &if_stmt->condition, sel); nir_src_copy(&sel->src[0].src, &if_stmt->condition, sel);
/* Splat the condition to all channels */ /* Splat the condition to all channels */
memset(sel->src[0].swizzle, 0, sizeof sel->src[0].swizzle); memset(sel->src[0].swizzle, 0, sizeof sel->src[0].swizzle);
@@ -222,25 +215,23 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
} }
nir_cf_node_remove(&if_stmt->cf_node); nir_cf_node_remove(&if_stmt->cf_node);
state->progress = true;
return true; return true;
} }
static bool static bool
nir_opt_peephole_select_impl(nir_function_impl *impl) nir_opt_peephole_select_impl(nir_function_impl *impl)
{ {
struct peephole_select_state state; void *mem_ctx = ralloc_parent(impl);
bool progress = false;
state.mem_ctx = ralloc_parent(impl); nir_foreach_block_safe(block, impl) {
state.progress = false; progress |= nir_opt_peephole_select_block(block, mem_ctx);
}
nir_foreach_block_call(impl, nir_opt_peephole_select_block, &state); if (progress)
if (state.progress)
nir_metadata_preserve(impl, nir_metadata_none); nir_metadata_preserve(impl, nir_metadata_none);
return state.progress; return progress;
} }
bool bool