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

nir/search: Respect the bit_size parameter on nir_search_value

Browse Source 
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jason Ekstrand
2016-04-25 12:41:44 -07:00
parent fcc1c8a437
commit 7e0ee3a38b
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,11 @@ match_value(const nir_search_value *value, nir_alu_instr *instr, unsigned src,
for (unsigned i = 0; i < num_components; ++i)
new_swizzle[i] = instr->src[src].swizzle[swizzle[i]];
/* If the value has a specific bit size and it doesn't match, bail */
if (value->bit_size &&
nir_src_bit_size(instr->src[src].src) != value->bit_size)
return false;
switch (value->type) {
case nir_search_value_expression:
if (!instr->src[src].src.is_ssa)
@@ -243,6 +248,10 @@ match_expression(const nir_search_expression *expr, nir_alu_instr *instr,
assert(instr->dest.dest.is_ssa);
if (expr->value.bit_size &&
instr->dest.dest.ssa.bit_size != expr->value.bit_size)
return false;
state->inexact_match = expr->inexact || state->inexact_match;
state->has_exact_alu = instr->exact || state->has_exact_alu;
if (state->inexact_match && state->has_exact_alu)
@@ -353,6 +362,11 @@ build_bitsize_tree(void *mem_ctx, struct match_state *state,
}
}
if (value->bit_size) {
assert(!tree->is_dest_sized || tree->dest_size == value->bit_size);
tree->common_size = value->bit_size;
}
return tree;
}