iris, i965: Drop max_variable_local_size

This was used to decide which SIMD width to generate code for
ARB_compute_variable_group_size.  Now that compiler will generate
multiple SIMD widths, this information is unused.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5142>

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index d7577472578958cc54fa9b7a72f1f2cd6a2b7b01..2ad86fe0493ee4d0d13e229d6d2c8f590b44d83d 100644 (file)
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -302,7 +302,6 @@ typedef struct shader_info {
 
       struct {
          uint16_t local_size[3];
-         uint16_t max_variable_local_size;
 
          bool local_size_variable:1;
          uint8_t user_data_components_amd:3;

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 5f8c6fcb8d00ca7743865b7b4a9d8633be6e1f96..1b37245199c5396db576ed5ebee21a12b0df5079 100644 (file)
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -1963,11 +1963,6 @@ iris_compile_cs(struct iris_context *ice,
 
    nir_shader *nir = nir_shader_clone(mem_ctx, ish->nir);
 
-   if (nir->info.cs.local_size_variable) {
-      nir->info.cs.max_variable_local_size =
-         iris_get_max_var_invocations(screen);
-   }
-
    NIR_PASS_V(nir, brw_nir_lower_cs_intrinsics);
 
    iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values,

diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index ef6b80edf62304226bef89e7719e7a42d55b07ac..990acabc80b2058b860357ded280b989b3ce91e0 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@@ -88,7 +88,6 @@ brw_codegen_cs_prog(struct brw_context *brw,
    struct brw_cs_prog_data prog_data;
    bool start_busy = false;
    double start_time = 0;
-   struct gl_context *gl_ctx = &brw->ctx;
    nir_shader *nir = nir_shader_clone(mem_ctx, cp->program.nir);
 
    memset(&prog_data, 0, sizeof(prog_data));
@@ -119,14 +118,6 @@ brw_codegen_cs_prog(struct brw_context *brw,
    if (INTEL_DEBUG & DEBUG_SHADER_TIME)
       st_index = brw_get_shader_time_index(brw, &cp->program, ST_CS, true);
 
-   /* If the work group size is variable we set it to the maximum here since
-    * the actual size is not known until the dispatch command is issued.
-    */
-   if (nir->info.cs.local_size_variable) {
-      nir->info.cs.max_variable_local_size =
-         gl_ctx->Const.MaxComputeVariableGroupInvocations;
-   }
-
    brw_nir_lower_cs_intrinsics(nir);
 
    char *error_str;