From: Eric Anholt <eric@anholt.net>
Date: Thu, 7 Nov 2013 01:43:25 +0000 (-0800)
Subject: i965/fs: Do instruction pre-scheduling just before register allocation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbd8303a943d0d491b7c2415eb237a0731c7dec5;p=mesa.git

i965/fs: Do instruction pre-scheduling just before register allocation.

Long ago, the HW_REG usage in assign_curb/urb_setup() were scheduling
barriers, so we had to run scheduler before them in order for it to be
able to do basically anything.  Now that that's fixed, we can delay the
scheduling until we go to allocate (which will make the next change less
scary).

Cc: "10.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index ee7b07d9b75..afa82c9abbf 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3281,13 +3281,13 @@ fs_visitor::run()
 	 progress = compute_to_mrf() || progress;
       } while (progress);
 
-      schedule_instructions(false);
-
       lower_uniform_pull_constant_loads();
 
       assign_curb_setup();
       assign_urb_setup();
 
+      schedule_instructions(false);
+
       if (0)
 	 assign_regs_trivial();
       else {