freedreno/ir3: relax barriers

Instructions with no barrier_class can move wrt. an EVERYTHING barrier.

Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_sched.c b/src/gallium/drivers/freedreno/ir3/ir3_sched.c
index 9492e9ba650156b088c3c3e77ac9624eebbf701c..5d0fcc481a753ffdba928ab472c0cc7099ddce03 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_sched.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_sched.c
@@ -679,8 +679,8 @@ depends_on(struct ir3_instruction *instr, struct ir3_instruction *prior)
         * make accesses to unrelated objects not depend on each other (at
         * least as long as not declared coherent)
         */
-       if ((instr->barrier_class & IR3_BARRIER_EVERYTHING) ||
-                       (prior->barrier_class & IR3_BARRIER_EVERYTHING))
+       if (((instr->barrier_class & IR3_BARRIER_EVERYTHING) && prior->barrier_class) ||
+                       ((prior->barrier_class & IR3_BARRIER_EVERYTHING) && instr->barrier_class))
                return true;
        return !!(instr->barrier_class & prior->barrier_conflict);
 }