nir: lower fdot to ffma if lower_ffma=false

fossil-db (GFX10.3):
Totals from 57689 (39.44% of 146267) affected shaders:
VGPRs: 2873712 -> 2873432 (-0.01%); split: -0.01%, +0.00%
CodeSize: 227661100 -> 227583572 (-0.03%); split: -0.08%, +0.04%
MaxWaves: 1289562 -> 1289598 (+0.00%); split: +0.01%, -0.00%
Instrs: 43115433 -> 43083308 (-0.07%); split: -0.12%, +0.05%
Latency: 869947191 -> 870279826 (+0.04%); split: -0.06%, +0.10%
InvThroughput: 199425811 -> 199434448 (+0.00%); split: -0.04%, +0.05%

fossil-db (GFX10):
Totals from 2 (0.00% of 146267) affected shaders:
Latency: 8123 -> 8107 (-0.20%)

fossil-db (GFX9):
Totals from 2 (0.00% of 146401) affected shaders:
(no stat changes)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8056>
This commit is contained in:
Rhys Perry 2021-03-05 17:28:36 +00:00 committed by Marge Bot
parent 174a4f36f9
commit 28acc4120f

View file

@ -93,6 +93,52 @@ lower_reduction(nir_alu_instr *alu, nir_op chan_op, nir_op merge_op,
return last;
}
static inline bool
will_lower_ffma(nir_shader *shader, unsigned bit_size)
{
switch (bit_size) {
case 16:
return shader->options->lower_ffma16;
case 32:
return shader->options->lower_ffma32;
case 64:
return shader->options->lower_ffma64;
}
unreachable("bad bit size");
}
static nir_ssa_def *
lower_fdot(nir_alu_instr *alu, nir_builder *builder)
{
/* If we don't want to lower ffma, create several ffma instead of fmul+fadd
* and fusing later because fusing is not possible for exact fdot instructions.
*/
if (will_lower_ffma(builder->shader, alu->dest.dest.ssa.bit_size))
return lower_reduction(alu, nir_op_fmul, nir_op_fadd, builder);
unsigned num_components = nir_op_infos[alu->op].input_sizes[0];
nir_ssa_def *prev = NULL;
for (int i = num_components - 1; i >= 0; i--) {
nir_alu_instr *instr = nir_alu_instr_create(
builder->shader, prev ? nir_op_ffma : nir_op_fmul);
nir_alu_ssa_dest_init(instr, 1, alu->dest.dest.ssa.bit_size);
for (unsigned j = 0; j < 2; j++) {
nir_alu_src_copy(&instr->src[j], &alu->src[j], instr);
instr->src[j].swizzle[0] = alu->src[j].swizzle[i];
}
if (i != num_components - 1)
instr->src[2].src = nir_src_for_ssa(prev);
instr->exact = builder->exact;
nir_builder_instr_insert(builder, &instr->instr);
prev = &instr->dest.dest.ssa;
}
return prev;
}
static nir_ssa_def *
lower_alu_instr_scalar(nir_builder *b, nir_instr *instr, void *_data)
{
@ -244,7 +290,13 @@ lower_alu_instr_scalar(nir_builder *b, nir_instr *instr, void *_data)
case nir_op_unpack_double_2x32_dxil:
return NULL;
LOWER_REDUCTION(nir_op_fdot, nir_op_fmul, nir_op_fadd);
case nir_op_fdot2:
case nir_op_fdot3:
case nir_op_fdot4:
case nir_op_fdot8:
case nir_op_fdot16:
return lower_fdot(alu, b);
LOWER_REDUCTION(nir_op_ball_fequal, nir_op_feq, nir_op_iand);
LOWER_REDUCTION(nir_op_ball_iequal, nir_op_ieq, nir_op_iand);
LOWER_REDUCTION(nir_op_bany_fnequal, nir_op_fneu, nir_op_ior);