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

intel/compiler: Remove cs_prog_data->threads

Browse Source 
At this point all drivers are doing this math on their own -- since
most of them need to cover the variable group size case, in which at
compile time the group size (and number of threads) is not defined.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4504>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-03-27 08:29:09 -07:00
parent 9ff55621d9
commit db74ad0696
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/compiler/brw_compiler.h
View File

@@ -906,7 +906,6 @@ struct brw_cs_prog_data {
unsigned local_size[3];
unsigned max_variable_local_size;
unsigned simd_size;
unsigned threads;
unsigned slm_size;
bool uses_barrier;
bool uses_num_work_groups;

22
src/intel/compiler/brw_fs.cpp
View File

@@ -8864,22 +8864,6 @@ cs_fill_push_const_info(const struct gen_device_info *devinfo,
prog_data->nr_params);
}
static void
cs_set_simd_size(struct brw_cs_prog_data *cs_prog_data, unsigned size)
{
cs_prog_data->simd_size = size;
unsigned group_size;
if (cs_prog_data->uses_variable_group_size) {
group_size = cs_prog_data->max_variable_local_size;
} else {
group_size = cs_prog_data->local_size[0] *
cs_prog_data->local_size[1] *
cs_prog_data->local_size[2];
}
cs_prog_data->threads = DIV_ROUND_UP(group_size, size);
}
static nir_shader *
compile_cs_to_nir(const struct brw_compiler *compiler,
void *mem_ctx,
@@ -8972,7 +8956,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
assert(v8->max_dispatch_width >= 32);
v = v8;
cs_set_simd_size(prog_data, 8);
prog_data->simd_size = 8;
cs_fill_push_const_info(compiler->devinfo, prog_data);
}
}
@@ -9002,7 +8986,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
assert(v16->max_dispatch_width >= 32);
v = v16;
cs_set_simd_size(prog_data, 16);
prog_data->simd_size = 16;
cs_fill_push_const_info(compiler->devinfo, prog_data);
}
}
@@ -9034,7 +9018,7 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
}
} else {
v = v32;
cs_set_simd_size(prog_data, 32);
prog_data->simd_size = 32;
cs_fill_push_const_info(compiler->devinfo, prog_data);
}
}