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

nir/loop_unroll: Fix out-of-bounds access handling

Browse Source 
The previous code was completely broken when it came to constructing the
undef values.  I'm not sure how it ever worked.  For the case of a copy
that reads an undefined value, we can just delete the copy because the
destination is a valid undefined value.  This saves us the effort of
trying to construct a value for an arbitrary copy_deref intrinsic.

Fixes: e8a8937a04 "nir: add partial loop unrolling support"
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Jason Ekstrand
2019-03-12 16:25:39 -05:00
parent c056609c43
commit 83fdefc062
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,11 +670,9 @@ remove_out_of_bounds_induction_use(nir_shader *shader, nir_loop *loop,
if (is_access_out_of_bounds(term, nir_src_as_deref(intrin->src[0]),
trip_count)) {
if (intrin->intrinsic == nir_intrinsic_load_deref) {
assert(intrin->src[0].is_ssa);
nir_ssa_def *a_ssa = intrin->src[0].ssa;
nir_ssa_def *undef =
nir_ssa_undef(&b, intrin->num_components,
a_ssa->bit_size);
nir_ssa_undef(&b, intrin->dest.ssa.num_components,
intrin->dest.ssa.bit_size);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
nir_src_for_ssa(undef));
} else {
@@ -686,14 +684,6 @@ remove_out_of_bounds_induction_use(nir_shader *shader, nir_loop *loop,
if (intrin->intrinsic == nir_intrinsic_copy_deref &&
is_access_out_of_bounds(term, nir_src_as_deref(intrin->src[1]),
trip_count)) {
assert(intrin->src[1].is_ssa);
nir_ssa_def *a_ssa = intrin->src[1].ssa;
nir_ssa_def *undef =
nir_ssa_undef(&b, intrin->num_components, a_ssa->bit_size);
/* Replace the copy with a store of the undefined value */
b.cursor = nir_before_instr(instr);
nir_store_deref(&b, nir_src_as_deref(intrin->src[0]), undef, ~0);
nir_instr_remove(instr);
}
}