pan/midgard: Add bizarre corner case
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Mon, 4 Nov 2019 15:40:37 +0000 (10:40 -0500)
committerAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Mon, 4 Nov 2019 20:36:08 +0000 (15:36 -0500)
Someone really needs to look into this.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
src/panfrost/midgard/midgard_ra.c

index 3060dd7c59f1bf9590b9c1009697d301b3d58e52..534d095eac1efc4d02830cb3a98125a63bcede9e 100644 (file)
@@ -534,10 +534,17 @@ mir_compute_segment_interference(
                         if (bun->instructions[j]->src[s] >= ctx->temp_count)
                                 continue;
 
-                        for (unsigned q = pivot; q < j; ++q) {
+                        for (unsigned q = pivot; q < i; ++q) {
                                 if (bun->instructions[q]->dest >= ctx->temp_count)
                                         continue;
 
+                                /* See dEQP-GLES2.functional.shaders.return.output_write_in_func_dynamic_fragment */
+
+                                if (q >= j) {
+                                        if (!(bun->instructions[j]->unit == UNIT_SMUL && bun->instructions[q]->unit == UNIT_VLUT))
+                                                continue;
+                                }
+
                                 ra_add_node_interference(l, bun->instructions[q]->dest, bun->instructions[j]->src[s]);
                         }
                 }