From bd07118b56dde5ec47e6823cdfbfc4f5195e6fd4 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Mon, 2 Aug 2021 16:13:16 +0100
Subject: [PATCH] aco/nops: use up-to-date mask_size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fossil-db (Pitcairn):
Totals from 6 (0.00% of 129702) affected shaders:
CodeSize: 8760 -> 8736 (-0.27%)
Instrs: 1714 -> 1708 (-0.35%)
Latency: 12325 -> 12302 (-0.19%)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12720>
---
 src/amd/compiler/aco_insert_NOPs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp
index edc52c33040..2dc2a8d60ad 100644
--- a/src/amd/compiler/aco_insert_NOPs.cpp
+++ b/src/amd/compiler/aco_insert_NOPs.cpp
@@ -202,10 +202,10 @@ int
 handle_raw_hazard_internal(Program* program, Block* block, int nops_needed, PhysReg reg,
                            uint32_t mask)
 {
-   unsigned mask_size = util_last_bit(mask);
    for (int pred_idx = block->instructions.size() - 1; pred_idx >= 0; pred_idx--) {
       aco_ptr<Instruction>& pred = block->instructions[pred_idx];
 
+      unsigned mask_size = util_last_bit(mask);
       uint32_t writemask = 0;
       for (Definition& def : pred->definitions) {
          if (regs_intersect(reg, mask_size, def.physReg(), def.size())) {