From 0f97e4aa796489224d21ee05f0f880b6b7b5bcdb Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Sun, 26 Apr 2026 22:36:59 +0200
Subject: [PATCH] r600/sfn: deduplicate optimizer logging code

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Assisted-by: Copilot (auto mode)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41945>
---
 .../drivers/r600/sfn/sfn_optimizer.cpp        | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
index 3c84ffc57f1..7dff7a05a26 100644
--- a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
@@ -22,17 +22,23 @@
 
 namespace r600 {
 
-bool
-optimize(Shader& shader)
+static void
+log_shader_dump(const Shader& shader, const char *header)
 {
-   bool progress;
-
-   sfn_log << SfnLog::opt << "Shader before optimization\n";
+   sfn_log << SfnLog::opt << header;
    if (sfn_log.has_debug_flag(SfnLog::opt)) {
       std::stringstream ss;
       shader.print(ss);
       sfn_log << ss.str() << "\n\n";
    }
+}
+
+bool
+optimize(Shader& shader)
+{
+   bool progress;
+
+   log_shader_dump(shader, "Shader before optimization\n");
 
    do {
       progress = false;
@@ -96,12 +102,7 @@ dead_code_elimination(Shader& shader)
 
    } while (dce.progress);
 
-   sfn_log << SfnLog::opt << "Shader after DCE\n";
-   if (sfn_log.has_debug_flag(SfnLog::opt)) {
-      std::stringstream ss;
-      shader.print(ss);
-      sfn_log << ss.str() << "\n\n";
-   }
+   log_shader_dump(shader, "Shader after DCE\n");
 
    return dce.progress;
 }
@@ -284,12 +285,7 @@ copy_propagation_fwd(Shader& shader)
          b->accept(copy_prop);
    } while (copy_prop.progress);
 
-   sfn_log << SfnLog::opt << "Shader after Copy Prop forward\n";
-   if (sfn_log.has_debug_flag(SfnLog::opt)) {
-      std::stringstream ss;
-      shader.print(ss);
-      sfn_log << ss.str() << "\n\n";
-   }
+   log_shader_dump(shader, "Shader after Copy Prop forward\n");
 
    return copy_prop.progress;
 }
@@ -305,12 +301,7 @@ copy_propagation_backward(Shader& shader)
          b->accept(copy_prop);
    } while (copy_prop.progress);
 
-   sfn_log << SfnLog::opt << "Shader after Copy Prop backwards\n";
-   if (sfn_log.has_debug_flag(SfnLog::opt)) {
-      std::stringstream ss;
-      shader.print(ss);
-      sfn_log << ss.str() << "\n\n";
-   }
+   log_shader_dump(shader, "Shader after Copy Prop backwards\n");
 
    return copy_prop.progress;
 }