Module: Mesa
Branch: main
Commit: 423773faa9c239d54323654e71f2b7147ae7f647
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=423773faa9c239d54323654e71f2b7147ae7f647

Author: Alyssa Rosenzweig <[email protected]>
Date:   Fri Jul 23 18:04:24 2021 -0400

pan/bi: Don't analyze td on Valhall

The implementation is based on clauses, so it won't work on Valhall.

Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16410>

---

 src/panfrost/bifrost/bifrost_compile.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c 
b/src/panfrost/bifrost/bifrost_compile.c
index a2d543bd45a..835e8655693 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -4688,10 +4688,13 @@ bi_compile_variant_nir(nir_shader *nir,
         if (ctx->arch <= 8) {
                 bi_schedule(ctx);
                 bi_assign_scoreboard(ctx);
-        }
 
-        /* Analyze after scheduling since we depend on instruction order. */
-        bi_analyze_helper_terminate(ctx);
+                /* Analyze after scheduling since we depend on instruction
+                 * order. This routine assumes the IR is using clauses, so it 
is
+                 * Bifrost only.
+                 */
+                bi_analyze_helper_terminate(ctx);
+        }
 
         if (bifrost_debug & BIFROST_DBG_SHADERS && !skip_internal)
                 bi_print_shader(ctx, stdout);

Reply via email to