[Mesa-dev] [PATCH 4/5] i965: Don't try copy propagation if constant propagation succeeded.

[Iago Toral]

On Fri, 2016-02-26 at 22:02 -0800, Francisco Jerez wrote:
> It cannot get any better.
> ---
>  src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp   | 2 +-
>  src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> index 9dbe13d..01fbde1 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> @@ -738,7 +738,7 @@ fs_visitor::opt_copy_propagate_local(void *copy_prop_ctx, bblock_t *block,
>              if (try_constant_propagate(inst, entry))
>                 progress = true;
>  
> -            if (try_copy_propagate(inst, i, entry))
> +            else if (try_copy_propagate(inst, i, entry))

Maybe remove the blank line between the if and the else if?

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

>                 progress = true;
>           }
>        }
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
> index 5c25164..b4a150a 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
> @@ -454,7 +454,7 @@ vec4_visitor::opt_copy_propagation(bool do_constant_prop)
>           if (do_constant_prop && try_constant_propagate(devinfo, inst, i, &entry))
>              progress = true;
>  
> -         if (try_copy_propagate(devinfo, inst, i, &entry, attributes_per_reg))
> +         else if (try_copy_propagate(devinfo, inst, i, &entry, attributes_per_reg))
>  	    progress = true;
>        }
>