Reviewed-by: Connor Abbott <cwabbo...@gmail.com>
On Fri, Nov 6, 2015 at 1:59 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote: > Previously, we were assuming that everything read/wrote exactly 1 logical > GRF (1 in SIMD8 and 2 in SIMD16). This isn't actually true. In > particular, the PLN instruction reads 2 logical registers in one of the > components. This commit changes post-RA scheduling to use regs_read and > regs_written instead so that we add enough dependencies. > > Cc: Connor Abbott <cwabbo...@gmail.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92770 > --- > src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp > b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp > index 88c45f7..d21bc67 100644 > --- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp > +++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp > @@ -927,7 +927,6 @@ fs_instruction_scheduler::calculate_deps() > * granular level. > */ > schedule_node *last_fixed_grf_write = NULL; > - int reg_width = v->dispatch_width / 8; > > /* The last instruction always needs to still be the last > * instruction. Either it's flow control (IF, ELSE, ENDIF, DO, > @@ -964,10 +963,7 @@ fs_instruction_scheduler::calculate_deps() > (inst->src[i].fixed_hw_reg.file == > BRW_GENERAL_REGISTER_FILE)) { > if (post_reg_alloc) { > - int size = reg_width; > - if (inst->src[i].fixed_hw_reg.vstride == > BRW_VERTICAL_STRIDE_0) > - size = 1; > - for (int r = 0; r < size; r++) > + for (int r = 0; r < inst->regs_read(i); r++) > add_dep(last_grf_write[inst->src[i].fixed_hw_reg.nr + r], > n); > } else { > add_dep(last_fixed_grf_write, n); > @@ -1031,7 +1027,7 @@ fs_instruction_scheduler::calculate_deps() > } else if (inst->dst.file == HW_REG && > inst->dst.fixed_hw_reg.file == BRW_GENERAL_REGISTER_FILE) { > if (post_reg_alloc) { > - for (int r = 0; r < reg_width; r++) > + for (int r = 0; r < inst->regs_written; r++) > last_grf_write[inst->dst.fixed_hw_reg.nr + r] = n; > } else { > last_fixed_grf_write = n; > @@ -1093,10 +1089,7 @@ fs_instruction_scheduler::calculate_deps() > (inst->src[i].fixed_hw_reg.file == > BRW_GENERAL_REGISTER_FILE)) { > if (post_reg_alloc) { > - int size = reg_width; > - if (inst->src[i].fixed_hw_reg.vstride == > BRW_VERTICAL_STRIDE_0) > - size = 1; > - for (int r = 0; r < size; r++) > + for (int r = 0; r < inst->regs_read(i); r++) > add_dep(n, last_grf_write[inst->src[i].fixed_hw_reg.nr + > r], 0); > } else { > add_dep(n, last_fixed_grf_write, 0); > @@ -1159,7 +1152,7 @@ fs_instruction_scheduler::calculate_deps() > } else if (inst->dst.file == HW_REG && > inst->dst.fixed_hw_reg.file == BRW_GENERAL_REGISTER_FILE) { > if (post_reg_alloc) { > - for (int r = 0; r < reg_width; r++) > + for (int r = 0; r < inst->regs_written; r++) > last_grf_write[inst->dst.fixed_hw_reg.nr + r] = n; > } else { > last_fixed_grf_write = n; > -- > 2.5.0.400.gff86faf > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
