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

anv: Simplify pipeline cache control flow a bit

Browse Source 
No functional change, but the control flow around searching the cache
and falling back to compiling is a bit simpler.
This commit is contained in:
Kristian Høgsberg Kristensen
2016-03-04 10:59:21 -08:00
parent 2b29342fae
commit 87967a2c85
1 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,20 +438,17 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
const struct brw_stage_prog_data *stage_prog_data; const struct brw_stage_prog_data *stage_prog_data;
struct brw_vs_prog_key key; struct brw_vs_prog_key key;
uint32_t kernel; uint32_t kernel = NO_KERNEL;
unsigned char sha1[20], *hash; unsigned char sha1[20];
populate_vs_prog_key(&pipeline->device->info, &key); populate_vs_prog_key(&pipeline->device->info, &key);
if (module->size > 0) { if (module->size > 0) {
hash = sha1; anv_hash_shader(sha1, &key, sizeof(key), module, entrypoint, spec_info);
anv_hash_shader(hash, &key, sizeof(key), module, entrypoint, spec_info); kernel = anv_pipeline_cache_search(cache, sha1, &stage_prog_data);
kernel = anv_pipeline_cache_search(cache, hash, &stage_prog_data);
} else {
hash = NULL;
} }
if (module->size == 0 || kernel == NO_KERNEL) { if (kernel == NO_KERNEL) {
struct brw_vs_prog_data prog_data = { 0, }; struct brw_vs_prog_data prog_data = { 0, };
nir_shader *nir = anv_pipeline_compile(pipeline, module, entrypoint, nir_shader *nir = anv_pipeline_compile(pipeline, module, entrypoint,
@@ -484,7 +481,8 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
} }
stage_prog_data = &prog_data.base.base; stage_prog_data = &prog_data.base.base;
kernel = anv_pipeline_cache_upload_kernel(cache, hash, kernel = anv_pipeline_cache_upload_kernel(cache,
module->size > 0 ? sha1 : NULL,
shader_code, code_size, shader_code, code_size,
&stage_prog_data, &stage_prog_data,
sizeof(prog_data)); sizeof(prog_data));
@@ -520,20 +518,17 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
const struct brw_stage_prog_data *stage_prog_data; const struct brw_stage_prog_data *stage_prog_data;
struct brw_gs_prog_key key; struct brw_gs_prog_key key;
uint32_t kernel; uint32_t kernel = NO_KERNEL;
unsigned char sha1[20], *hash; unsigned char sha1[20];
populate_gs_prog_key(&pipeline->device->info, &key); populate_gs_prog_key(&pipeline->device->info, &key);
if (module->size > 0) { if (module->size > 0) {
hash = sha1; anv_hash_shader(sha1, &key, sizeof(key), module, entrypoint, spec_info);
anv_hash_shader(hash, &key, sizeof(key), module, entrypoint, spec_info); kernel = anv_pipeline_cache_search(cache, sha1, &stage_prog_data);
kernel = anv_pipeline_cache_search(cache, hash, &stage_prog_data);
} else {
hash = NULL;
} }
if (module->size == 0 || kernel == NO_KERNEL) { if (kernel == NO_KERNEL) {
struct brw_gs_prog_data prog_data = { 0, }; struct brw_gs_prog_data prog_data = { 0, };
nir_shader *nir = anv_pipeline_compile(pipeline, module, entrypoint, nir_shader *nir = anv_pipeline_compile(pipeline, module, entrypoint,
@@ -566,7 +561,8 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
/* TODO: SIMD8 GS */ /* TODO: SIMD8 GS */
stage_prog_data = &prog_data.base.base; stage_prog_data = &prog_data.base.base;
kernel = anv_pipeline_cache_upload_kernel(cache, hash, kernel = anv_pipeline_cache_upload_kernel(cache,
module->size > 0 ? sha1 : NULL,
shader_code, code_size, shader_code, code_size,
&stage_prog_data, sizeof(prog_data)); &stage_prog_data, sizeof(prog_data));
@@ -594,8 +590,8 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
const struct brw_stage_prog_data *stage_prog_data; const struct brw_stage_prog_data *stage_prog_data;
struct brw_wm_prog_key key; struct brw_wm_prog_key key;
uint32_t kernel; uint32_t kernel = NO_KERNEL;
unsigned char sha1[20], *hash; unsigned char sha1[20];
populate_wm_prog_key(&pipeline->device->info, info, extra, &key); populate_wm_prog_key(&pipeline->device->info, info, extra, &key);
@@ -603,14 +599,11 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
key.nr_color_regions = 1; key.nr_color_regions = 1;
if (module->size > 0) { if (module->size > 0) {
hash = sha1; anv_hash_shader(sha1, &key, sizeof(key), module, entrypoint, spec_info);
anv_hash_shader(hash, &key, sizeof(key), module, entrypoint, spec_info); kernel = anv_pipeline_cache_search(cache, sha1, &stage_prog_data);
kernel = anv_pipeline_cache_search(cache, hash, &stage_prog_data);
} else {
hash = NULL;
} }
if (module->size == 0 || kernel == NO_KERNEL) { if (kernel == NO_KERNEL) {
struct brw_wm_prog_data prog_data = { 0, }; struct brw_wm_prog_data prog_data = { 0, };
prog_data.binding_table.render_target_start = 0; prog_data.binding_table.render_target_start = 0;
@@ -649,7 +642,8 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
} }
stage_prog_data = &prog_data.base; stage_prog_data = &prog_data.base;
kernel = anv_pipeline_cache_upload_kernel(cache, hash, kernel = anv_pipeline_cache_upload_kernel(cache,
module->size > 0 ? sha1 : NULL,
shader_code, code_size, shader_code, code_size,
&stage_prog_data, sizeof(prog_data)); &stage_prog_data, sizeof(prog_data));
@@ -702,17 +696,14 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
pipeline->device->instance->physicalDevice.compiler; pipeline->device->instance->physicalDevice.compiler;
const struct brw_stage_prog_data *stage_prog_data; const struct brw_stage_prog_data *stage_prog_data;
struct brw_cs_prog_key key; struct brw_cs_prog_key key;
uint32_t kernel; uint32_t kernel = NO_KERNEL;
unsigned char sha1[20], *hash; unsigned char sha1[20];
populate_cs_prog_key(&pipeline->device->info, &key); populate_cs_prog_key(&pipeline->device->info, &key);
if (module->size > 0) { if (module->size > 0) {
hash = sha1; anv_hash_shader(sha1, &key, sizeof(key), module, entrypoint, spec_info);
anv_hash_shader(hash, &key, sizeof(key), module, entrypoint, spec_info); kernel = anv_pipeline_cache_search(cache, sha1, &stage_prog_data);
kernel = anv_pipeline_cache_search(cache, hash, &stage_prog_data);
} else {
hash = NULL;
} }
if (module->size == 0 || kernel == NO_KERNEL) { if (module->size == 0 || kernel == NO_KERNEL) {
@@ -743,7 +734,8 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
} }
stage_prog_data = &prog_data.base; stage_prog_data = &prog_data.base;
kernel = anv_pipeline_cache_upload_kernel(cache, hash, kernel = anv_pipeline_cache_upload_kernel(cache,
module->size > 0 ? sha1 : NULL,
shader_code, code_size, shader_code, code_size,
&stage_prog_data, sizeof(prog_data)); &stage_prog_data, sizeof(prog_data));
ralloc_free(mem_ctx); ralloc_free(mem_ctx);