diff options
| -rw-r--r-- | src/panfrost/midgard/midgard_schedule.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index 958e109346b..486bb38e049 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -622,18 +622,15 @@ midgard_pair_load_store(compiler_context *ctx, midgard_block *block) if (c->type != TAG_LOAD_STORE_4) continue; - /* Stores cannot be reordered, since they have - * dependencies. For the same reason, indirect - * loads cannot be reordered as their index is - * loaded in r27.w */ + /* We can only reorder if there are no sources */ - if (OP_IS_STORE(c->load_store.op)) continue; + bool deps = false; - /* It appears the 0x8 bit is set whenever a - * load is direct, unset when it is indirect. - * Skip indirect loads. */ + for (unsigned s = 0; s < ARRAY_SIZE(ins->ssa_args.src); ++s) + deps |= (c->ssa_args.src[s] != -1); - if (!(c->load_store.arg_2 & 0x8)) continue; + if (deps) + continue; /* We found one! Move it up to pair and remove it from the old location */ |