etnaviv: keep track of emitted loops

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Wladimir J. van der Laan <laanwj@gmail.com>

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
index 7446a1970b2f9c74a2951375bdd44c6d758b6d5e..af7b64d0ad1a42b17e86e5e902b746fe0cac71a2 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c
@@ -183,6 +183,8 @@ struct etna_compile {
    unsigned labels_count, labels_sz;
    struct etna_compile_label *labels;
 
+   unsigned num_loops;
+
    /* Code generation */
    int inst_ptr; /* current instruction pointer */
    uint32_t code[ETNA_MAX_INSTRUCTIONS * ETNA_INST_SIZE];
@@ -1166,6 +1168,8 @@ trans_loop_bgn(const struct instr_translater *t, struct etna_compile *c,
    f->lbl_loop_end = alloc_new_label(c);
 
    label_place(c, f->lbl_loop_bgn);
+
+   c->num_loops++;
 }
 
 static void
@@ -2418,6 +2422,7 @@ etna_compile_shader(const struct etna_specs *specs,
    shader->processor = c->info.processor;
    shader->code_size = c->inst_ptr * 4;
    shader->code = mem_dup(c->code, c->inst_ptr * 16);
+   shader->num_loops = c->num_loops;
    shader->num_temps = c->next_free_native;
    shader->vs_pos_out_reg = -1;
    shader->vs_pointsize_out_reg = -1;
@@ -2455,6 +2460,7 @@ etna_dump_shader(const struct etna_shader *shader)
 
    etna_disasm(shader->code, shader->code_size, PRINT_RAW);
 
+   printf("num loops: %i\n", shader->num_loops);
    printf("num temps: %i\n", shader->num_temps);
    printf("num const: %i\n", shader->uniforms.const_count);
    printf("immediates:\n");

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
index d3101096f985ac80ccd74a5a6817b2f37d2e6a47..211ae1abdfefd54474dfb2cb5d7b8e1d6af6fc43 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
@@ -59,6 +59,7 @@ struct etna_shader {
    uint processor; /* TGSI_PROCESSOR_... */
    uint32_t code_size; /* code size in uint32 words */
    uint32_t *code;
+   unsigned num_loops;
    unsigned num_temps;
 
    struct etna_shader_uniform_info uniforms;