From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Tue, 3 Jun 2014 22:35:48 +0000 (+0200)
Subject: nvc0/ir: Handle reverse subop for OP_EXTBF when folding constant expressions
X-Git-Tag: upstream/10.3~1692
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4674343e8f37f336b68bb04212c928f28af66958;p=platform%2Fupstream%2Fmesa.git

nvc0/ir: Handle reverse subop for OP_EXTBF when folding constant expressions

Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 58092f4..5254617 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -528,9 +528,13 @@ ConstantFolding::expr(Instruction *i,
          rshift = 32 - width;
          lshift = 32 - width - offset;
       }
+      if (i->subOp == NV50_IR_SUBOP_EXTBF_REV)
+         res.data.u32 = util_bitreverse(a->data.u32);
+      else
+         res.data.u32 = a->data.u32;
       switch (i->dType) {
-      case TYPE_S32: res.data.s32 = (a->data.s32 << lshift) >> rshift; break;
-      case TYPE_U32: res.data.u32 = (a->data.u32 << lshift) >> rshift; break;
+      case TYPE_S32: res.data.s32 = (res.data.s32 << lshift) >> rshift; break;
+      case TYPE_U32: res.data.u32 = (res.data.u32 << lshift) >> rshift; break;
       default:
          return;
       }