<div dir="ltr"><div>Why not just squash 2 and 3 and call it "Separate 32 and 64-bit fmod lowering" or something like that. </div></div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Apr 28, 2016 at 4:19 AM, Samuel Iglesias Gonsálvez <<a href="mailto:siglesias@igalia.com" target="_blank">siglesias@igalia.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">A later patch will add lower_fmod64 option to NIR. Signed-off-by: Samuel Iglesias Gonsálvez <<a href="mailto:siglesias@igalia.com">siglesias@igalia.com</a>> --- src/compiler/nir/nir.h | 2 +- src/compiler/nir/nir_opt_algebraic.py | 4 ++-- src/mesa/drivers/dri/i965/brw_compiler.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 2e89bc5..a478124 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -1630,7 +1630,7 @@ typedef struct nir_shader_compiler_options { bool lower_fpow; bool lower_fsat; bool lower_fsqrt; - bool lower_fmod; + bool lower_fmod32; bool lower_bitfield_extract; bool lower_bitfield_insert; bool lower_uadd_carry; diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 60ee170..afe653e 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -296,8 +296,8 @@ optimizations = [ (('iadd', '#a', ('iadd', b, '#c')), ('iadd', ('iadd', a, c), b)), # Misc. lowering - (('fmod', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod'), - (('frem', a, b), ('fsub', a, ('fmul', b, ('ftrunc', ('fdiv', a, b)))), 'options->lower_fmod'), + (('fmod', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod32'), + (('frem', a, b), ('fsub', a, ('fmul', b, ('ftrunc', ('fdiv', a, b)))), 'options->lower_fmod32'), (('uadd_carry@32', a, b), ('b2i', ('ult', ('iadd', a, b), a)), 'options->lower_uadd_carry'), (('usub_borrow@32', a, b), ('b2i', ('ult', a, b)), 'options->lower_usub_borrow'), diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index c8a38e3..5ff1a61 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -76,7 +76,7 @@ shader_perf_log_mesa(void *data, const char *fmt, ...) .lower_sub = true, \ .lower_fdiv = true, \ .lower_scmp = true, \ - .lower_fmod = true, \ + .lower_fmod32 = true, \ .lower_bitfield_extract = true, \ .lower_bitfield_insert = true, \ .lower_uadd_carry = true, \ -- 2.5.0 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>