From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Thu, 10 Dec 2015 17:18:51 +0000 (-0500)
Subject: nv50/ir: can't have predication and immediates
X-Git-Tag: upstream/17.1.0~13710
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6aca7fecb7f7b6c67cf0315e781060a8d1d4b704;p=platform%2Fupstream%2Fmesa.git

nv50/ir: can't have predication and immediates

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 834fc7d..23454f3 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -2812,6 +2812,9 @@ NV50PostRaConstantFolding::visit(BasicBlock *bb)
              i->getSrc(0)->reg.data.id >= 64)
             break;
 
+         if (i->getPredicate())
+            break;
+
          def = i->getSrc(1)->getInsn();
          if (def && def->op == OP_MOV && def->src(0).getFile() == FILE_IMMEDIATE) {
             vtmp = i->getSrc(1);