OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris, i965: Drop max_variable_local_size

Browse Source 
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>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-05-20 23:55:23 -07:00
parent 90ec26a800
commit 46b428074f
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/shader_info.h
View File

@@ -302,7 +302,6 @@ typedef struct shader_info {
struct { struct {
uint16_t local_size[3]; uint16_t local_size[3];
uint16_t max_variable_local_size;
bool local_size_variable:1; bool local_size_variable:1;
uint8_t user_data_components_amd:3; uint8_t user_data_components_amd:3;

5
src/gallium/drivers/iris/iris_program.c
View File

@@ -1963,11 +1963,6 @@ iris_compile_cs(struct iris_context *ice,
nir_shader *nir = nir_shader_clone(mem_ctx, ish->nir); 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); NIR_PASS_V(nir, brw_nir_lower_cs_intrinsics);
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values, iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values,

9
src/mesa/drivers/dri/i965/brw_cs.c
View File

@@ -88,7 +88,6 @@ brw_codegen_cs_prog(struct brw_context *brw,
struct brw_cs_prog_data prog_data; struct brw_cs_prog_data prog_data;
bool start_busy = false; bool start_busy = false;
double start_time = 0; double start_time = 0;
struct gl_context *gl_ctx = &brw->ctx;
nir_shader *nir = nir_shader_clone(mem_ctx, cp->program.nir); nir_shader *nir = nir_shader_clone(mem_ctx, cp->program.nir);
memset(&prog_data, 0, sizeof(prog_data)); 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) if (INTEL_DEBUG & DEBUG_SHADER_TIME)
st_index = brw_get_shader_time_index(brw, &cp->program, ST_CS, true); 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); brw_nir_lower_cs_intrinsics(nir);
char *error_str; char *error_str;