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

nir/lower_bit_size: Handle vote_feq/ieq separately

Browse Source 
They're different enough from all the other subgroup ops so it's best to
handle them as their own case.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25894>
This commit is contained in:
Faith Ekstrand
2023-10-26 07:54:19 -05:00
committed by Marge Bot
parent 5979e74177
commit 5465e5b157
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/compiler/nir/nir_lower_bit_size.c
View File

@@ -133,8 +133,6 @@ lower_intrinsic_instr(nir_builder *b, nir_intrinsic_instr *intrin,
switch (intrin->intrinsic) {
case nir_intrinsic_read_invocation:
case nir_intrinsic_read_first_invocation:
case nir_intrinsic_vote_feq:
case nir_intrinsic_vote_ieq:
case nir_intrinsic_shuffle:
case nir_intrinsic_shuffle_xor:
case nir_intrinsic_shuffle_up:
@@ -152,8 +150,6 @@ lower_intrinsic_instr(nir_builder *b, nir_intrinsic_instr *intrin,
nir_alu_type type = nir_type_uint;
if (nir_intrinsic_has_reduction_op(intrin))
type = nir_op_infos[nir_intrinsic_reduction_op(intrin)].input_types[0];
else if (intrin->intrinsic == nir_intrinsic_vote_feq)
type = nir_type_float;
b->cursor = nir_before_instr(&intrin->instr);
nir_intrinsic_instr *new_intrin =
@@ -163,17 +159,11 @@ lower_intrinsic_instr(nir_builder *b, nir_intrinsic_instr *intrin,
type, bit_size);
new_intrin->src[0] = nir_src_for_ssa(new_src);
if (intrin->intrinsic == nir_intrinsic_vote_feq ||
intrin->intrinsic == nir_intrinsic_vote_ieq) {
/* These return a Boolean; it's always 1-bit */
assert(new_intrin->def.bit_size == 1);
} else {
/* These return the same bit size as the source; we need to adjust
* the size and then we'll have to emit a down-cast.
*/
assert(intrin->src[0].ssa->bit_size == intrin->def.bit_size);
new_intrin->def.bit_size = bit_size;
}
/* These return the same bit size as the source; we need to adjust
* the size and then we'll have to emit a down-cast.
*/
assert(intrin->src[0].ssa->bit_size == intrin->def.bit_size);
new_intrin->def.bit_size = bit_size;
nir_builder_instr_insert(b, &new_intrin->instr);
@@ -201,14 +191,28 @@ lower_intrinsic_instr(nir_builder *b, nir_intrinsic_instr *intrin,
}
}
if (intrin->intrinsic != nir_intrinsic_vote_feq &&
intrin->intrinsic != nir_intrinsic_vote_ieq)
res = nir_convert_to_bit_size(b, res, type, old_bit_size);
res = nir_convert_to_bit_size(b, res, type, old_bit_size);
nir_def_rewrite_uses(&intrin->def, res);
break;
}
case nir_intrinsic_vote_feq:
case nir_intrinsic_vote_ieq: {
/* These return a Boolean; it's always 1-bit */
assert(intrin->def.bit_size == 1);
nir_alu_type type = nir_type_uint;
if (intrin->intrinsic == nir_intrinsic_vote_feq)
type = nir_type_float;
b->cursor = nir_before_instr(&intrin->instr);
nir_def *new_src = nir_convert_to_bit_size(b, intrin->src[0].ssa,
type, bit_size);
nir_src_rewrite(&intrin->src[0], new_src);
break;
}
default:
unreachable("Unsupported instruction");
}