From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sat, 24 Jun 2017 21:08:11 +0000 (-0400)
Subject: nv50/ir: VFETCH is also considered a load for MemoryOpt
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55a8c117051406ff80166d365e832ff99b90d1a8;p=mesa.git

nv50/ir: VFETCH is also considered a load for MemoryOpt

This has no effect since in practice this will only play for
memory-backed files, for which VFETCH will never happen.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 5dac2f64f0a..c6dbd4fead4 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -2641,7 +2641,7 @@ MemoryOpt::findRecord(const Instruction *insn, bool load, bool& isAdj) const
    Record *it = load ? loads[sym->reg.file] : stores[sym->reg.file];
 
    for (; it; it = it->next) {
-      if (it->locked && insn->op != OP_LOAD)
+      if (it->locked && insn->op != OP_LOAD && insn->op != OP_VFETCH)
          continue;
       if ((it->offset >> 4) != (sym->reg.data.offset >> 4) ||
           it->rel[0] != insn->getIndirect(0, 0) ||