intel/compiler: Mark virtual_grf_interferes and vars_interfere as const

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>
This commit is contained in:
Francisco Jerez
2016-03-09 17:44:55 -08:00
committed by Matt Turner
parent ab6d792986
commit 3ceb496cdf
5 changed files with 6 additions and 6 deletions

View File

@@ -151,7 +151,7 @@ public:
bool remove_extra_rounding_modes(); bool remove_extra_rounding_modes();
bool opt_sampler_eot(); bool opt_sampler_eot();
bool virtual_grf_interferes(int a, int b); bool virtual_grf_interferes(int a, int b) const;
void schedule_instructions(instruction_scheduler_mode mode); void schedule_instructions(instruction_scheduler_mode mode);
void insert_gen4_send_dependency_workarounds(); void insert_gen4_send_dependency_workarounds();
void insert_gen4_pre_send_dependency_workarounds(bblock_t *block, void insert_gen4_pre_send_dependency_workarounds(bblock_t *block,

View File

@@ -352,14 +352,14 @@ fs_visitor::calculate_live_intervals()
} }
bool bool
fs_live_variables::vars_interfere(int a, int b) fs_live_variables::vars_interfere(int a, int b) const
{ {
return !(end[b] <= start[a] || return !(end[b] <= start[a] ||
end[a] <= start[b]); end[a] <= start[b]);
} }
bool bool
fs_visitor::virtual_grf_interferes(int a, int b) fs_visitor::virtual_grf_interferes(int a, int b) const
{ {
return !(virtual_grf_end[a] <= virtual_grf_start[b] || return !(virtual_grf_end[a] <= virtual_grf_start[b] ||
virtual_grf_end[b] <= virtual_grf_start[a]); virtual_grf_end[b] <= virtual_grf_start[a]);

View File

@@ -81,7 +81,7 @@ public:
fs_live_variables(fs_visitor *v, const cfg_t *cfg); fs_live_variables(fs_visitor *v, const cfg_t *cfg);
~fs_live_variables(); ~fs_live_variables();
bool vars_interfere(int a, int b); bool vars_interfere(int a, int b) const;
int var_from_reg(const fs_reg &reg) const int var_from_reg(const fs_reg &reg) const
{ {
return var_from_vgrf[reg.nr] + reg.offset / REG_SIZE; return var_from_vgrf[reg.nr] + reg.offset / REG_SIZE;

View File

@@ -145,7 +145,7 @@ public:
bool dead_code_eliminate(); bool dead_code_eliminate();
int var_range_start(unsigned v, unsigned n) const; int var_range_start(unsigned v, unsigned n) const;
int var_range_end(unsigned v, unsigned n) const; int var_range_end(unsigned v, unsigned n) const;
bool virtual_grf_interferes(int a, int b); bool virtual_grf_interferes(int a, int b) const;
bool opt_cmod_propagation(); bool opt_cmod_propagation();
bool opt_copy_propagation(bool do_constant_prop = true); bool opt_copy_propagation(bool do_constant_prop = true);
bool opt_cse_local(bblock_t *block); bool opt_cse_local(bblock_t *block);

View File

@@ -335,7 +335,7 @@ vec4_visitor::var_range_end(unsigned v, unsigned n) const
} }
bool bool
vec4_visitor::virtual_grf_interferes(int a, int b) vec4_visitor::virtual_grf_interferes(int a, int b) const
{ {
return !((var_range_end(8 * alloc.offsets[a], 8 * alloc.sizes[a]) <= return !((var_range_end(8 * alloc.offsets[a], 8 * alloc.sizes[a]) <=
var_range_start(8 * alloc.offsets[b], 8 * alloc.sizes[b])) || var_range_start(8 * alloc.offsets[b], 8 * alloc.sizes[b])) ||