fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vc4: Make vc4_qir_schedule handle each block in the program.

Browse source 
Basically we just treat each block independently.  The only inter-block
scheduling I can think of that would be be interesting would be to move
texture result collection to after a short loop/if block that doesn't do
texturing.  However, the kernel disallows that as part of its security
validation.
This commit is contained in:
Eric Anholt 2016-01-19 14:15:54 -08:00
parent 46ec025ba9
commit f2eb8e3052
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/gallium/drivers/vc4/vc4_qir_schedule.c
View file

@ -514,7 +514,8 @@ compute_delay(struct schedule_node *n)
}
static void
schedule_instructions(struct vc4_compile *c, struct schedule_state *state)
schedule_instructions(struct vc4_compile *c,
struct qblock *block, struct schedule_state *state)
{
if (debug) {
fprintf(stderr, "initial deps:\n");
@ -546,7 +547,7 @@ schedule_instructions(struct vc4_compile *c, struct schedule_state *state)
/* Schedule this instruction back onto the QIR list. */
list_del(&chosen->link);
list_add(&inst->link, &c->cur_block->instructions);
list_add(&inst->link, &block->instructions);
/* Now that we've scheduled a new instruction, some of its
* children can be promoted to the list of instructions ready to
@ -580,25 +581,20 @@ schedule_instructions(struct vc4_compile *c, struct schedule_state *state)
}
}
void
qir_schedule_instructions(struct vc4_compile *c)
static void
qir_schedule_instructions_block(struct vc4_compile *c,
struct qblock *block)
{
void *mem_ctx = ralloc_context(NULL);
struct schedule_state state = { { 0 } };
if (debug) {
fprintf(stderr, "Pre-schedule instructions\n");
qir_dump(c);
}
state.temp_writes = rzalloc_array(mem_ctx, uint32_t, c->num_temps);
state.temp_live = rzalloc_array(mem_ctx, BITSET_WORD,
BITSET_WORDS(c->num_temps));
list_inithead(&state.worklist);
/* Wrap each instruction in a scheduler structure. */
list_for_each_entry_safe(struct qinst, inst,
&c->cur_block->instructions, link) {
qir_for_each_inst_safe(inst, block) {
struct schedule_node *n = rzalloc(mem_ctx, struct schedule_node);
n->inst = inst;
@ -617,12 +613,25 @@ qir_schedule_instructions(struct vc4_compile *c)
list_for_each_entry(struct schedule_node, n, &state.worklist, link)
compute_delay(n);
schedule_instructions(c, &state);
schedule_instructions(c, block, &state);
ralloc_free(mem_ctx);
}
void
qir_schedule_instructions(struct vc4_compile *c)
{
if (debug) {
fprintf(stderr, "Pre-schedule instructions\n");
qir_dump(c);
}
qir_for_each_block(block, c)
qir_schedule_instructions_block(c, block);
if (debug) {
fprintf(stderr, "Post-schedule instructions\n");
qir_dump(c);
}
ralloc_free(mem_ctx);
}