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

radv: don't use a separate cache entry for GS copy shaders

Browse Source 
This seems simpler and probably faster.

This also fixes a warning for these CTS tests:
dEQP-VK.pipeline.creation_feedback.graphics_tests.vertex_stage_geometry_stage_delayed_destroy_fragment_stage_delayed_destroy
dEQP-VK.pipeline.creation_feedback.graphics_tests.vertex_stage_geometry_stage_fragment_stage
because we no longer set found_in_application_cache=false for pipelines
with NGG GS.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13528>
This commit is contained in:
Rhys Perry
2021-10-26 11:14:00 +01:00
committed by Marge Bot
parent 704340f0f6
commit 49d290bcf7
1 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/amd/vulkan/radv_pipeline.c
View File

@@ -3371,8 +3371,9 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
}; };
nir_shader *nir[MESA_SHADER_STAGES] = {0}; nir_shader *nir[MESA_SHADER_STAGES] = {0};
struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL}; struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL};
struct radv_shader_binary *gs_copy_binary = NULL;
struct radv_shader_info infos[MESA_SHADER_STAGES] = {0}; struct radv_shader_info infos[MESA_SHADER_STAGES] = {0};
unsigned char hash[20], gs_copy_hash[20]; unsigned char hash[20];
bool keep_executable_info = bool keep_executable_info =
(flags & VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) || (flags & VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) ||
device->keep_shader_info; device->keep_shader_info;
@@ -3404,25 +3405,19 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
radv_hash_shaders(hash, pStages, pipeline_layout, pipeline_key, radv_hash_shaders(hash, pStages, pipeline_layout, pipeline_key,
radv_get_hash_flags(device, keep_statistic_info)); radv_get_hash_flags(device, keep_statistic_info));
} }
memcpy(gs_copy_hash, hash, 20);
gs_copy_hash[0] ^= 1;
pipeline->pipeline_hash = *(uint64_t *)hash; pipeline->pipeline_hash = *(uint64_t *)hash;
bool found_in_application_cache = true; bool found_in_application_cache = true;
if (modules[MESA_SHADER_GEOMETRY] && !keep_executable_info) {
struct radv_shader_variant *variants[MESA_SHADER_STAGES] = {0};
radv_create_shader_variants_from_pipeline_cache(device, cache, gs_copy_hash, variants, NULL,
NULL, &found_in_application_cache);
pipeline->gs_copy_shader = variants[MESA_SHADER_GEOMETRY];
}
if (!keep_executable_info && if (!keep_executable_info &&
radv_create_shader_variants_from_pipeline_cache(device, cache, hash, pipeline->shaders, radv_create_shader_variants_from_pipeline_cache(device, cache, hash, pipeline->shaders,
stack_sizes, num_stack_sizes, stack_sizes, num_stack_sizes,
&found_in_application_cache) && &found_in_application_cache)) {
(!modules[MESA_SHADER_GEOMETRY] || pipeline->gs_copy_shader || if (modules[MESA_SHADER_GEOMETRY] && !pipeline->shaders[MESA_SHADER_GEOMETRY]->info.is_ngg) {
pipeline->shaders[MESA_SHADER_GEOMETRY]->info.is_ngg)) { /* We use the CS slot because graphics pipelines might use all the other ones. */
pipeline->gs_copy_shader = pipeline->shaders[MESA_SHADER_COMPUTE];
pipeline->shaders[MESA_SHADER_COMPUTE] = NULL;
}
radv_stop_feedback(pipeline_feedback, found_in_application_cache); radv_stop_feedback(pipeline_feedback, found_in_application_cache);
return VK_SUCCESS; return VK_SUCCESS;
} }
@@ -3615,9 +3610,7 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
nir_print_shader(nir[i], stderr); nir_print_shader(nir[i], stderr);
} }
if (modules[MESA_SHADER_GEOMETRY]) { if (modules[MESA_SHADER_GEOMETRY] && !pipeline_has_ngg) {
struct radv_shader_binary *gs_copy_binary = NULL;
if (!pipeline_has_ngg) {
struct radv_shader_info info = {0}; struct radv_shader_info info = {0};
if (infos[MESA_SHADER_GEOMETRY].vs.outinfo.export_clip_dists) if (infos[MESA_SHADER_GEOMETRY].vs.outinfo.export_clip_dists)
@@ -3635,21 +3628,6 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
pipeline_key->optimisations_disabled); pipeline_key->optimisations_disabled);
} }
if (!keep_executable_info && pipeline->gs_copy_shader) {
struct radv_shader_binary *gs_binaries[MESA_SHADER_STAGES] = {NULL};
struct radv_shader_variant *gs_variants[MESA_SHADER_STAGES] = {0};
gs_binaries[MESA_SHADER_GEOMETRY] = gs_copy_binary;
gs_variants[MESA_SHADER_GEOMETRY] = pipeline->gs_copy_shader;
radv_pipeline_cache_insert_shaders(device, cache, gs_copy_hash, gs_variants, gs_binaries,
NULL, 0);
pipeline->gs_copy_shader = gs_variants[MESA_SHADER_GEOMETRY];
}
free(gs_copy_binary);
}
if (nir[MESA_SHADER_FRAGMENT]) { if (nir[MESA_SHADER_FRAGMENT]) {
if (!pipeline->shaders[MESA_SHADER_FRAGMENT]) { if (!pipeline->shaders[MESA_SHADER_FRAGMENT]) {
radv_start_feedback(stage_feedbacks[MESA_SHADER_FRAGMENT]); radv_start_feedback(stage_feedbacks[MESA_SHADER_FRAGMENT]);
@@ -3710,11 +3688,24 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
} }
if (!keep_executable_info) { if (!keep_executable_info) {
if (pipeline->gs_copy_shader) {
assert(!binaries[MESA_SHADER_COMPUTE] && !pipeline->shaders[MESA_SHADER_COMPUTE]);
binaries[MESA_SHADER_COMPUTE] = gs_copy_binary;
pipeline->shaders[MESA_SHADER_COMPUTE] = pipeline->gs_copy_shader;
}
radv_pipeline_cache_insert_shaders(device, cache, hash, pipeline->shaders, binaries, radv_pipeline_cache_insert_shaders(device, cache, hash, pipeline->shaders, binaries,
stack_sizes ? *stack_sizes : NULL, stack_sizes ? *stack_sizes : NULL,
num_stack_sizes ? *num_stack_sizes : 0); num_stack_sizes ? *num_stack_sizes : 0);
if (pipeline->gs_copy_shader) {
pipeline->gs_copy_shader = pipeline->shaders[MESA_SHADER_COMPUTE];
pipeline->shaders[MESA_SHADER_COMPUTE] = NULL;
binaries[MESA_SHADER_COMPUTE] = NULL;
}
} }
free(gs_copy_binary);
for (int i = 0; i < MESA_SHADER_STAGES; ++i) { for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
free(binaries[i]); free(binaries[i]);
if (nir[i]) { if (nir[i]) {