fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir: Use nir_const_value_for_int in nir_lower_subgroups

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7670
Fixes: e4e79de2a4 ("nir/subgroups: Support > 1 ballot components")
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19689>
(cherry picked from commit e6de164e03)
This commit is contained in:
Jason Ekstrand 2022-11-11 14:56:19 -06:00 • committed by Eric Engestrom
parent d988e3f32b
commit f2327830b2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4072,7 +4072,7 @@
"description": "nir: Use nir_const_value_for_int in nir_lower_subgroups",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "e4e79de2a420128190b28b39b87f6de39b1b7060"
},

12
src/compiler/nir/nir_lower_subgroups.c
View file

@ -420,14 +420,14 @@ build_ballot_imm_ishl(nir_builder *b, int64_t val, nir_ssa_def *shift,
* answer or 0 for the first component (and something similar with the
* second component). This idea is generalized here for any component count
*/
nir_const_value min_shift[4] = { 0 };
nir_const_value min_shift[4];
for (unsigned i = 0; i < options->ballot_components; i++)
min_shift[i].i32 = i * options->ballot_bit_size;
min_shift[i] = nir_const_value_for_int(i * options->ballot_bit_size, 32);
nir_ssa_def *min_shift_val = nir_build_imm(b, options->ballot_components, 32, min_shift);
nir_const_value max_shift[4] = { 0 };
nir_const_value max_shift[4];
for (unsigned i = 0; i < options->ballot_components; i++)
max_shift[i].i32 = (i + 1) * options->ballot_bit_size;
max_shift[i] = nir_const_value_for_int((i + 1) * options->ballot_bit_size, 32);
nir_ssa_def *max_shift_val = nir_build_imm(b, options->ballot_components, 32, max_shift);
return nir_bcsel(b, nir_ult(b, shift, max_shift_val),
@ -501,9 +501,9 @@ build_subgroup_mask(nir_builder *b,
* result if we just follow (2) and then replace the first component with
* "result".
*/
nir_const_value min_idx[4] = { 0 };
nir_const_value min_idx[4];
for (unsigned i = 0; i < options->ballot_components; i++)
min_idx[i].i32 = i * options->ballot_bit_size;
min_idx[i] = nir_const_value_for_int(i * options->ballot_bit_size, 32);
nir_ssa_def *min_idx_val = nir_build_imm(b, options->ballot_components, 32, min_idx);
nir_ssa_def *result_extended =