summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
index 3852a8de3d0..7d0ebc69710 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
@@ -123,6 +123,7 @@ private:
bool isCSpaceLoad(Instruction *);
bool isImmd32Load(Instruction *);
+ bool isAttribOrSharedLoad(Instruction *);
};
bool
@@ -139,6 +140,16 @@ LoadPropagation::isImmd32Load(Instruction *ld)
return ld->src(0).getFile() == FILE_IMMEDIATE;
}
+bool
+LoadPropagation::isAttribOrSharedLoad(Instruction *ld)
+{
+ return ld &&
+ (ld->op == OP_VFETCH ||
+ (ld->op == OP_LOAD &&
+ (ld->src(0).getFile() == FILE_SHADER_INPUT ||
+ ld->src(0).getFile() == FILE_MEMORY_SHARED)));
+}
+
void
LoadPropagation::checkSwapSrc01(Instruction *insn)
{
@@ -162,6 +173,12 @@ LoadPropagation::checkSwapSrc01(Instruction *insn)
insn->swapSources(0, 1);
else
return;
+ } else
+ if (isAttribOrSharedLoad(i1)) {
+ if (!isAttribOrSharedLoad(i0))
+ insn->swapSources(0, 1);
+ else
+ return;
} else {
return;
}