From cde72181b72bfae7e0decc5790f8e63ab1acc7c4 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 30 May 2024 13:25:27 +0300
Subject: [PATCH] anv: prevent asserts with debug printf in internal shaders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30539>
---
 src/intel/vulkan/anv_internal_kernels.c | 58 +++++++++++++++----------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/intel/vulkan/anv_internal_kernels.c b/src/intel/vulkan/anv_internal_kernels.c
index 8721827a45b..85c4d00610e 100644
--- a/src/intel/vulkan/anv_internal_kernels.c
+++ b/src/intel/vulkan/anv_internal_kernels.c
@@ -87,6 +87,14 @@ compile_shader(struct anv_device *device,
 
    link_libanv(nir, libanv);
 
+   if (INTEL_DEBUG(DEBUG_SHADER_PRINT)) {
+      nir_lower_printf_options printf_opts = {
+         .ptr_bit_size               = 64,
+         .use_printf_base_identifier = true,
+      };
+      NIR_PASS_V(nir, nir_lower_printf, &printf_opts);
+   }
+
    NIR_PASS_V(nir, nir_lower_vars_to_ssa);
    NIR_PASS_V(nir, nir_opt_cse);
    NIR_PASS_V(nir, nir_opt_gcm, true);
@@ -181,26 +189,28 @@ compile_shader(struct anv_device *device,
       };
       program = brw_compile_fs(compiler, &params);
 
-      unsigned stat_idx = 0;
-      if (prog_data.wm.dispatch_8) {
-         assert(stats[stat_idx].spills == 0);
-         assert(stats[stat_idx].fills == 0);
-         assert(stats[stat_idx].sends == sends_count_expectation);
-         stat_idx++;
-      }
-      if (prog_data.wm.dispatch_16) {
-         assert(stats[stat_idx].spills == 0);
-         assert(stats[stat_idx].fills == 0);
-         assert(stats[stat_idx].sends == sends_count_expectation);
-         stat_idx++;
-      }
-      if (prog_data.wm.dispatch_32) {
-         assert(stats[stat_idx].spills == 0);
-         assert(stats[stat_idx].fills == 0);
-         assert(stats[stat_idx].sends ==
-                sends_count_expectation *
-                (device->info->ver < 20 ? 2 : 1));
-         stat_idx++;
+      if (!INTEL_DEBUG(DEBUG_SHADER_PRINT)) {
+         unsigned stat_idx = 0;
+         if (prog_data.wm.dispatch_8) {
+            assert(stats[stat_idx].spills == 0);
+            assert(stats[stat_idx].fills == 0);
+            assert(stats[stat_idx].sends == sends_count_expectation);
+            stat_idx++;
+         }
+         if (prog_data.wm.dispatch_16) {
+            assert(stats[stat_idx].spills == 0);
+            assert(stats[stat_idx].fills == 0);
+            assert(stats[stat_idx].sends == sends_count_expectation);
+            stat_idx++;
+         }
+         if (prog_data.wm.dispatch_32) {
+            assert(stats[stat_idx].spills == 0);
+            assert(stats[stat_idx].fills == 0);
+            assert(stats[stat_idx].sends ==
+                   sends_count_expectation *
+                   (device->info->ver < 20 ? 2 : 1));
+            stat_idx++;
+         }
       }
    } else {
       struct brw_compile_stats stats;
@@ -217,9 +227,11 @@ compile_shader(struct anv_device *device,
       };
       program = brw_compile_cs(compiler, &params);
 
-      assert(stats.spills == 0);
-      assert(stats.fills == 0);
-      assert(stats.sends == sends_count_expectation);
+      if (!INTEL_DEBUG(DEBUG_SHADER_PRINT)) {
+         assert(stats.spills == 0);
+         assert(stats.fills == 0);
+         assert(stats.sends == sends_count_expectation);
+      }
    }
 
    assert(prog_data.base.total_scratch == 0);