From 2a308ee4c792bc64486e94374f74d221bbaa10f1 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Wed, 20 May 2020 02:37:49 -0700 Subject: [PATCH] intel/fs: Remove unused state from brw_nir_lower_cs_intrinsics After 2663759af0e ("intel/fs: Add and use a new load_simd_width_intel intrinsic") the local_workgroup_size is not used anymore except for assertions at the pass' start, so drop it from state struct. Reviewed-by: Jason Ekstrand Part-of: --- .../compiler/brw_nir_lower_cs_intrinsics.c | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c index 883fc469924..7c08b36aab6 100644 --- a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c @@ -29,7 +29,6 @@ struct lower_intrinsics_state { nir_function_impl *impl; bool progress; nir_builder builder; - unsigned local_workgroup_size; }; static bool @@ -203,22 +202,18 @@ brw_nir_lower_cs_intrinsics(nir_shader *nir) .nir = nir, }; - if (!nir->info.cs.local_size_variable) { - state.local_workgroup_size = nir->info.cs.local_size[0] * - nir->info.cs.local_size[1] * - nir->info.cs.local_size[2]; - } else { - state.local_workgroup_size = nir->info.cs.max_variable_local_size; - } - /* Constraints from NV_compute_shader_derivatives. */ - if (nir->info.cs.derivative_group == DERIVATIVE_GROUP_QUADS && - !nir->info.cs.local_size_variable) { - assert(nir->info.cs.local_size[0] % 2 == 0); - assert(nir->info.cs.local_size[1] % 2 == 0); - } else if (nir->info.cs.derivative_group == DERIVATIVE_GROUP_LINEAR && - !nir->info.cs.local_size_variable) { - assert(state.local_workgroup_size % 4 == 0); + if (!nir->info.cs.local_size_variable) { + if (nir->info.cs.derivative_group == DERIVATIVE_GROUP_QUADS) { + assert(nir->info.cs.local_size[0] % 2 == 0); + assert(nir->info.cs.local_size[1] % 2 == 0); + } else if (nir->info.cs.derivative_group == DERIVATIVE_GROUP_LINEAR) { + ASSERTED unsigned local_workgroup_size = + nir->info.cs.local_size[0] * + nir->info.cs.local_size[1] * + nir->info.cs.local_size[2]; + assert(local_workgroup_size % 4 == 0); + } } nir_foreach_function(function, nir) { -- 2.30.2