Module: Mesa Branch: staging/21.1 Commit: 4afc5182ec213c70563a57a4a4d520181967740d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4afc5182ec213c70563a57a4a4d520181967740d
Author: Daniel Schürmann <[email protected]> Date: Mon May 17 10:39:24 2021 +0200 aco/ra: also prevent overflow register for p_create_vector operands Fixes: d659ce0d6c5781a1230b182ef5ed1a77de485565 ('aco/ra: prevent underflow register for p_create_vector operands') Reviewed-by: Tony Wasserka <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10832> (cherry picked from commit b960169257e42caca23c6e61c72bff7e53df123e) --- .pick_status.json | 2 +- src/amd/compiler/aco_register_allocation.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c3c4694a848..fd460507f98 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp index 82cb5f050e4..2923f7465f5 100644 --- a/src/amd/compiler/aco_register_allocation.cpp +++ b/src/amd/compiler/aco_register_allocation.cpp @@ -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(); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
