[Mesa-dev] [PATCH v2 1/2] nir: rename lower_flrp to lower_flrp32

[Jason Ekstrand]

Both are

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
On Apr 27, 2016 11:20 PM, "Samuel Iglesias Gonsálvez" <siglesias at igalia.com>
wrote:

> A later patch will add lower_flrp64 option to NIR.
>
> Signed-off-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
> ---
>  src/compiler/nir/nir.h                      |  2 +-
>  src/compiler/nir/nir_opt_algebraic.py       | 12 ++++++------
>  src/gallium/drivers/freedreno/ir3/ir3_nir.c |  2 +-
>  src/gallium/drivers/vc4/vc4_program.c       |  2 +-
>  src/mesa/drivers/dri/i965/brw_compiler.c    |  2 +-
>  5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
> index 317d716..d5eda02 100644
> --- a/src/compiler/nir/nir.h
> +++ b/src/compiler/nir/nir.h
> @@ -1624,7 +1624,7 @@ typedef struct nir_function {
>  typedef struct nir_shader_compiler_options {
>     bool lower_fdiv;
>     bool lower_ffma;
> -   bool lower_flrp;
> +   bool lower_flrp32;
>     bool lower_fpow;
>     bool lower_fsat;
>     bool lower_fsqrt;
> diff --git a/src/compiler/nir/nir_opt_algebraic.py
> b/src/compiler/nir/nir_opt_algebraic.py
> index 2ad1c70..082bcc1 100644
> --- a/src/compiler/nir/nir_opt_algebraic.py
> +++ b/src/compiler/nir/nir_opt_algebraic.py
> @@ -97,13 +97,13 @@ optimizations = [
>     (('~flrp', a, b, 1.0), b),
>     (('~flrp', a, a, b), a),
>     (('~flrp', 0.0, a, b), ('fmul', a, b)),
> -   (('~flrp', a, b, ('b2f', c)), ('bcsel', c, b, a),
> 'options->lower_flrp'),
> -   (('flrp', a, b, c), ('fadd', ('fmul', c, ('fsub', b, a)), a),
> 'options->lower_flrp'),
> +   (('~flrp', a, b, ('b2f', c)), ('bcsel', c, b, a),
> 'options->lower_flrp32'),
> +   (('flrp', a, b, c), ('fadd', ('fmul', c, ('fsub', b, a)), a),
> 'options->lower_flrp32'),
>     (('ffract', a), ('fsub', a, ('ffloor', a)), 'options->lower_ffract'),
> -   (('~fadd', ('fmul', a, ('fadd', 1.0, ('fneg', ('b2f', c)))), ('fmul',
> b, ('b2f', c))), ('bcsel', c, b, a), 'options->lower_flrp'),
> -   (('~fadd', ('fmul', a, ('fadd', 1.0, ('fneg',         c ))), ('fmul',
> b,         c )), ('flrp', a, b, c), '!options->lower_flrp'),
> -   (('~fadd', a, ('fmul', ('b2f', c), ('fadd', b, ('fneg', a)))),
> ('bcsel', c, b, a), 'options->lower_flrp'),
> -   (('~fadd', a, ('fmul',         c , ('fadd', b, ('fneg', a)))),
> ('flrp', a, b, c), '!options->lower_flrp'),
> +   (('~fadd', ('fmul', a, ('fadd', 1.0, ('fneg', ('b2f', c)))), ('fmul',
> b, ('b2f', c))), ('bcsel', c, b, a), 'options->lower_flrp32'),
> +   (('~fadd', ('fmul', a, ('fadd', 1.0, ('fneg',         c ))), ('fmul',
> b,         c )), ('flrp', a, b, c), '!options->lower_flrp32'),
> +   (('~fadd', a, ('fmul', ('b2f', c), ('fadd', b, ('fneg', a)))),
> ('bcsel', c, b, a), 'options->lower_flrp32'),
> +   (('~fadd', a, ('fmul',         c , ('fadd', b, ('fneg', a)))),
> ('flrp', a, b, c), '!options->lower_flrp32'),
>     (('ffma', a, b, c), ('fadd', ('fmul', a, b), c),
> 'options->lower_ffma'),
>     (('~fadd', ('fmul', a, b), c), ('ffma', a, b, c),
> '!options->lower_ffma'),
>     # Comparison simplifications
> diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
> b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
> index d3ee2a7..364e92b 100644
> --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
> +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
> @@ -42,7 +42,7 @@ ir3_tgsi_to_nir(const struct tgsi_token *tokens)
>                         .lower_fpow = true,
>                         .lower_fsat = true,
>                         .lower_scmp = true,
> -                       .lower_flrp = true,
> +                       .lower_flrp32 = true,
>                         .lower_ffract = true,
>                         .native_integers = true,
>                         .vertex_id_zero_based = true,
> diff --git a/src/gallium/drivers/vc4/vc4_program.c
> b/src/gallium/drivers/vc4/vc4_program.c
> index fa81622..4f60233 100644
> --- a/src/gallium/drivers/vc4/vc4_program.c
> +++ b/src/gallium/drivers/vc4/vc4_program.c
> @@ -1770,7 +1770,7 @@ static const nir_shader_compiler_options nir_options
> = {
>          .lower_extract_byte = true,
>          .lower_extract_word = true,
>          .lower_ffma = true,
> -        .lower_flrp = true,
> +        .lower_flrp32 = true,
>          .lower_fpow = true,
>          .lower_fsat = true,
>          .lower_fsqrt = true,
> diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c
> b/src/mesa/drivers/dri/i965/brw_compiler.c
> index 4496699..c8a38e3 100644
> --- a/src/mesa/drivers/dri/i965/brw_compiler.c
> +++ b/src/mesa/drivers/dri/i965/brw_compiler.c
> @@ -109,7 +109,7 @@ static const struct nir_shader_compiler_options
> vector_nir_options = {
>     .fdot_replicates = true,
>
>     /* Prior to Gen6, there are no three source operations for SIMD4x2. */
> -   .lower_flrp = true,
> +   .lower_flrp32 = true,
>
>     .lower_pack_snorm_2x16 = true,
>     .lower_pack_unorm_2x16 = true,
> --
> 2.5.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160427/9b31a6d3/attachment-0001.html>