nir: Allow opt_peephole_select to work on empty blocks.
authorEric Anholt <eric@anholt.net>
Thu, 28 Jul 2016 00:26:59 +0000 (17:26 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 3 Aug 2016 17:25:08 +0000 (10:25 -0700)
nir_opt_peephole_select has the job of removing IF statements with no side
effects.  However, if the IF statement's successor didn't have any
instructions in it, we were skipping it, which occurred in mupen64 on vc4
with glsl_to_nir enabled:

instructions in affected programs:     6134 -> 4120 (-32.83%)
total uniforms in shared programs: 38268 -> 38219 (-0.13%)

No changes on Haswell shader-db.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/compiler/nir/nir_opt_peephole_select.c

index 7fcc71ea9d7645e590bdb13f50f69a943c6e9a27..633e9f486c082db7cb62ed0dde7f7f140293631f 100644 (file)
@@ -127,13 +127,6 @@ block_check_for_allowed_instrs(nir_block *block)
 static bool
 nir_opt_peephole_select_block(nir_block *block, void *mem_ctx)
 {
-   /* If the block is empty, then it certainly doesn't have any phi nodes,
-    * so we can skip it.  This also ensures that we do an early skip on the
-    * end block of the function which isn't actually attached to the CFG.
-    */
-   if (exec_list_is_empty(&block->instr_list))
-      return false;
-
    if (nir_cf_node_is_first(&block->cf_node))
       return false;