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

nir/search: Use nir_src_is_const and friends

Browse Source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Jason Ekstrand
2018-10-20 12:17:30 -05:00
parent bca5c2c688
commit 7bae7828aa
1 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/compiler/nir/nir_search.c
View File

@@ -181,33 +181,14 @@ match_value(const nir_search_value *value, nir_alu_instr *instr, unsigned src,
case nir_search_value_constant: { case nir_search_value_constant: {
nir_search_constant *const_val = nir_search_value_as_constant(value); nir_search_constant *const_val = nir_search_value_as_constant(value);
if (!instr->src[src].src.is_ssa) if (!nir_src_is_const(instr->src[src].src))
return false; return false;
if (instr->src[src].src.ssa->parent_instr->type != nir_instr_type_load_const)
return false;
nir_load_const_instr *load =
nir_instr_as_load_const(instr->src[src].src.ssa->parent_instr);
switch (const_val->type) { switch (const_val->type) {
case nir_type_float: case nir_type_float:
for (unsigned i = 0; i < num_components; ++i) { for (unsigned i = 0; i < num_components; ++i) {
double val; double val = nir_src_comp_as_float(instr->src[src].src,
switch (load->def.bit_size) { new_swizzle[i]);
case 16:
val = _mesa_half_to_float(load->value.u16[new_swizzle[i]]);
break;
case 32:
val = load->value.f32[new_swizzle[i]];
break;
case 64:
val = load->value.f64[new_swizzle[i]];
break;
default:
unreachable("unknown bit size");
}
if (val != const_val->data.d) if (val != const_val->data.d)
return false; return false;
} }
@@ -215,42 +196,17 @@ match_value(const nir_search_value *value, nir_alu_instr *instr, unsigned src,
case nir_type_int: case nir_type_int:
case nir_type_uint: case nir_type_uint:
case nir_type_bool32: case nir_type_bool32: {
switch (load->def.bit_size) { unsigned bit_size = nir_src_bit_size(instr->src[src].src);
case 8: uint64_t mask = bit_size == 64 ? UINT64_MAX : (1ull << bit_size) - 1;
for (unsigned i = 0; i < num_components; ++i) { for (unsigned i = 0; i < num_components; ++i) {
if (load->value.u8[new_swizzle[i]] != uint64_t val = nir_src_comp_as_uint(instr->src[src].src,
(uint8_t)const_val->data.u) new_swizzle[i]);
return false; if ((val & mask) != (const_val->data.u & mask))
} return false;
return true;
case 16:
for (unsigned i = 0; i < num_components; ++i) {
if (load->value.u16[new_swizzle[i]] !=
(uint16_t)const_val->data.u)
return false;
}
return true;
case 32:
for (unsigned i = 0; i < num_components; ++i) {
if (load->value.u32[new_swizzle[i]] !=
(uint32_t)const_val->data.u)
return false;
}
return true;
case 64:
for (unsigned i = 0; i < num_components; ++i) {
if (load->value.u64[new_swizzle[i]] != const_val->data.u)
return false;
}
return true;
default:
unreachable("unknown bit size");
} }
return true;
}
default: default:
unreachable("Invalid alu source type"); unreachable("Invalid alu source type");