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

intel/compiler: Add only available instructions to scheduling list

Browse source 
The list was used for iterating through all instructions and then
later also to track the available ones.  Now that the array iteration
is used, change how we fill it and rename it to reflect its only job.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25841>
This commit is contained in:
Caio Oliveira 2023-10-20 00:39:04 -07:00 • committed by Marge Bot
parent ddff6428c5
commit 8a8dd2db0c
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/intel/compiler/brw_schedule_instructions.cpp
View file

@ -616,7 +616,6 @@ public:
this->lin_ctx = linear_context(this->mem_ctx); this->lin_ctx = linear_context(this->mem_ctx);
this->grf_count = grf_count; this->grf_count = grf_count;
this->hw_reg_count = hw_reg_count; this->hw_reg_count = hw_reg_count;
this->instructions.make_empty();
this->post_reg_alloc = (mode == SCHEDULE_POST); this->post_reg_alloc = (mode == SCHEDULE_POST);
this->mode = mode; this->mode = mode;
this->reg_pressure = 0; this->reg_pressure = 0;
@ -736,13 +735,13 @@ public:
int len; int len;
int time; int time;
exec_list available;
} current; } current;
bool post_reg_alloc; bool post_reg_alloc;
int grf_count; int grf_count;
unsigned hw_reg_count; unsigned hw_reg_count;
int reg_pressure; int reg_pressure;
exec_list instructions;
const backend_shader *bs; const backend_shader *bs;
instruction_scheduler_mode mode; instruction_scheduler_mode mode;
@ -1030,11 +1029,6 @@ instruction_scheduler::set_current_block(bblock_t *block)
current.len = block->end_ip - block->start_ip + 1; current.len = block->end_ip - block->start_ip + 1;
current.end = current.start + current.len; current.end = current.start + current.len;
current.time = 0; current.time = 0;
assert(instructions.is_empty());
for (schedule_node *n = current.start; n < current.end; n++) {
instructions.push_tail(n);
}
} }
/** Computation of the delay member of each node. */ /** Computation of the delay member of each node. */
@ -1696,7 +1690,7 @@ fs_instruction_scheduler::choose_instruction_to_schedule()
* choose the one most likely to unblock an early program exit, or * choose the one most likely to unblock an early program exit, or
* otherwise the oldest one. * otherwise the oldest one.
*/ */
foreach_in_list(schedule_node, n, &instructions) { foreach_in_list(schedule_node, n, &current.available) {
if (!chosen || if (!chosen ||
exit_unblocked_time(n) < exit_unblocked_time(chosen) || exit_unblocked_time(n) < exit_unblocked_time(chosen) ||
(exit_unblocked_time(n) == exit_unblocked_time(chosen) && (exit_unblocked_time(n) == exit_unblocked_time(chosen) &&
@ -1714,7 +1708,7 @@ fs_instruction_scheduler::choose_instruction_to_schedule()
* shaders which naturally do a better job of hiding instruction * shaders which naturally do a better job of hiding instruction
* latency. * latency.
*/ */
foreach_in_list(schedule_node, n, &instructions) { foreach_in_list(schedule_node, n, &current.available) {
fs_inst *inst = (fs_inst *)n->inst; fs_inst *inst = (fs_inst *)n->inst;
if (!chosen) { if (!chosen) {
@ -1823,7 +1817,7 @@ vec4_instruction_scheduler::choose_instruction_to_schedule()
/* Of the instructions ready to execute or the closest to being ready, /* Of the instructions ready to execute or the closest to being ready,
* choose the oldest one. * choose the oldest one.
*/ */
foreach_in_list(schedule_node, n, &instructions) { foreach_in_list(schedule_node, n, &current.available) {
if (!chosen || n->unblocked_time < chosen_time) { if (!chosen || n->unblocked_time < chosen_time) {
chosen = n; chosen = n;
chosen_time = n->unblocked_time; chosen_time = n->unblocked_time;
@ -1863,14 +1857,15 @@ instruction_scheduler::schedule_instructions()
int scheduled = 0; int scheduled = 0;
/* Remove non-DAG heads from the list. */ /* Add DAG heads to the list of available instructions. */
current.available.make_empty();
for (schedule_node *n = current.start; n < current.end; n++) { for (schedule_node *n = current.start; n < current.end; n++) {
if (n->parent_count != 0) if (n->parent_count == 0)
n->remove(); current.available.push_tail(n);
} }
unsigned cand_generation = 1; unsigned cand_generation = 1;
while (!instructions.is_empty()) { while (!current.available.is_empty()) {
schedule_node *chosen = choose_instruction_to_schedule(); schedule_node *chosen = choose_instruction_to_schedule();
/* Schedule this instruction. */ /* Schedule this instruction. */
@ -1927,7 +1922,7 @@ instruction_scheduler::schedule_instructions()
if (debug) { if (debug) {
fprintf(stderr, "\t\tnow available\n"); fprintf(stderr, "\t\tnow available\n");
} }
instructions.push_head(child); current.available.push_head(child);
} }
} }
cand_generation++; cand_generation++;
@ -1938,7 +1933,7 @@ instruction_scheduler::schedule_instructions()
* is done. * is done.
*/ */
if (devinfo->ver < 6 && chosen->inst->is_math()) { if (devinfo->ver < 6 && chosen->inst->is_math()) {
foreach_in_list(schedule_node, n, &instructions) { foreach_in_list(schedule_node, n, &current.available) {
if (n->inst->is_math()) if (n->inst->is_math())
n->unblocked_time = MAX2(n->unblocked_time, n->unblocked_time = MAX2(n->unblocked_time,
current.time + chosen->latency); current.time + chosen->latency);