fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-11 05:10:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

i965: Remove NOP insertion kludge in scheduler.

Browse source 
Instead of removing every instruction in add_insts_from_block(), just
move the instruction to its scheduled location. This is a step towards
doing both bottom-up and top-down scheduling without conflicts.

Note that this patch changes cycle counts for programs because it begins
including control flow instructions in the estimates.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Matt Turner 2016-02-15 10:43:39 -08:00
parent a607f4aa57
commit b4e223cfbf
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
View file

@ -783,26 +783,13 @@ schedule_node::schedule_node(backend_instruction *inst,
void
instruction_scheduler::add_insts_from_block(bblock_t *block)
{
/* Removing the last instruction from a basic block removes the block as
* well, so put a NOP at the end to keep it alive.
*/
if (!block->end()->is_control_flow()) {
backend_instruction *nop = new(mem_ctx) backend_instruction();
nop->opcode = BRW_OPCODE_NOP;
block->end()->insert_after(block, nop);
}
foreach_inst_in_block_safe(backend_instruction, inst, block) {
if (inst->opcode == BRW_OPCODE_NOP || inst->is_control_flow())
continue;
foreach_inst_in_block(backend_instruction, inst, block) {
schedule_node *n = new(mem_ctx) schedule_node(inst, this);
this->instructions_to_schedule++;
inst->remove(block);
instructions.push_tail(n);
}
this->instructions_to_schedule = block->end_ip - block->start_ip + 1;
}
/** Recursive computation of the delay member of a node. */
@ -1463,7 +1450,6 @@ void
instruction_scheduler::schedule_instructions(bblock_t *block)
{
const struct brw_device_info *devinfo = bs->devinfo;
backend_instruction *inst = block->end();
time = 0;
if (!post_reg_alloc)
reg_pressure = reg_pressure_in[block->num];
@ -1482,7 +1468,8 @@ instruction_scheduler::schedule_instructions(bblock_t *block)
/* Schedule this instruction. */
assert(chosen);
chosen->remove();
inst->insert_before(block, chosen->inst);
chosen->inst->exec_node::remove();
block->instructions.push_tail(chosen->inst);
instructions_to_schedule--;
if (!post_reg_alloc) {
@ -1551,8 +1538,6 @@ instruction_scheduler::schedule_instructions(bblock_t *block)
}
}
if (block->end()->opcode == BRW_OPCODE_NOP)
block->end()->remove(block);
assert(instructions_to_schedule == 0);
block->cycle_count = time;