nir/lower_double_ops: relax lower mod()

Currently when lowering mod() we add an extra instruction so if
mod(a,b) == b then 0 is returned instead of b, as mathematically
mod(a,b) is in the interval [0, b).

But Vulkan spec has relaxed this restriction, and allows the result to
be in the interval [0, b].

This commit takes this in account to remove the extra instruction
required to return 0 instead.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2922>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2922>
This commit is contained in:
Juan A. Suarez Romero 2019-11-28 16:58:45 +00:00 committed by Marge Bot
parent af65bfb38f
commit 8172b1fa03
1 changed files with 15 additions and 6 deletions

View File

@ -426,15 +426,24 @@ lower_mod(nir_builder *b, nir_ssa_def *src0, nir_ssa_def *src1)
*
* If the division is lowered, it could add some rounding errors that make
* floor() to return the quotient minus one when x = N * y. If this is the
* case, we return zero because mod(x, y) output value is [0, y).
* case, we should return zero because mod(x, y) output value is [0, y).
* But fortunately Vulkan spec allows this kind of errors; from Vulkan
* spec, appendix A (Precision and Operation of SPIR-V instructions:
*
* "The OpFRem and OpFMod instructions use cheap approximations of
* remainder, and the error can be large due to the discontinuity in
* trunc() and floor(). This can produce mathematically unexpected
* results in some cases, such as FMod(x,x) computing x rather than 0,
* and can also cause the result to have a different sign than the
* infinitely precise result."
*
* In practice this means the output value is actually in the interval
* [0, y].
*
*/
nir_ssa_def *floor = nir_ffloor(b, nir_fdiv(b, src0, src1));
nir_ssa_def *mod = nir_fsub(b, src0, nir_fmul(b, src1, floor));
return nir_bcsel(b,
nir_fne(b, mod, src1),
mod,
nir_imm_double(b, 0.0));
return nir_fsub(b, src0, nir_fmul(b, src1, floor));
}
static nir_ssa_def *