From: Eric Anholt <eric@anholt.net>
Date: Tue, 22 Oct 2013 19:38:14 +0000 (-0700)
Subject: i965/fs: Stop trying to hack around MRF dep chains on gen7+ LIFO scheduling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93bd627d5a6c485948b94488e6cd53a06b7ebdcf;p=mesa.git

i965/fs: Stop trying to hack around MRF dep chains on gen7+ LIFO scheduling.

This was a hack to avoid choosing to schedule all texturing before
consumption of any texture results due to the way dependency chains worked
out in the presence of MRFs.  On gen7, we don't have MRFs, so the problem
doesn't apply, and this was just badly constraining our scheduling.

total instructions in shared programs: 1615306 -> 1612534 (-0.17%)
instructions in affected programs:     9958 -> 7186 (-27.84%)
GAINED:                                259
LOST:                                  9

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
index 99538bddb47..a1ecfde3743 100644
--- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
@@ -969,7 +969,7 @@ fs_instruction_scheduler::choose_instruction_to_schedule()
          fs_inst *inst = (fs_inst *)n->inst;
 
          chosen = n;
-         if (inst->regs_written <= 1)
+         if (v->brw->gen >= 7 || inst->regs_written <= 1)
             break;
       }
    }