Mesa (main): aco/ra: fix get_reg_for_operand() in case of stride mismatches

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d36a43598c2dd2c490e8e8cb901d067fa56aeb8d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d36a43598c2dd2c490e8e8cb901d067fa56aeb8d

Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Tue Dec 21 12:17:24 2021 +0100

aco/ra: fix get_reg_for_operand() in case of stride mismatches

We have to clear the register file from the previous operand
as otherwise, there might be no space left.

Totals from 5 (0.00% of 134572) affected shaders: (GFX10.3)
CodeSize: 21144 -> 21000 (-0.68%); split: -0.72%, +0.04%
Instrs: 3738 -> 3720 (-0.48%); split: -0.51%, +0.03%
Latency: 517229 -> 516319 (-0.18%); split: -0.18%, +0.00%
InvThroughput: 49068 -> 48902 (-0.34%); split: -0.38%, +0.04%
Copies: 501 -> 483 (-3.59%); split: -3.79%, +0.20%

Cc: mesa-stable
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14279>

---

 src/amd/compiler/aco_register_allocation.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp
index 530d7d2e177..088afaa307c 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -1934,10 +1934,9 @@ get_reg_for_operand(ra_ctx& ctx, RegisterFile& register_file,
       dst = operand.physReg();
 
    } else {
+      /* clear the operand in case it's only a stride mismatch */
+      register_file.clear(src, operand.regClass());
       dst = get_reg(ctx, register_file, operand.getTemp(), parallelcopy, instr, operand_index);
-      update_renames(
-         ctx, register_file, parallelcopy, instr,
-         instr->opcode != aco_opcode::p_create_vector ? rename_not_killed_ops : (UpdateRenames)0);
    }
 
    Operand pc_op = operand;