From 4602b52a1c1c1bf80a94276e4f8d3f6d6e282272 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 9 Sep 2024 17:36:56 -0500
Subject: [PATCH] nak: Add a NAK_SUBGROUP_SIZE #define

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31105>
---
 src/nouveau/compiler/nak.h     | 2 ++
 src/nouveau/compiler/nak_nir.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nouveau/compiler/nak.h b/src/nouveau/compiler/nak.h
index 1106d600dd8..d77ef9d9e11 100644
--- a/src/nouveau/compiler/nak.h
+++ b/src/nouveau/compiler/nak.h
@@ -17,6 +17,8 @@
 extern "C" {
 #endif
 
+#define NAK_SUBGROUP_SIZE 32
+
 struct nak_compiler;
 struct nir_shader_compiler_options;
 struct nv_device_info;
diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c
index 641ae34c006..d3cb7abb04f 100644
--- a/src/nouveau/compiler/nak_nir.c
+++ b/src/nouveau/compiler/nak_nir.c
@@ -47,7 +47,7 @@ nak_nir_workgroup_has_one_subgroup(const nir_shader *nir)
                        nir->info.workgroup_size[1] *
                        nir->info.workgroup_size[2];
 
-      return wg_sz <= 32;
+      return wg_sz <= NAK_SUBGROUP_SIZE;
    }
 
    default:
@@ -893,7 +893,7 @@ nak_postprocess_nir(nir_shader *nir,
    nak_optimize_nir(nir, nak);
 
    const nir_lower_subgroups_options subgroups_options = {
-      .subgroup_size = 32,
+      .subgroup_size = NAK_SUBGROUP_SIZE,
       .ballot_bit_size = 32,
       .ballot_components = 1,
       .lower_to_scalar = true,