freedreno/a3xx/compiler: make compiler errors more useful

We probably should get rid of assert() entirely, but at this stage it is
more useful for things to crash where we can catch it in a debugger.
With compile_error() we have a single place to set an error flag (to
bail out and return an error on the next instruction) so that will be a
small change later when enough of the compiler bugs are sorted.

But re-arrange/cleanup the error/assert stuff so we at least get a dump
of the TGSI that triggered it.  So we see some useful output in piglit
logs.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_compiler.c b/src/gallium/drivers/freedreno/a3xx/fd3_compiler.c
index 772c7d2a2e35bd3e3c81b81b9f34961273a3b2d9..e6c5bb71e99f5b4cf6899fd8ae7b66938d2108e2 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_compiler.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_compiler.c
@@ -184,6 +184,21 @@ compile_init(struct fd3_compile_context *ctx, struct fd3_shader_stateobj *so,
        return ret;
 }
 
+static void
+compile_error(struct fd3_compile_context *ctx, const char *format, ...)
+{
+       va_list ap;
+       va_start(ap, format);
+       _debug_vprintf(format, ap);
+       va_end(ap);
+       tgsi_dump(ctx->tokens, 0);
+       assert(0);
+}
+
+#define compile_assert(ctx, cond) do { \
+               if (!(cond)) compile_error((ctx), "failed assert: "#cond"\n"); \
+       } while (0)
+
 static void
 compile_free(struct fd3_compile_context *ctx)
 {
@@ -212,9 +227,8 @@ add_dst_reg(struct fd3_compile_context *ctx, struct ir3_instruction *instr,
                num = dst->Index + ctx->base_reg[dst->File];
                break;
        default:
-               DBG("unsupported dst register file: %s",
+               compile_error(ctx, "unsupported dst register file: %s\n",
                        tgsi_file_name(dst->File));
-               assert(0);
                break;
        }
 
@@ -250,9 +264,8 @@ add_src_reg(struct fd3_compile_context *ctx, struct ir3_instruction *instr,
                num = src->Index + ctx->base_reg[src->File];
                break;
        default:
-               DBG("unsupported src register file: %s",
+               compile_error(ctx, "unsupported src register file: %s\n",
                        tgsi_file_name(src->File));
-               assert(0);
                break;
        }
 
@@ -329,6 +342,13 @@ get_internal_temp_repl(struct fd3_compile_context *ctx,
                tmp_src->SwizzleZ = tmp_src->SwizzleW = TGSI_SWIZZLE_X;
 }
 
+static inline bool
+is_const(struct tgsi_src_register *src)
+{
+       return (src->File == TGSI_FILE_CONSTANT) ||
+                       (src->File == TGSI_FILE_IMMEDIATE);
+}
+
 static void
 get_immediate(struct fd3_compile_context *ctx,
                struct tgsi_src_register *reg, uint32_t val)
@@ -578,8 +598,7 @@ trans_dotp(const struct instr_translater *t,
         * is a const.  Not sure if this is a hw bug, or simply that the
         * disassembler lies.
         */
-       if ((src1->File == TGSI_FILE_IMMEDIATE) ||
-                       (src1->File == TGSI_FILE_CONSTANT)) {
+       if (is_const(src1)) {
 
                /* the mov to tmp unswizzles src1, so now we have tmp.xyzw:
                 */
@@ -768,7 +787,7 @@ trans_samp(const struct instr_translater *t,
                flags |= IR3_INSTR_P;
                break;
        default:
-               assert(0);
+               compile_assert(ctx, 0);
                break;
        }
 
@@ -1187,7 +1206,7 @@ decl_out(struct fd3_compile_context *ctx, struct tgsi_full_declaration *decl)
        unsigned name = decl->Semantic.Name;
        unsigned i;
 
-       assert(decl->Declaration.Semantic);  // TODO is this ever not true?
+       compile_assert(ctx, decl->Declaration.Semantic);  // TODO is this ever not true?
 
        DBG("decl out[%d] -> r%d", name, decl->Range.First + base);   // XXX
 
@@ -1207,9 +1226,8 @@ decl_out(struct fd3_compile_context *ctx, struct tgsi_full_declaration *decl)
                                so->outputs[so->outputs_count++].regid = regid(i + base, 0);
                        break;
                default:
-                       DBG("unknown VS semantic name: %s",
+                       compile_error(ctx, "unknown VS semantic name: %s\n",
                                        tgsi_semantic_names[name]);
-                       assert(0);
                }
        } else {
                switch (name) {
@@ -1217,9 +1235,8 @@ decl_out(struct fd3_compile_context *ctx, struct tgsi_full_declaration *decl)
                        so->color_regid = regid(decl->Range.First + base, 0);
                        break;
                default:
-                       DBG("unknown VS semantic name: %s",
+                       compile_error(ctx, "unknown VS semantic name: %s\n",
                                        tgsi_semantic_names[name]);
-                       assert(0);
                }
        }
 }
@@ -1278,10 +1295,8 @@ compile_instructions(struct fd3_compile_context *ctx)
                                t->fxn(t, ctx, inst);
                                ctx->num_internal_temps = 0;
                        } else {
-                               debug_printf("unknown TGSI opc: %s\n",
+                               compile_error(ctx, "unknown TGSI opc: %s\n",
                                                tgsi_get_opcode_name(opc));
-                               tgsi_dump(ctx->tokens, 0);
-                               assert(0);
                        }
 
                        switch (inst->Instruction.Saturate) {
@@ -1319,6 +1334,8 @@ fd3_compile_shader(struct fd3_shader_stateobj *so,
 
        so->ir = ir3_shader_create();
 
+       assert(so->ir);
+
        so->color_regid = regid(63,0);
        so->pos_regid   = regid(63,0);
        so->psize_regid = regid(63,0);

diff --git a/src/gallium/drivers/freedreno/a3xx/ir-a3xx.h b/src/gallium/drivers/freedreno/a3xx/ir-a3xx.h
index 2fedc7bee385f461b2f6e0ee3f8a3c180145bc9e..61c01a7f528d51e4a045f7b7aa3c1c780bfe0957 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/ir-a3xx.h
+++ b/src/gallium/drivers/freedreno/a3xx/ir-a3xx.h
@@ -166,8 +166,7 @@ struct ir3_instruction {
        };
 };
 
-/* this is just large to cope w/ the large test *.asm: */
-#define MAX_INSTRS 10240
+#define MAX_INSTRS 1024
 
 struct ir3_shader {
        unsigned instrs_count;