From 5a40fe03f7d7a32b1dce675e1d55f40f72090569 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 3 May 2014 00:26:14 -0400 Subject: nv50/ir: allow load propagation when flags are defined The old condition disallowed load propagation any time flags were defined, even with e.g. set and a constbuf reference. The new condition disallows it only with immediate propagation. (There are no opcodes that set the condition flag and have an immediate argument.) Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/nouveau') diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp index 0b2f27ad497..32ba5c82ceb 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp @@ -275,9 +275,10 @@ TargetNV50::insnCanLoad(const Instruction *i, int s, return false; // NOTE: don't rely on flagsDef - for (int d = 0; i->defExists(d); ++d) - if (i->def(d).getFile() == FILE_FLAGS) - return false; + if (sf == FILE_IMMEDIATE) + for (int d = 0; i->defExists(d); ++d) + if (i->def(d).getFile() == FILE_FLAGS) + return false; unsigned mode = 0; -- cgit v1.2.3