AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/rt: Use radv_shader for compiled shaders

Browse Source 
Reviewed-by: Friedrich Vock <friedrich.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25224>
This commit is contained in:
Konstantin Seurer
2023-09-12 17:39:45 +02:00
parent 59d490b8aa
commit 77b9a6f9e2
7 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/layers/radv_sqtt_layer.c
+1 -2
View File
@@ -1575,8 +1575,7 @@ radv_register_rt_pipeline(struct radv_device *device, struct radv_ray_tracing_pi
if (!pipeline->stages[i].shader)
continue;
struct radv_shader *shader = container_of(pipeline->stages[i].shader, struct radv_shader, base);
result = radv_register_rt_stage(device, pipeline, i, stage->stack_size, shader);
result = radv_register_rt_stage(device, pipeline, i, stage->stack_size, stage->shader);
if (result != VK_SUCCESS)
return result;
}
src/amd/vulkan/radv_cmd_buffer.c
+3 -5
View File
@@ -6266,11 +6266,9 @@ radv_emit_compute_pipeline(struct radv_cmd_buffer *cmd_buffer, struct radv_compu
struct radv_ray_tracing_pipeline *rt_pipeline = radv_pipeline_to_ray_tracing(&pipeline->base);
for (unsigned i = 0; i < rt_pipeline->stage_count; ++i) {
if (!rt_pipeline->stages[i].shader)
continue;
struct radv_shader *shader = container_of(rt_pipeline->stages[i].shader, struct radv_shader, base);
radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, shader->bo);
struct radv_shader *shader = rt_pipeline->stages[i].shader;
if (shader)
radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, shader->bo);
}
}
src/amd/vulkan/radv_debug.c
+4 -6
View File
@@ -487,10 +487,9 @@ radv_dump_queue_state(struct radv_queue *queue, const char *dump_dir, FILE *f)
} else if (pipeline->type == RADV_PIPELINE_RAY_TRACING) {
struct radv_ray_tracing_pipeline *rt_pipeline = radv_pipeline_to_ray_tracing(pipeline);
for (unsigned i = 0; i < rt_pipeline->stage_count; i++) {
if (rt_pipeline->stages[i].shader) {
struct radv_shader *shader = container_of(rt_pipeline->stages[i].shader, struct radv_shader, base);
struct radv_shader *shader = rt_pipeline->stages[i].shader;
if (shader)
radv_dump_shader(device, pipeline, shader, shader->info.stage, dump_dir, f);
}
}
radv_dump_shader(device, pipeline, pipeline->shaders[MESA_SHADER_INTERSECTION], MESA_SHADER_INTERSECTION,
dump_dir, f);
@@ -521,10 +520,9 @@ radv_dump_queue_state(struct radv_queue *queue, const char *dump_dir, FILE *f)
} else if (pipeline->type == RADV_PIPELINE_RAY_TRACING) {
struct radv_ray_tracing_pipeline *rt_pipeline = radv_pipeline_to_ray_tracing(pipeline);
for (unsigned i = 0; i < rt_pipeline->stage_count; i++) {
if (rt_pipeline->stages[i].shader) {
struct radv_shader *shader = container_of(rt_pipeline->stages[i].shader, struct radv_shader, base);
struct radv_shader *shader = rt_pipeline->stages[i].shader;
if (shader)
radv_dump_annotated_shader(shader, shader->info.stage, waves, num_waves, f);
}
}
radv_dump_annotated_shader(pipeline->shaders[MESA_SHADER_INTERSECTION], MESA_SHADER_INTERSECTION, waves,
num_waves, f);
src/amd/vulkan/radv_pipeline.c
+1 -1
View File
@@ -835,7 +835,7 @@ radv_get_shader_from_executable_index(struct radv_pipeline *pipeline, int index,
if (!index) {
*stage = rt_stage->stage;
return container_of(rt_stage->shader, struct radv_shader, base);
return rt_stage->shader;
}
index--;
src/amd/vulkan/radv_pipeline_cache.c
+2 -3
View File
@@ -449,7 +449,7 @@ radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct vk_pip
pipeline->stages[i].stack_size = data->stages[i].stack_size;
if (data->stages[i].has_shader)
pipeline->stages[i].shader = &radv_shader_ref(pipeline_obj->shaders[idx++])->base;
pipeline->stages[i].shader = radv_shader_ref(pipeline_obj->shaders[idx++]);
if (is_library) {
pipeline->stages[i].nir = radv_pipeline_cache_search_nir(device, cache, pipeline->stages[i].sha1);
@@ -512,8 +512,7 @@ radv_ray_tracing_pipeline_cache_insert(struct radv_device *device, struct vk_pip
data->stages[i].has_shader = !!pipeline->stages[i].shader;
if (pipeline->stages[i].shader)
pipeline_obj->shaders[idx++] =
radv_shader_ref(container_of(pipeline->stages[i].shader, struct radv_shader, base));
pipeline_obj->shaders[idx++] = radv_shader_ref(pipeline->stages[i].shader);
}
assert(idx == num_shaders);
src/amd/vulkan/radv_pipeline_rt.c
+10 -19
View File
@@ -191,8 +191,7 @@ radv_rt_fill_group_info(struct radv_device *device, const struct radv_ray_tracin
if (groups[idx].recursive_shader < pCreateInfo->stageCount) {
capture_replay_blocks[groups[idx].recursive_shader] = handle->recursive_shader_alloc;
} else if (groups[idx].recursive_shader != VK_SHADER_UNUSED_KHR) {
struct radv_shader *library_shader =
container_of(stages[groups[idx].recursive_shader].shader, struct radv_shader, base);
struct radv_shader *library_shader = stages[groups[idx].recursive_shader].shader;
simple_mtx_lock(&library_shader->replay_mtx);
if (!library_shader->has_replay_alloc) {
union radv_shader_arena_block *new_block =
@@ -267,7 +266,7 @@ radv_rt_fill_stage_info(const VkRayTracingPipelineCreateInfoKHR *pCreateInfo, st
if (library_pipeline->stages[j].nir)
stages[idx].nir = vk_pipeline_cache_object_ref(library_pipeline->stages[j].nir);
if (library_pipeline->stages[j].shader)
stages[idx].shader = vk_pipeline_cache_object_ref(library_pipeline->stages[j].shader);
stages[idx].shader = radv_shader_ref(library_pipeline->stages[j].shader);
stages[idx].stage = library_pipeline->stages[j].stage;
stages[idx].stack_size = library_pipeline->stages[j].stack_size;
@@ -578,15 +577,13 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca
bool monolithic_raygen = monolithic && stage->stage == MESA_SHADER_RAYGEN;
struct radv_shader *shader;
result = radv_rt_nir_to_asm(device, cache, pCreateInfo, key, pipeline, monolithic_raygen, stage, &stack_size,
replay_block, &shader);
replay_block, &rt_stages[idx].shader);
if (result != VK_SUCCESS)
goto cleanup;
assert(rt_stages[idx].stack_size <= stack_size);
rt_stages[idx].stack_size = stack_size;
rt_stages[idx].shader = shader ? &shader->base : NULL;
}
if (creation_feedback && creation_feedback->pipelineStageCreationFeedbackCount) {
@@ -721,12 +718,9 @@ compile_rt_prolog(struct radv_device *device, struct radv_ray_tracing_pipeline *
/* create combined config */
struct ac_shader_config *config = &pipeline->prolog->config;
for (unsigned i = 0; i < pipeline->stage_count; i++) {
if (pipeline->stages[i].shader) {
struct radv_shader *shader = container_of(pipeline->stages[i].shader, struct radv_shader, base);
combine_config(config, &shader->config);
}
}
for (unsigned i = 0; i < pipeline->stage_count; i++)
if (pipeline->stages[i].shader)
combine_config(config, &pipeline->stages[i].shader->config);
if (pipeline->base.base.shaders[MESA_SHADER_INTERSECTION])
combine_config(config, &pipeline->base.base.shaders[MESA_SHADER_INTERSECTION]->config);
@@ -815,11 +809,9 @@ radv_rt_pipeline_create(VkDevice _device, VkPipelineCache _cache, const VkRayTra
/* write shader VAs into group handles */
for (unsigned i = 0; i < pipeline->group_count; i++) {
if (pipeline->groups[i].recursive_shader != VK_SHADER_UNUSED_KHR) {
if (pipeline->stages[pipeline->groups[i].recursive_shader].shader) {
struct radv_shader *shader =
container_of(pipeline->stages[pipeline->groups[i].recursive_shader].shader, struct radv_shader, base);
struct radv_shader *shader = pipeline->stages[pipeline->groups[i].recursive_shader].shader;
if (shader)
pipeline->groups[i].handle.recursive_shader_ptr = shader->va | radv_get_rt_priority(shader->info.stage);
}
}
}
@@ -841,7 +833,7 @@ radv_destroy_ray_tracing_pipeline(struct radv_device *device, struct radv_ray_tr
if (pipeline->stages[i].nir)
vk_pipeline_cache_object_unref(&device->vk, pipeline->stages[i].nir);
if (pipeline->stages[i].shader)
vk_pipeline_cache_object_unref(&device->vk, pipeline->stages[i].shader);
radv_shader_unref(device, pipeline->stages[i].shader);
}
if (pipeline->prolog)
@@ -937,8 +929,7 @@ radv_GetRayTracingCaptureReplayShaderGroupHandlesKHR(VkDevice device, VkPipeline
for (uint32_t i = 0; i < groupCount; ++i) {
uint32_t recursive_shader = rt_pipeline->groups[firstGroup + i].recursive_shader;
if (recursive_shader != VK_SHADER_UNUSED_KHR) {
struct radv_shader *shader =
container_of(rt_pipeline->stages[recursive_shader].shader, struct radv_shader, base);
struct radv_shader *shader = rt_pipeline->stages[recursive_shader].shader;
data[i].recursive_shader_alloc = radv_serialize_shader_arena_block(shader->alloc);
}
data[i].non_recursive_idx = rt_pipeline->groups[firstGroup + i].handle.any_hit_index;
src/amd/vulkan/radv_private.h
+1 -1
View File
@@ -2132,7 +2132,7 @@ struct radv_ray_tracing_group {
struct radv_ray_tracing_stage {
struct vk_pipeline_cache_object *nir;
struct vk_pipeline_cache_object *shader;
struct radv_shader *shader;
gl_shader_stage stage;
uint32_t stack_size;