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

nir/opt_loop_unroll: fix is_access_out_of_bounds with vectors

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsquueze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6347>
This commit is contained in:
Rhys Perry
2020-08-17 13:19:43 +01:00
committed by Marge Bot
parent c0d04cd5bb
commit 641d45befb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,14 +592,18 @@ is_access_out_of_bounds(nir_loop_terminator *term, nir_deref_instr *deref,
nir_deref_instr *parent = nir_deref_instr_parent(d); nir_deref_instr *parent = nir_deref_instr_parent(d);
assert(glsl_type_is_array(parent->type) || assert(glsl_type_is_array(parent->type) ||
glsl_type_is_matrix(parent->type)); glsl_type_is_matrix(parent->type) ||
glsl_type_is_vector(parent->type));
/* We have already unrolled the loop and the new one will be imbedded in /* We have already unrolled the loop and the new one will be imbedded in
* the innermost continue branch. So unless the array is greater than * the innermost continue branch. So unless the array is greater than
* the trip count any iteration over the loop will be an out of bounds * the trip count any iteration over the loop will be an out of bounds
* access of the array. * access of the array.
*/ */
return glsl_get_length(parent->type) <= trip_count; unsigned length = glsl_type_is_vector(parent->type) ?
glsl_get_vector_elements(parent->type) :
glsl_get_length(parent->type);
return length <= trip_count;
} }
return false; return false;