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

brw/reg_allocate: Don't access out of bounds in non-debug builds

Browse source 
In debug builds, the assertion should be preferred as it will highlight
the actual problem. In non-debug builds, it is possible to fail register
allocation more gracefully. If the problem only occurs in, for example,
a SIMD32 version of a shader, the application may even continue to
function.

Closes: #13239
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36202>
This commit is contained in:
Ian Romanick 2025-07-16 10:11:51 -07:00 • committed by Marge Bot
parent c83f481cdd
commit f6da6399d7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/intel/compiler/brw_reg_allocate.cpp
View file

@ -289,7 +289,7 @@ private:
void setup_live_interference(unsigned node, brw_range ip_range);
void setup_inst_interference(const brw_inst *inst);
void build_interference_graph(bool allow_spilling);
bool build_interference_graph(bool allow_spilling);
brw_reg build_ex_desc(const brw_builder &bld, unsigned reg_size, bool unspill);
@ -654,7 +654,7 @@ brw_reg_alloc::setup_inst_interference(const brw_inst *inst)
}
}
void
bool
brw_reg_alloc::build_interference_graph(bool allow_spilling)
{
/* Compute the RA node layout */
@ -701,8 +701,13 @@ brw_reg_alloc::build_interference_graph(bool allow_spilling)
for (unsigned i = 0; i < fs->alloc.count; i++) {
unsigned size = DIV_ROUND_UP(fs->alloc.sizes[i], reg_unit(devinfo));
#ifndef NDEBUG
assert(size <= ARRAY_SIZE(compiler->reg_set.classes) &&
"Register allocation relies on split_virtual_grfs()");
#else
if (size > ARRAY_SIZE(compiler->reg_set.classes))
return false;
#endif
ra_set_node_class(g, first_vgrf_node + i,
compiler->reg_set.classes[size - 1]);
@ -716,6 +721,8 @@ brw_reg_alloc::build_interference_graph(bool allow_spilling)
*/
foreach_block_and_inst(block, brw_inst, inst, fs->cfg)
setup_inst_interference(inst);
return true;
}
brw_reg
@ -1309,7 +1316,8 @@ brw_reg_alloc::spill_reg(unsigned spill_reg)
bool
brw_reg_alloc::assign_regs(bool allow_spilling, bool spill_all)
{
build_interference_graph(allow_spilling);
if (!build_interference_graph(allow_spilling))
return false;
unsigned spilled = 0;
while (1) {