From 5898afba531c65db7b2faf83fcec1b1e5a9a7734 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Thu, 19 May 2022 17:54:38 +0100
Subject: [PATCH] aco: include flat-like in vmem clause statistics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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/17079>
---
 src/amd/compiler/aco_statistics.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_statistics.cpp b/src/amd/compiler/aco_statistics.cpp
index 6d5e2267eca..1ad1fb476e0 100644
--- a/src/amd/compiler/aco_statistics.cpp
+++ b/src/amd/compiler/aco_statistics.cpp
@@ -447,7 +447,8 @@ collect_preasm_stats(Program* program)
          if (instr->opcode == aco_opcode::p_constaddr)
             program->statistics[statistic_instructions] += 2;
 
-         if (instr->isVMEM() && !instr->operands.empty()) {
+         if ((instr->isVMEM() || instr->isScratch() || instr->isGlobal()) &&
+             !instr->operands.empty()) {
             if (std::none_of(vmem_clause.begin(), vmem_clause.end(),
                              [&](Instruction* other)
                              { return should_form_clause(instr.get(), other); }))