spirv: Fix array length of buffers larger than INT32_MAX.

Like 90a8fb0355.

fossil-db results:

All Skylake and newer Intel platforms had similar results. (Ice Lake shown)
Instructions in all programs: 141442369 -> 141442363 (-0.0%)
Instructions helped: 1

Cycles in all programs: 9099270231 -> 9099270187 (-0.0%)
Cycles helped: 1

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17637>
This commit is contained in:
Ian Romanick 2021-02-09 11:18:48 -08:00 committed by Marge Bot
parent 254076f3fc
commit 430d1a20eb
1 changed files with 5 additions and 7 deletions

View File

@ -2647,13 +2647,11 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
/* array_length = max(buffer_size - offset, 0) / stride */
nir_ssa_def *array_length =
nir_idiv(&b->nb,
nir_imax(&b->nb,
nir_isub(&b->nb,
buf_size,
nir_imm_int(&b->nb, offset)),
nir_imm_int(&b->nb, 0u)),
nir_imm_int(&b->nb, stride));
nir_udiv_imm(&b->nb,
nir_usub_sat(&b->nb,
buf_size,
nir_imm_int(&b->nb, offset)),
stride);
vtn_push_nir_ssa(b, w[2], array_length);
}