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

aco/ra: also prevent overflow register for p_create_vector operands

Browse source 
Fixes: d659ce0d6c ('aco/ra: prevent underflow register for p_create_vector operands')
Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10832>
(cherry picked from commit b960169257)
This commit is contained in:
Daniel Schürmann 2021-05-17 10:39:24 +02:00 • committed by Eric Engestrom
parent 33d52db1f0
commit 3838cc6010
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -112,7 +112,7 @@
"description": "aco/ra: also prevent overflow register for p_create_vector operands",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "d659ce0d6c5781a1230b182ef5ed1a77de485565"
},

14
src/amd/compiler/aco_register_allocation.cpp
View file

@ -1188,7 +1188,10 @@ bool get_reg_specified(ra_ctx& ctx,
aco_ptr<Instruction>& instr,
PhysReg reg)
{
assert(reg <= 511);
/* catch out-of-range registers */
if (reg >= PhysReg{512})
return false;
std::pair<unsigned, unsigned> sdw_def_info;
if (rc.is_subdword())
sdw_def_info = get_subdword_definition_info(ctx.program, instr, rc);
@ -1387,12 +1390,9 @@ PhysReg get_reg(ra_ctx& ctx,
op.getTemp().type() == temp.type() &&
ctx.assignments[op.tempId()].assigned) {
PhysReg reg = ctx.assignments[op.tempId()].reg;
/* prevent underflow */
if (int(reg.reg_b + byte_offset - k) >= 0) {
reg.reg_b += (byte_offset - k);
if (get_reg_specified(ctx, reg_file, temp.regClass(), instr, reg))
return reg;
}
reg.reg_b += (byte_offset - k);
if (get_reg_specified(ctx, reg_file, temp.regClass(), instr, reg))
return reg;
}
k += op.bytes();
}