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

anv: move pipeline active_stages to common structure

Browse Source 
And fill it out for all types of pipelines.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21645>
This commit is contained in:
Lionel Landwerlin
2023-03-22 16:29:58 +02:00
committed by Marge Bot
parent 7eb8e71182
commit 1f8ede792e
5 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/vulkan/anv_cmd_buffer.c
+3 -2
View File
@@ -420,7 +420,7 @@ void anv_CmdBindPipeline(
cmd_buffer->state.gfx.pipeline = gfx_pipeline;
cmd_buffer->state.gfx.dirty |= ANV_CMD_DIRTY_PIPELINE;
anv_foreach_stage(stage, gfx_pipeline->base.active_stages) {
anv_foreach_stage(stage, gfx_pipeline->base.base.active_stages) {
set_dirty_for_bind_map(cmd_buffer, stage,
&gfx_pipeline->base.shaders[stage]->bind_map);
}
@@ -430,7 +430,8 @@ void anv_CmdBindPipeline(
&gfx_pipeline->dynamic_state);
state = &cmd_buffer->state.gfx.base;
stages = gfx_pipeline->base.active_stages;
stages = gfx_pipeline->base.base.active_stages;
/* When the pipeline is using independent states and dynamic buffers,
* this will trigger an update of anv_push_constants::dynamic_base_index
src/intel/vulkan/anv_pipeline.c
+24 -16
View File
@@ -717,7 +717,7 @@ anv_pipeline_hash_graphics(struct anv_graphics_base_pipeline *pipeline,
_mesa_sha1_update(&ctx, &rba, sizeof(rba));
for (uint32_t s = 0; s < ANV_GRAPHICS_SHADER_STAGE_COUNT; s++) {
if (pipeline->active_stages & BITFIELD_BIT(s)) {
if (pipeline->base.active_stages & BITFIELD_BIT(s)) {
_mesa_sha1_update(&ctx, stages[s].shader_sha1,
sizeof(stages[s].shader_sha1));
_mesa_sha1_update(&ctx, &stages[s].key, brw_prog_key_size(s));
@@ -1776,7 +1776,7 @@ anv_graphics_pipeline_load_cached_shaders(struct anv_graphics_base_pipeline *pip
}
}
if ((found + imported) == __builtin_popcount(pipeline->active_stages)) {
if ((found + imported) == __builtin_popcount(pipeline->base.active_stages)) {
if (cache_hits == found && found != 0) {
pipeline_feedback->flags |=
VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT;
@@ -1795,7 +1795,7 @@ anv_graphics_pipeline_load_cached_shaders(struct anv_graphics_base_pipeline *pip
* of the time but it can if we have a partially populated pipeline
* cache.
*/
assert(found < __builtin_popcount(pipeline->active_stages));
assert(found < __builtin_popcount(pipeline->base.active_stages));
vk_perf(VK_LOG_OBJS(cache ? &cache->base :
&pipeline->base.device->vk.base),
@@ -2037,8 +2037,8 @@ anv_graphics_pipeline_compile(struct anv_graphics_base_pipeline *pipeline,
vk_pipeline_hash_shader_stage(stages[stage].info, NULL, stages[stage].shader_sha1);
}
/* Prepare shader keys for all shaders in pipeline->active_stages (this
* includes libraries) before generating the hash for cache look up.
/* Prepare shader keys for all shaders in pipeline->base.active_stages
* (this includes libraries) before generating the hash for cache look up.
*
* We're doing this because the spec states that :
*
@@ -2210,7 +2210,8 @@ anv_graphics_pipeline_compile(struct anv_graphics_base_pipeline *pipeline,
shaders[s] = stages[s].nir;
use_primitive_replication =
anv_check_for_primitive_replication(device, pipeline->active_stages,
anv_check_for_primitive_replication(device,
pipeline->base.active_stages,
shaders, view_mask);
}
@@ -2604,9 +2605,12 @@ anv_compute_pipeline_create(struct anv_device *device,
return result;
}
ANV_FROM_HANDLE(anv_pipeline_layout, pipeline_layout, pCreateInfo->layout);
anv_pipeline_init_layout(&pipeline->base, pipeline_layout);
pipeline->base.active_stages = VK_SHADER_STAGE_COMPUTE_BIT;
anv_batch_set_storage(&pipeline->base.batch, ANV_NULL_ADDRESS,
pipeline->batch_data, sizeof(pipeline->batch_data));
@@ -2824,7 +2828,7 @@ anv_graphics_pipeline_import_lib(struct anv_graphics_base_pipeline *pipeline,
anv_graphics_pipeline_import_layout(pipeline, lib_layout);
/* We can't have shaders specified twice through libraries. */
assert((pipeline->active_stages & lib->base.active_stages) == 0);
assert((pipeline->base.active_stages & lib->base.base.active_stages) == 0);
/* VK_EXT_graphics_pipeline_library:
*
@@ -2837,7 +2841,7 @@ anv_graphics_pipeline_import_lib(struct anv_graphics_base_pipeline *pipeline,
*/
assert(!link_optimize || lib->retain_shaders);
pipeline->active_stages |= lib->base.active_stages;
pipeline->base.active_stages |= lib->base.base.active_stages;
/* Propagate the fragment dynamic flag, unless we're doing link
* optimization, in that case we'll have all the state information and this
@@ -2845,7 +2849,7 @@ anv_graphics_pipeline_import_lib(struct anv_graphics_base_pipeline *pipeline,
*/
if (!link_optimize) {
if (lib->base.fragment_dynamic) {
assert(lib->base.active_stages & VK_SHADER_STAGE_FRAGMENT_BIT);
assert(lib->base.base.active_stages & VK_SHADER_STAGE_FRAGMENT_BIT);
pipeline->fragment_dynamic = true;
}
}
@@ -2951,7 +2955,7 @@ anv_graphics_lib_pipeline_create(struct anv_device *device,
return result;
}
pipeline->base.active_stages = pipeline->state.shader_stages;
pipeline->base.base.active_stages = pipeline->state.shader_stages;
/* After we've imported all the libraries' layouts, import the pipeline
* layout and hash the whole lot.
@@ -2967,7 +2971,7 @@ anv_graphics_lib_pipeline_create(struct anv_device *device,
/* Compile shaders. We can skip this if there are no active stage in that
* pipeline.
*/
if (pipeline->base.active_stages != 0) {
if (pipeline->base.base.active_stages != 0) {
result = anv_graphics_pipeline_compile(&pipeline->base, stages,
cache, &pipeline_feedback,
pCreateInfo, &pipeline->state);
@@ -3068,11 +3072,11 @@ anv_graphics_pipeline_create(struct anv_device *device,
pipeline->dynamic_state.ms.sample_locations = &pipeline->base.sample_locations;
vk_dynamic_graphics_state_fill(&pipeline->dynamic_state, &state);
pipeline->base.active_stages = state.shader_stages;
pipeline->base.base.active_stages = state.shader_stages;
/* Sanity check on the shaders */
assert(pipeline->base.active_stages & VK_SHADER_STAGE_VERTEX_BIT ||
pipeline->base.active_stages & VK_SHADER_STAGE_MESH_BIT_EXT);
assert(pipeline->base.base.active_stages & VK_SHADER_STAGE_VERTEX_BIT ||
pipeline->base.base.active_stages & VK_SHADER_STAGE_MESH_BIT_EXT);
if (anv_pipeline_is_mesh(pipeline)) {
assert(device->physical->vk.supported_extensions.NV_mesh_shader ||
@@ -3108,8 +3112,8 @@ anv_graphics_pipeline_create(struct anv_device *device,
anv_batch_set_storage(&pipeline->base.base.batch, ANV_NULL_ADDRESS,
pipeline->batch_data, sizeof(pipeline->batch_data));
if (pipeline->base.active_stages & VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT)
pipeline->base.active_stages |= VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT;
if (pipeline->base.base.active_stages & VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT)
pipeline->base.base.active_stages |= VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT;
if (anv_pipeline_is_mesh(pipeline))
assert(device->physical->vk.supported_extensions.NV_mesh_shader ||
@@ -3368,6 +3372,8 @@ anv_pipeline_init_ray_tracing_stages(struct anv_ray_tracing_pipeline *pipeline,
},
};
pipeline->base.active_stages |= sinfo->stage;
populate_bs_prog_key(pipeline->base.device,
pipeline->base.device->robust_buffer_access,
ray_flags,
@@ -3961,6 +3967,8 @@ anv_ray_tracing_pipeline_create(
*/
pipeline->scratch_size =
MAX2(pipeline->scratch_size, rt_library->scratch_size);
pipeline->base.active_stages |= rt_library->base.active_stages;
}
}
src/intel/vulkan/anv_private.h
+4 -4
View File
@@ -3162,6 +3162,8 @@ struct anv_pipeline {
enum anv_pipeline_type type;
VkPipelineCreateFlags flags;
VkShaderStageFlags active_stages;
uint32_t ray_queries;
/**
@@ -3199,8 +3201,6 @@ struct anv_graphics_base_pipeline {
*/
uint32_t feedback_index[ANV_GRAPHICS_SHADER_STAGE_COUNT];
VkShaderStageFlags active_stages;
/* True if at the time the fragment shader was compiled, it didn't have all
* the information to avoid BRW_WM_MSAA_FLAG_ENABLE_DYNAMIC.
*/
@@ -3366,14 +3366,14 @@ static inline bool
anv_pipeline_has_stage(const struct anv_graphics_pipeline *pipeline,
gl_shader_stage stage)
{
return (pipeline->base.active_stages & mesa_to_vk_shader_stage(stage)) != 0;
return (pipeline->base.base.active_stages & mesa_to_vk_shader_stage(stage)) != 0;
}
static inline bool
anv_pipeline_base_has_stage(const struct anv_graphics_base_pipeline *pipeline,
gl_shader_stage stage)
{
return (pipeline->active_stages & mesa_to_vk_shader_stage(stage)) != 0;
return (pipeline->base.active_stages & mesa_to_vk_shader_stage(stage)) != 0;
}
static inline bool
src/intel/vulkan/genX_cmd_buffer.c
+5 -4
View File
@@ -1799,7 +1799,7 @@ static void
cmd_buffer_alloc_gfx_push_constants(struct anv_cmd_buffer *cmd_buffer)
{
VkShaderStageFlags stages =
cmd_buffer->state.gfx.pipeline->base.active_stages;
cmd_buffer->state.gfx.pipeline->base.base.active_stages;
/* In order to avoid thrash, we assume that vertex and fragment stages
* always exist. In the rare case where one is missing *and* the other
@@ -3203,7 +3203,7 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
&cmd_buffer->vk.dynamic_graphics_state;
uint32_t *p;
assert((pipeline->base.active_stages & VK_SHADER_STAGE_COMPUTE_BIT) == 0);
assert((pipeline->base.base.active_stages & VK_SHADER_STAGE_COMPUTE_BIT) == 0);
genX(cmd_buffer_config_l3)(cmd_buffer, pipeline->base.base.l3_config);
@@ -3307,7 +3307,7 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
const bool any_dynamic_state_dirty =
vk_dynamic_graphics_state_any_dirty(dyn);
uint32_t descriptors_dirty = cmd_buffer->state.descriptors_dirty &
pipeline->base.active_stages;
pipeline->base.base.active_stages;
const uint32_t push_descriptor_dirty =
cmd_buffer->state.push_descriptors_dirty &
@@ -3423,7 +3423,8 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
/* Because we're pushing UBOs, we have to push whenever either
* descriptors or push constants is dirty.
*/
dirty |= cmd_buffer->state.push_constants_dirty & pipeline->base.active_stages;
dirty |= cmd_buffer->state.push_constants_dirty &
pipeline->base.base.active_stages;
cmd_buffer_flush_gfx_push_constants(cmd_buffer,
dirty & VK_SHADER_STAGE_ALL_GRAPHICS);
#if GFX_VERx10 >= 125
src/intel/vulkan/genX_pipeline.c
+1 -1
View File
@@ -411,7 +411,7 @@ emit_urb_setup(struct anv_graphics_pipeline *pipeline,
genX(emit_urb_setup)(pipeline->base.base.device,
&pipeline->base.base.batch,
pipeline->base.base.l3_config,
pipeline->base.active_stages, entry_size,
pipeline->base.base.active_stages, entry_size,
deref_block_size);
}