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

nir/opt_if: use nir_src_as_bool in opt_peel_loop_initial_if helper

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4757>
This commit is contained in:
Rhys Perry
2020-04-27 11:53:50 +01:00
committed by Marge Bot
parent 50bead32b1
commit aca15d5cba
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,25 +58,23 @@ find_continue_block(nir_loop *loop)
static bool static bool
phi_has_constant_from_outside_and_one_from_inside_loop(nir_phi_instr *phi, phi_has_constant_from_outside_and_one_from_inside_loop(nir_phi_instr *phi,
const nir_block *entry_block, const nir_block *entry_block,
uint32_t *entry_val, bool *entry_val,
uint32_t *continue_val) bool *continue_val)
{ {
/* We already know we have exactly one continue */ /* We already know we have exactly one continue */
assert(exec_list_length(&phi->srcs) == 2); assert(exec_list_length(&phi->srcs) == 2);
*entry_val = 0; *entry_val = false;
*continue_val = 0; *continue_val = false;
nir_foreach_phi_src(src, phi) { nir_foreach_phi_src(src, phi) {
assert(src->src.is_ssa); if (!nir_src_is_const(src->src))
nir_const_value *const_src = nir_src_as_const_value(src->src); return false;
if (!const_src)
return false;
if (src->pred != entry_block) { if (src->pred != entry_block) {
*continue_val = const_src[0].u32; *continue_val = nir_src_as_bool(src->src);
} else { } else {
*entry_val = const_src[0].u32; *entry_val = nir_src_as_bool(src->src);
} }
} }
@@ -169,7 +167,7 @@ opt_peel_loop_initial_if(nir_loop *loop)
if (cond->parent_instr->block != header_block) if (cond->parent_instr->block != header_block)
return false; return false;
uint32_t entry_val = 0, continue_val = 0; bool entry_val = false, continue_val = false;
if (!phi_has_constant_from_outside_and_one_from_inside_loop(cond_phi, if (!phi_has_constant_from_outside_and_one_from_inside_loop(cond_phi,
prev_block, prev_block,
&entry_val, &entry_val,
@@ -665,7 +663,7 @@ opt_simplify_bcsel_of_phi(nir_builder *b, nir_loop *loop)
nir_phi_instr *const cond_phi = nir_phi_instr *const cond_phi =
nir_instr_as_phi(bcsel->src[0].src.ssa->parent_instr); nir_instr_as_phi(bcsel->src[0].src.ssa->parent_instr);
uint32_t entry_val = 0, continue_val = 0; bool entry_val = false, continue_val = false;
if (!phi_has_constant_from_outside_and_one_from_inside_loop(cond_phi, if (!phi_has_constant_from_outside_and_one_from_inside_loop(cond_phi,
prev_block, prev_block,
&entry_val, &entry_val,