fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/fs: Make compact_virtual_grfs an optimization pass

Browse source 
Previously we disabled compact_virtual_grfs when dumping optimizations.
The idea here was to make it easier to diff the dumped shader because you
didn't have a sudden renaming.  However, sometimes a bug is affected by
compact_virtual_grfs and, when this happens, you want to keep dumping
instructions with compact_virtual_grfs enabled.  By turning it into an
optimization pass and dumping it along with the others, we retain the
ability to diff because you can just diff against the compact_virtual_grf
output.

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-09-16 13:14:09 -07:00
parent a25db10c12
commit 2af4b0aeaf
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -1770,12 +1770,10 @@ fs_visitor::split_virtual_grfs()
* to loop over all the virtual GRFs. Compacting them can save a lot of
* overhead.
*/
void
bool
fs_visitor::compact_virtual_grfs()
{
if (unlikely(INTEL_DEBUG & DEBUG_OPTIMIZER))
return;
bool progress = false;
int remap_table[this->virtual_grf_count];
memset(remap_table, -1, sizeof(remap_table));
@ -1793,7 +1791,12 @@ fs_visitor::compact_virtual_grfs()
/* Compact the GRF arrays. */
int new_index = 0;
for (int i = 0; i < this->virtual_grf_count; i++) {
if (remap_table[i] != -1) {
if (remap_table[i] == -1) {
/* We just found an unused register. This means that we are
* actually going to compact something.
*/
progress = true;
} else {
remap_table[i] = new_index;
virtual_grf_sizes[new_index] = virtual_grf_sizes[i];
invalidate_live_intervals();
@ -1836,6 +1839,8 @@ fs_visitor::compact_virtual_grfs()
}
}
}
return progress;
}
/*
@ -3276,8 +3281,6 @@ fs_visitor::run()
iteration++;
int pass_num = 0;
compact_virtual_grfs();
OPT(remove_duplicate_mrf_writes);
OPT(opt_algebraic);
@ -3291,6 +3294,8 @@ fs_visitor::run()
OPT(opt_saturate_propagation);
OPT(register_coalesce);
OPT(compute_to_mrf);
OPT(compact_virtual_grfs);
} while (progress);
if (lower_load_payload()) {

2
src/mesa/drivers/dri/i965/brw_fs.h
View file

@ -325,7 +325,7 @@ public:
int choose_spill_reg(struct ra_graph *g);
void spill_reg(int spill_reg);
void split_virtual_grfs();
void compact_virtual_grfs();
bool compact_virtual_grfs();
void move_uniform_array_access_to_pull_constants();
void assign_constant_locations();
void demote_pull_constants();