Mesa (master): nir: Remove nir_shader->shared_size.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4ca4de50f75bf1940e6b1867351a2ffcd8633cef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ca4de50f75bf1940e6b1867351a2ffcd8633cef

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Apr  8 00:52:18 2021 +0200

nir: Remove nir_shader->shared_size.

The same info is in shader_info. Dedupe.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10094>

---

 src/compiler/nir/nir.c               | 1 -
 src/compiler/nir/nir.h               | 3 ---
 src/compiler/nir/nir_clone.c         | 1 -
 src/compiler/nir/nir_lower_io.c      | 1 -
 src/compiler/nir/nir_print.c         | 2 +-
 src/compiler/nir/nir_serialize.c     | 2 --
 src/compiler/spirv/spirv_to_nir.c    | 1 -
 src/freedreno/ir3/ir3_compiler_nir.c | 2 +-
 8 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index d5a1d5b5ebd..12ae5cf818f 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -122,7 +122,6 @@ nir_shader_create(void *mem_ctx,
    shader->num_inputs = 0;
    shader->num_outputs = 0;
    shader->num_uniforms = 0;
-   shader->shared_size = 0;
 
    return shader;
 }
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 2f01cbaa375..60f4fe26b00 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -3466,9 +3466,6 @@ typedef struct nir_shader {
     */
    unsigned num_inputs, num_uniforms, num_outputs;
 
-   /** Size in bytes of required shared memory */
-   unsigned shared_size;
-
    /** Size in bytes of required scratch space */
    unsigned scratch_size;
 
diff --git a/src/compiler/nir/nir_clone.c b/src/compiler/nir/nir_clone.c
index b5cffe7eb7e..d35036ed7a2 100644
--- a/src/compiler/nir/nir_clone.c
+++ b/src/compiler/nir/nir_clone.c
@@ -773,7 +773,6 @@ nir_shader_clone(void *mem_ctx, const nir_shader *s)
    ns->num_inputs = s->num_inputs;
    ns->num_uniforms = s->num_uniforms;
    ns->num_outputs = s->num_outputs;
-   ns->shared_size = s->shared_size;
    ns->scratch_size = s->scratch_size;
 
    ns->constant_data_size = s->constant_data_size;
diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 1bec34b0962..6d74b2ab2f4 100644
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -2289,7 +2289,6 @@ lower_vars_to_explicit(nir_shader *shader,
       break;
    case nir_var_mem_shared:
       shader->info.shared_size = offset;
-      shader->shared_size = offset;
       break;
    case nir_var_mem_constant:
       shader->constant_data_size = offset;
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index 07813da5487..669e669cb11 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -1637,7 +1637,7 @@ nir_print_shader_annotated(nir_shader *shader, FILE *fp,
    fprintf(fp, "uniforms: %u\n", shader->num_uniforms);
    if (shader->info.num_ubos)
       fprintf(fp, "ubos: %u\n", shader->info.num_ubos);
-   fprintf(fp, "shared: %u\n", shader->shared_size);
+   fprintf(fp, "shared: %u\n", shader->info.shared_size);
    if (shader->scratch_size)
       fprintf(fp, "scratch: %u\n", shader->scratch_size);
    if (shader->constant_data_size)
diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c
index 08bb8e89442..b3bd24b1f16 100644
--- a/src/compiler/nir/nir_serialize.c
+++ b/src/compiler/nir/nir_serialize.c
@@ -2043,7 +2043,6 @@ nir_serialize(struct blob *blob, const nir_shader *nir, bool strip)
    blob_write_uint32(blob, nir->num_inputs);
    blob_write_uint32(blob, nir->num_uniforms);
    blob_write_uint32(blob, nir->num_outputs);
-   blob_write_uint32(blob, nir->shared_size);
    blob_write_uint32(blob, nir->scratch_size);
 
    blob_write_uint32(blob, exec_list_length(&nir->functions));
@@ -2096,7 +2095,6 @@ nir_deserialize(void *mem_ctx,
    ctx.nir->num_inputs = blob_read_uint32(blob);
    ctx.nir->num_uniforms = blob_read_uint32(blob);
    ctx.nir->num_outputs = blob_read_uint32(blob);
-   ctx.nir->shared_size = blob_read_uint32(blob);
    ctx.nir->scratch_size = blob_read_uint32(blob);
 
    unsigned num_functions = blob_read_uint32(blob);
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 5b8891d407c..31b552c8d02 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -6067,7 +6067,6 @@ spirv_to_nir(const uint32_t *words, size_t word_count,
          size = MAX2(size, glsl_get_explicit_size(var->type, align_to_stride));
       }
       b->shader->info.shared_size = size;
-      b->shader->shared_size = size;
    }
 
    /* Unparent the shader from the vtn_builder before we delete the builder */
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 98d6e1b53ae..5d9bbe8a251 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3441,7 +3441,7 @@ emit_instructions(struct ir3_context *ctx)
 		ctx->s->info.clip_distance_array_size;
 
 	ctx->so->pvtmem_size = ctx->s->scratch_size;
-	ctx->so->shared_size = ctx->s->shared_size;
+	ctx->so->shared_size = ctx->s->info.shared_size;
 
 	/* NOTE: need to do something more clever when we support >1 fxn */
 	nir_foreach_register (reg, &fxn->registers) {