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

anv/pipeline: Stop optimizing for not having a cache

Browse Source 
Before, we were only hashing the shader if we had a shader cache to
cache things in.  This means that if we ever get it wrong, we could end
up trying to cache a shader with an undefined hash.  Since not having a
shader cache is an extremely uncommon case, let's optimize for code
clarity and obvious correctness over avoiding a hash operation.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Jason Ekstrand
2018-06-29 17:53:47 -07:00
parent 76fdc8a85c
commit eae192bf5f
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/intel/vulkan/anv_pipeline.c
View File

@@ -527,18 +527,17 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
struct brw_vs_prog_key key; struct brw_vs_prog_key key;
struct anv_shader_bin *bin = NULL; struct anv_shader_bin *bin = NULL;
unsigned char sha1[20];
populate_vs_prog_key(&pipeline->device->info, &key); populate_vs_prog_key(&pipeline->device->info, &key);
ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout);
if (cache) { unsigned char sha1[20];
anv_pipeline_hash_shader(pipeline, layout, module, entrypoint, anv_pipeline_hash_shader(pipeline, layout, module, entrypoint,
MESA_SHADER_VERTEX, spec_info, MESA_SHADER_VERTEX, spec_info,
&key, sizeof(key), sha1); &key, sizeof(key), sha1);
if (cache)
bin = anv_pipeline_cache_search(cache, sha1, 20); bin = anv_pipeline_cache_search(cache, sha1, 20);
}
if (bin == NULL) { if (bin == NULL) {
struct brw_vs_prog_data prog_data = {}; struct brw_vs_prog_data prog_data = {};
@@ -653,8 +652,6 @@ anv_pipeline_compile_tcs_tes(struct anv_pipeline *pipeline,
struct brw_tes_prog_key tes_key = {}; struct brw_tes_prog_key tes_key = {};
struct anv_shader_bin *tcs_bin = NULL; struct anv_shader_bin *tcs_bin = NULL;
struct anv_shader_bin *tes_bin = NULL; struct anv_shader_bin *tes_bin = NULL;
unsigned char tcs_sha1[40];
unsigned char tes_sha1[40];
populate_sampler_prog_key(&pipeline->device->info, &tcs_key.tex); populate_sampler_prog_key(&pipeline->device->info, &tcs_key.tex);
populate_sampler_prog_key(&pipeline->device->info, &tes_key.tex); populate_sampler_prog_key(&pipeline->device->info, &tes_key.tex);
@@ -662,15 +659,18 @@ anv_pipeline_compile_tcs_tes(struct anv_pipeline *pipeline,
ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout);
unsigned char tcs_sha1[40];
unsigned char tes_sha1[40];
anv_pipeline_hash_shader(pipeline, layout, tcs_module, tcs_entrypoint,
MESA_SHADER_TESS_CTRL, tcs_spec_info,
&tcs_key, sizeof(tcs_key), tcs_sha1);
anv_pipeline_hash_shader(pipeline, layout, tes_module, tes_entrypoint,
MESA_SHADER_TESS_EVAL, tes_spec_info,
&tes_key, sizeof(tes_key), tes_sha1);
memcpy(&tcs_sha1[20], tes_sha1, 20);
memcpy(&tes_sha1[20], tcs_sha1, 20);
if (cache) { if (cache) {
anv_pipeline_hash_shader(pipeline, layout, tcs_module, tcs_entrypoint,
MESA_SHADER_TESS_CTRL, tcs_spec_info,
&tcs_key, sizeof(tcs_key), tcs_sha1);
anv_pipeline_hash_shader(pipeline, layout, tes_module, tes_entrypoint,
MESA_SHADER_TESS_EVAL, tes_spec_info,
&tes_key, sizeof(tes_key), tes_sha1);
memcpy(&tcs_sha1[20], tes_sha1, 20);
memcpy(&tes_sha1[20], tcs_sha1, 20);
tcs_bin = anv_pipeline_cache_search(cache, tcs_sha1, sizeof(tcs_sha1)); tcs_bin = anv_pipeline_cache_search(cache, tcs_sha1, sizeof(tcs_sha1));
tes_bin = anv_pipeline_cache_search(cache, tes_sha1, sizeof(tes_sha1)); tes_bin = anv_pipeline_cache_search(cache, tes_sha1, sizeof(tes_sha1));
} }
@@ -802,18 +802,17 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
struct brw_gs_prog_key key; struct brw_gs_prog_key key;
struct anv_shader_bin *bin = NULL; struct anv_shader_bin *bin = NULL;
unsigned char sha1[20];
populate_gs_prog_key(&pipeline->device->info, &key); populate_gs_prog_key(&pipeline->device->info, &key);
ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout);
if (cache) { unsigned char sha1[20];
anv_pipeline_hash_shader(pipeline, layout, module, entrypoint, anv_pipeline_hash_shader(pipeline, layout, module, entrypoint,
MESA_SHADER_GEOMETRY, spec_info, MESA_SHADER_GEOMETRY, spec_info,
&key, sizeof(key), sha1); &key, sizeof(key), sha1);
if (cache)
bin = anv_pipeline_cache_search(cache, sha1, 20); bin = anv_pipeline_cache_search(cache, sha1, 20);
}
if (bin == NULL) { if (bin == NULL) {
struct brw_gs_prog_data prog_data = {}; struct brw_gs_prog_data prog_data = {};
@@ -884,18 +883,17 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
struct brw_wm_prog_key key; struct brw_wm_prog_key key;
struct anv_shader_bin *bin = NULL; struct anv_shader_bin *bin = NULL;
unsigned char sha1[20];
populate_wm_prog_key(pipeline, info, &key); populate_wm_prog_key(pipeline, info, &key);
ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout);
if (cache) { unsigned char sha1[20];
anv_pipeline_hash_shader(pipeline, layout, module, entrypoint, anv_pipeline_hash_shader(pipeline, layout, module, entrypoint,
MESA_SHADER_FRAGMENT, spec_info, MESA_SHADER_FRAGMENT, spec_info,
&key, sizeof(key), sha1); &key, sizeof(key), sha1);
if (cache)
bin = anv_pipeline_cache_search(cache, sha1, 20); bin = anv_pipeline_cache_search(cache, sha1, 20);
}
if (bin == NULL) { if (bin == NULL) {
struct brw_wm_prog_data prog_data = {}; struct brw_wm_prog_data prog_data = {};
@@ -1036,18 +1034,17 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
struct brw_cs_prog_key key; struct brw_cs_prog_key key;
struct anv_shader_bin *bin = NULL; struct anv_shader_bin *bin = NULL;
unsigned char sha1[20];
populate_cs_prog_key(&pipeline->device->info, &key); populate_cs_prog_key(&pipeline->device->info, &key);
ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout);
if (cache) { unsigned char sha1[20];
anv_pipeline_hash_shader(pipeline, layout, module, entrypoint, anv_pipeline_hash_shader(pipeline, layout, module, entrypoint,
MESA_SHADER_COMPUTE, spec_info, MESA_SHADER_COMPUTE, spec_info,
&key, sizeof(key), sha1); &key, sizeof(key), sha1);
if (cache)
bin = anv_pipeline_cache_search(cache, sha1, 20); bin = anv_pipeline_cache_search(cache, sha1, 20);
}
if (bin == NULL) { if (bin == NULL) {
struct brw_cs_prog_data prog_data = {}; struct brw_cs_prog_data prog_data = {};