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

nir/lower_subgroups: pass options struct to lower_shuffle

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5695>
This commit is contained in:
Rhys Perry
2020-07-06 17:59:08 +01:00
committed by Marge Bot
parent a6a731bea5
commit 9c317cb278
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,21 +224,25 @@ lower_vote_eq_to_ballot(nir_builder *b, nir_intrinsic_instr *intrin,
static nir_ssa_def * static nir_ssa_def *
lower_shuffle(nir_builder *b, nir_intrinsic_instr *intrin, lower_shuffle(nir_builder *b, nir_intrinsic_instr *intrin,
bool lower_to_scalar, bool lower_to_32bit) const nir_lower_subgroups_options *options)
{ {
nir_ssa_def *index = nir_load_subgroup_invocation(b); nir_ssa_def *index = nir_load_subgroup_invocation(b);
bool is_shuffle = false;
switch (intrin->intrinsic) { switch (intrin->intrinsic) {
case nir_intrinsic_shuffle_xor: case nir_intrinsic_shuffle_xor:
assert(intrin->src[1].is_ssa); assert(intrin->src[1].is_ssa);
index = nir_ixor(b, index, intrin->src[1].ssa); index = nir_ixor(b, index, intrin->src[1].ssa);
is_shuffle = true;
break; break;
case nir_intrinsic_shuffle_up: case nir_intrinsic_shuffle_up:
assert(intrin->src[1].is_ssa); assert(intrin->src[1].is_ssa);
index = nir_isub(b, index, intrin->src[1].ssa); index = nir_isub(b, index, intrin->src[1].ssa);
is_shuffle = true;
break; break;
case nir_intrinsic_shuffle_down: case nir_intrinsic_shuffle_down:
assert(intrin->src[1].is_ssa); assert(intrin->src[1].is_ssa);
index = nir_iadd(b, index, intrin->src[1].ssa); index = nir_iadd(b, index, intrin->src[1].ssa);
is_shuffle = true;
break; break;
case nir_intrinsic_quad_broadcast: case nir_intrinsic_quad_broadcast:
assert(intrin->src[1].is_ssa); assert(intrin->src[1].is_ssa);
@@ -276,7 +280,8 @@ lower_shuffle(nir_builder *b, nir_intrinsic_instr *intrin,
intrin->dest.ssa.num_components, intrin->dest.ssa.num_components,
intrin->dest.ssa.bit_size, NULL); intrin->dest.ssa.bit_size, NULL);
if (lower_to_scalar && shuffle->num_components > 1) { bool lower_to_32bit = options->lower_shuffle_to_32bit && is_shuffle;
if (options->lower_to_scalar && shuffle->num_components > 1) {
return lower_subgroup_op_to_scalar(b, shuffle, lower_to_32bit); return lower_subgroup_op_to_scalar(b, shuffle, lower_to_32bit);
} else if (lower_to_32bit && shuffle->src[0].ssa->bit_size == 64) { } else if (lower_to_32bit && shuffle->src[0].ssa->bit_size == 64) {
return lower_subgroup_op_to_32bit(b, shuffle); return lower_subgroup_op_to_32bit(b, shuffle);
@@ -306,7 +311,7 @@ lower_dynamic_quad_broadcast(nir_builder *b, nir_intrinsic_instr *intrin,
const nir_lower_subgroups_options *options) const nir_lower_subgroups_options *options)
{ {
if (!options->lower_quad_broadcast_dynamic_to_const) if (!options->lower_quad_broadcast_dynamic_to_const)
return lower_shuffle(b, intrin, options->lower_to_scalar, false); return lower_shuffle(b, intrin, options);
nir_ssa_def *dst = NULL; nir_ssa_def *dst = NULL;
@@ -523,12 +528,11 @@ lower_subgroups_instr(nir_builder *b, nir_instr *instr, void *_options)
else if (options->lower_shuffle_to_32bit && intrin->src[0].ssa->bit_size == 64) else if (options->lower_shuffle_to_32bit && intrin->src[0].ssa->bit_size == 64)
return lower_subgroup_op_to_32bit(b, intrin); return lower_subgroup_op_to_32bit(b, intrin);
break; break;
case nir_intrinsic_shuffle_xor: case nir_intrinsic_shuffle_xor:
case nir_intrinsic_shuffle_up: case nir_intrinsic_shuffle_up:
case nir_intrinsic_shuffle_down: case nir_intrinsic_shuffle_down:
if (options->lower_shuffle) if (options->lower_shuffle)
return lower_shuffle(b, intrin, options->lower_to_scalar, options->lower_shuffle_to_32bit); return lower_shuffle(b, intrin, options);
else if (options->lower_to_scalar && intrin->num_components > 1) else if (options->lower_to_scalar && intrin->num_components > 1)
return lower_subgroup_op_to_scalar(b, intrin, options->lower_shuffle_to_32bit); return lower_subgroup_op_to_scalar(b, intrin, options->lower_shuffle_to_32bit);
else if (options->lower_shuffle_to_32bit && intrin->src[0].ssa->bit_size == 64) else if (options->lower_shuffle_to_32bit && intrin->src[0].ssa->bit_size == 64)