From 77a4e8b7a47b60b6524342de1fadaea4fc10bc62 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 28 Feb 2024 18:21:49 +0100 Subject: [PATCH] aco: create pseudo instructions with correct struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Reviewed-by: Timur Kristóf Reviewed-by: Daniel Schürmann Part-of: (cherry picked from commit b0554ab0a1263bd4c8340860c4055b6832f7225a) --- .pick_status.json | 2 +- src/amd/compiler/aco_reduce_assign.cpp | 2 +- src/amd/compiler/aco_register_allocation.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 21beea303e6..c701edcafa7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1004,7 +1004,7 @@ "description": "aco: create pseudo instructions with correct struct", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/aco_reduce_assign.cpp b/src/amd/compiler/aco_reduce_assign.cpp index 83514206d46..55fc525e485 100644 --- a/src/amd/compiler/aco_reduce_assign.cpp +++ b/src/amd/compiler/aco_reduce_assign.cpp @@ -79,7 +79,7 @@ setup_reduce_temp(Program* program) * Here, the linear vgpr is used before any phi copies, so this isn't necessary. */ if (inserted_at >= 0) { - aco_ptr end{create_instruction( + aco_ptr end{create_instruction( aco_opcode::p_end_linear_vgpr, Format::PSEUDO, vtmp_inserted_at >= 0 ? 2 : 1, 0)}; end->operands[0] = Operand(reduceTmp); if (vtmp_inserted_at >= 0) diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp index 989e566fa26..9c06c84674c 100644 --- a/src/amd/compiler/aco_register_allocation.cpp +++ b/src/amd/compiler/aco_register_allocation.cpp @@ -96,9 +96,9 @@ struct ra_ctx { renames(program->blocks.size()), policy(policy_) { pseudo_dummy.reset( - create_instruction(aco_opcode::p_parallelcopy, Format::PSEUDO, 0, 0)); + create_instruction(aco_opcode::p_parallelcopy, Format::PSEUDO, 0, 0)); phi_dummy.reset( - create_instruction(aco_opcode::p_linear_phi, Format::PSEUDO, 0, 0)); + create_instruction(aco_opcode::p_linear_phi, Format::PSEUDO, 0, 0)); sgpr_limit = get_addr_sgpr_from_waves(program, program->min_waves); vgpr_limit = get_addr_vgpr_from_waves(program, program->min_waves); }