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

r300: Keep rc_rename_regs() from overflowing RC_REGISTER_MAX_INDEX

Browse source 
This pass tries to move register usage closer to SSA, and for large
shaders this means we can overflow the register index, which only has
RC_REGISTER_INDEX_BITS size. This creates invalid code and leads to
crash at a later stage. Limit the pool of available registers to
RC_REGISTER_MAX_INDEX, currently is was two times the number of
shader instructions.

This means we'll fail the compile right away if we wanted more than
RC_REGISTER_MAX_INDEX temps, but when we've got that many we're
already well past how many instructions we can support anyway.

CC: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6017
Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17393>
(cherry picked from commit 42a3d22f16)
This commit is contained in:
Pavel Ondračka 2022-07-07 10:44:41 +02:00 • committed by Dylan Baker
parent 1678100c3c
commit a18fe93570
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -517,7 +517,7 @@
"description": "r300: Keep rc_rename_regs() from overflowing RC_REGISTER_MAX_INDEX",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

4
src/gallium/drivers/r300/compiler/radeon_rename_regs.c
View file

@ -29,6 +29,8 @@
* \file
*/
#include "util/u_math.h"
#include "radeon_rename_regs.h"
#include "radeon_compiler.h"
@ -60,7 +62,7 @@ void rc_rename_regs(struct radeon_compiler *c, void *user)
return;
}
used_length = 2 * rc_recompute_ips(c);
used_length = MIN2(2 * rc_recompute_ips(c), RC_REGISTER_MAX_INDEX);
used = memory_pool_malloc(&c->Pool, sizeof(unsigned char) * used_length);
memset(used, 0, sizeof(unsigned char) * used_length);