summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Lehmann <dadschoorse@gmail.com>2024-04-25 18:14:09 +0200
committerMarge Bot <emma+marge@anholt.net>2024-04-26 21:31:53 +0000
commit6ab4b2d7a063c525dc98c80f272643bc47f41f96 (patch)
tree1de3c1acec301c728a1fbdcf422aba0fe581368b
parentc2053c5363973435dddbc50aef3a632b7dd01979 (diff)
spirv: preserve signed zero in modf
fsign's result can be +0.0 or -0.0 for -0.0. We already calculate the signed zero, it's even faster to replace the fmul(fsign(x), ...) with ior. Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28938>
-rw-r--r--src/compiler/spirv/vtn_glsl450.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c
index df529265c25..1f9a54f014e 100644
--- a/src/compiler/spirv/vtn_glsl450.c
+++ b/src/compiler/spirv/vtn_glsl450.c
@@ -343,7 +343,7 @@ handle_glsl450_alu(struct vtn_builder *b, enum GLSLstd450 entrypoint,
nir_def *sign_bit =
nir_imm_intN_t(&b->nb, (uint64_t)1 << (src[0]->bit_size - 1),
src[0]->bit_size);
- nir_def *sign = nir_fsign(nb, src[0]);
+ nir_def *signed_zero = nir_iand(nb, src[0], sign_bit);
nir_def *abs = nir_fabs(nb, src[0]);
/* NaN input should produce a NaN results, and ±Inf input should provide
@@ -353,12 +353,12 @@ handle_glsl450_alu(struct vtn_builder *b, enum GLSLstd450 entrypoint,
*/
dest->def = nir_bcsel(nb,
nir_ieq(nb, abs, inf),
- nir_iand(nb, src[0], sign_bit),
- nir_fmul(nb, sign, nir_ffract(nb, abs)));
+ signed_zero,
+ nir_ior(nb, signed_zero, nir_ffract(nb, abs)));
struct vtn_pointer *i_ptr = vtn_value(b, w[6], vtn_value_type_pointer)->pointer;
struct vtn_ssa_value *whole = vtn_create_ssa_value(b, i_ptr->type->type);
- whole->def = nir_fmul(nb, sign, nir_ffloor(nb, abs));
+ whole->def = nir_ior(nb, signed_zero, nir_ffloor(nb, abs));
vtn_variable_store(b, whole, i_ptr, 0);
break;
}
@@ -368,16 +368,16 @@ handle_glsl450_alu(struct vtn_builder *b, enum GLSLstd450 entrypoint,
nir_def *sign_bit =
nir_imm_intN_t(&b->nb, (uint64_t)1 << (src[0]->bit_size - 1),
src[0]->bit_size);
- nir_def *sign = nir_fsign(nb, src[0]);
+ nir_def *signed_zero = nir_iand(nb, src[0], sign_bit);
nir_def *abs = nir_fabs(nb, src[0]);
vtn_assert(glsl_type_is_struct_or_ifc(dest_type));
/* See GLSLstd450Modf for explanation of the Inf and NaN handling. */
dest->elems[0]->def = nir_bcsel(nb,
nir_ieq(nb, abs, inf),
- nir_iand(nb, src[0], sign_bit),
- nir_fmul(nb, sign, nir_ffract(nb, abs)));
- dest->elems[1]->def = nir_fmul(nb, sign, nir_ffloor(nb, abs));
+ signed_zero,
+ nir_ior(nb, signed_zero, nir_ffract(nb, abs)));
+ dest->elems[1]->def = nir_ior(nb, signed_zero, nir_ffloor(nb, abs));
break;
}