fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: use lower_scmp instead of open-coding

Browse source 
We already have the proper lowering in NIR for this, so there's no point
in doing our own implementations of these. The end result is the same
code anyway.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8335>
This commit is contained in:
Erik Faye-Lund 2021-01-05 18:36:09 +01:00 • committed by Marge Bot
parent 94b84f1eed
commit 43302ead38
2 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -1423,44 +1423,11 @@ emit_alu(struct ntv_context *ctx, nir_alu_instr *alu)
break;
case nir_op_fdph:
unreachable("should already be lowered away");
case nir_op_seq:
case nir_op_sne:
case nir_op_slt:
case nir_op_sge: {
assert(nir_op_infos[alu->op].num_inputs == 2);
int num_components = nir_dest_num_components(alu->dest.dest);
SpvId bool_type = get_bvec_type(ctx, num_components);
SpvId zero = emit_float_const(ctx, bit_size, 0.0f);
SpvId one = emit_float_const(ctx, bit_size, 1.0f);
if (num_components > 1) {
SpvId zero_comps[num_components], one_comps[num_components];
for (int i = 0; i < num_components; i++) {
zero_comps[i] = zero;
one_comps[i] = one;
}
zero = spirv_builder_const_composite(&ctx->builder, dest_type,
zero_comps, num_components);
one = spirv_builder_const_composite(&ctx->builder, dest_type,
one_comps, num_components);
}
SpvOp op;
switch (alu->op) {
case nir_op_seq: op = SpvOpFOrdEqual; break;
case nir_op_sne: op = SpvOpFOrdNotEqual; break;
case nir_op_slt: op = SpvOpFOrdLessThan; break;
case nir_op_sge: op = SpvOpFOrdGreaterThanEqual; break;
default: unreachable("unexpected op");
}
result = emit_binop(ctx, op, bool_type, src[0], src[1]);
result = emit_select(ctx, dest_type, result, one, zero);
}
break;
case nir_op_sge:
unreachable("should already be lowered away");
case nir_op_flrp:
assert(nir_op_infos[alu->op].num_inputs == 3);

1
src/gallium/drivers/zink/zink_compiler.c
View file

@ -207,6 +207,7 @@ static const struct nir_shader_compiler_options nir_options = {
.lower_ffma16 = true,
.lower_ffma32 = true,
.lower_ffma64 = true,
.lower_scmp = true,
.lower_fdph = true,
.lower_flrp32 = true,
.lower_fpow = true,