From: Matt Turner <mattst88@gmail.com>
Date: Tue, 24 Jun 2014 05:29:57 +0000 (-0700)
Subject: i965/vec4: Try constant propagate after copy propagate made progress.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a8acafa47558cafeb37f80f4b30061ac1962c69;p=mesa.git

i965/vec4: Try constant propagate after copy propagate made progress.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

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 2019d157df9..db6063c3bcc 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -367,8 +367,10 @@ vec4_visitor::opt_copy_propagation()
 	 if (c != 4)
 	    continue;
 
-	 if (try_constant_propagate(brw, inst, i, values) ||
-	     try_copy_propagate(brw, inst, i, values))
+	 if (try_constant_propagate(brw, inst, i, values))
+            progress = true;
+
+	 if (try_copy_propagate(brw, inst, i, values))
 	    progress = true;
       }