nir: Allow vec2/vec3/vec4 instructions in the select peephole pass.
authorKenneth Graunke <kenneth@whitecape.org>
Wed, 10 Jun 2015 07:52:07 +0000 (00:52 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 22 Jun 2015 21:08:36 +0000 (14:08 -0700)
commit1762568fd39b9be42d963d335e36daea25df7044
tree763dd0431662741306c078b53b11278bf81f8cf8
parent94e3864707e48d4b1d5fb5f88a01370a73ddb0cb
nir: Allow vec2/vec3/vec4 instructions in the select peephole pass.

These are basically just moves, so they should be safe as well.

When disabling i965's GLSL IR level scalarizer (channel expressions)
pass, I started seeing NIR code like this:

        if ssa_21 {
                block block_1:
                /* preds: block_0 */
                vec4 ssa_120 = vec4 ssa_82, ssa_83, ssa_84, ssa_30
                /* succs: block_3 */
        } else {
                block block_2:
                /* preds: block_0 */
                /* succs: block_3 */
        }
        block block_3:
        /* preds: block_1 block_2 */
        vec4 ssa_33 = phi block_1: ssa_120, block_2: ssa_2

Previously, the GLSL IR scalarizer pass would break the vec4 into a
series of fmovs, which were allowed by the peephole pass.  But with
the vec4 operation, they were not.  We want to keep getting selects.

Normal i965 on Broadwell:
instructions in affected programs:     200 -> 176 (-12.00%)
helped:                                4

With brw_fs_channel_expressions() disabled:
instructions in affected programs:     1832 -> 1646 (-10.15%)
helped:                                30

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
src/glsl/nir/nir_opt_peephole_select.c