diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-25 12:41:44 -0700 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-27 11:21:06 -0700 |
commit | 7e0ee3a38b033aad12a0c19dc5437bc9c011437a (patch) | |
tree | 874c7f4956f9a038e64be62b9c1d392ee5432aa3 /src/compiler/nir/nir_search.c | |
parent | fcc1c8a43728ac9c9d3cd144d034e4925ec5bbcc (diff) | |
download | external_mesa3d-7e0ee3a38b033aad12a0c19dc5437bc9c011437a.zip external_mesa3d-7e0ee3a38b033aad12a0c19dc5437bc9c011437a.tar.gz external_mesa3d-7e0ee3a38b033aad12a0c19dc5437bc9c011437a.tar.bz2 |
nir/search: Respect the bit_size parameter on nir_search_value
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/compiler/nir/nir_search.c')
-rw-r--r-- | src/compiler/nir/nir_search.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index df80c0f..2c2fd92 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -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; } |