From 5c9d2ed78d61c63532e9fbeeca30393d65113bc2 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 17 Nov 2020 13:50:10 +0000 Subject: [PATCH] aco: use clear() helper instead of writing reg file directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_register_allocation.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp index ae371cae9fc..5ad2a296947 100644 --- a/src/amd/compiler/aco_register_allocation.cpp +++ b/src/amd/compiler/aco_register_allocation.cpp @@ -2032,10 +2032,9 @@ void register_allocation(Program *program, std::vector& live_out_per_bloc if (phi->operands[idx].isTemp() && phi->operands[idx].getTemp().type() == RegType::sgpr && phi->operands[idx].isFirstKillBeforeDef()) { - Temp phi_op = read_variable(ctx, phi->operands[idx].getTemp(), block.index); - PhysReg reg = ctx.assignments[phi_op.id()].reg; - assert(register_file[reg] == phi_op.id()); - register_file[reg] = 0; + Definition phi_op(read_variable(ctx, phi->operands[idx].getTemp(), block.index)); + phi_op.setFixed(ctx.assignments[phi_op.tempId()].reg); + register_file.clear(phi_op); } } else if (phi->opcode != aco_opcode::p_linear_phi) { break;