From 73a47610587d55c06e2d7af13192baada163b114 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 10 Apr 2014 14:59:05 +0800 Subject: [PATCH] ilo: remove GPE state size estimation Use size defines from genhw. --- .../drivers/ilo/ilo_3d_pipeline_gen6.c | 173 +++++++++--------- .../drivers/ilo/ilo_3d_pipeline_gen6.h | 4 + .../drivers/ilo/ilo_3d_pipeline_gen7.c | 94 +--------- src/gallium/drivers/ilo/ilo_gpe_gen6.c | 51 ------ src/gallium/drivers/ilo/ilo_gpe_gen6.h | 26 --- src/gallium/drivers/ilo/ilo_gpe_gen7.c | 50 ----- src/gallium/drivers/ilo/ilo_gpe_gen7.h | 25 --- 7 files changed, 97 insertions(+), 326 deletions(-) diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c index cd64b1b0e5c..c2da385e0eb 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c @@ -1739,8 +1739,7 @@ ilo_3d_pipeline_emit_rectlist_gen6(struct ilo_3d_pipeline *p, } static int -gen6_pipeline_estimate_commands(const struct ilo_3d_pipeline *p, - const struct ilo_context *ilo) +gen6_pipeline_max_command_size(const struct ilo_3d_pipeline *p) { static int size; @@ -1785,104 +1784,112 @@ gen6_pipeline_estimate_commands(const struct ilo_3d_pipeline *p, return size; } -static int -gen6_pipeline_estimate_states(const struct ilo_3d_pipeline *p, - const struct ilo_context *ilo) +int +gen6_pipeline_estimate_state_size(const struct ilo_3d_pipeline *p, + const struct ilo_context *ilo) { static int static_size; - int shader_type, count, size; + int sh_type, size; if (!static_size) { - struct { - enum ilo_gpe_gen6_state state; - int count; - } static_states[] = { - /* viewports */ - { ILO_GPE_GEN6_SF_VIEWPORT, 1 }, - { ILO_GPE_GEN6_CLIP_VIEWPORT, 1 }, - { ILO_GPE_GEN6_CC_VIEWPORT, 1 }, - /* cc */ - { ILO_GPE_GEN6_COLOR_CALC_STATE, 1 }, - { ILO_GPE_GEN6_BLEND_STATE, ILO_MAX_DRAW_BUFFERS }, - { ILO_GPE_GEN6_DEPTH_STENCIL_STATE, 1 }, - /* scissors */ - { ILO_GPE_GEN6_SCISSOR_RECT, 1 }, - /* binding table (vs, gs, fs) */ - { ILO_GPE_GEN6_BINDING_TABLE_STATE, ILO_MAX_VS_SURFACES }, - { ILO_GPE_GEN6_BINDING_TABLE_STATE, ILO_MAX_GS_SURFACES }, - { ILO_GPE_GEN6_BINDING_TABLE_STATE, ILO_MAX_WM_SURFACES }, - }; - int i; - - for (i = 0; i < Elements(static_states); i++) { - static_size += ilo_gpe_gen6_estimate_state_size(p->dev, - static_states[i].state, - static_states[i].count); + /* 64 bytes, or 16 dwords */ + const int alignment = 64 / 4; + + /* pad first */ + size = alignment - 1; + + /* CC states */ + size += align(GEN6_BLEND_STATE__SIZE * ILO_MAX_DRAW_BUFFERS, alignment); + size += align(GEN6_DEPTH_STENCIL_STATE__SIZE, alignment); + size += align(GEN6_COLOR_CALC_STATE__SIZE, alignment); + + /* viewport arrays */ + if (p->dev->gen >= ILO_GEN(7)) { + size += + align(GEN7_SF_CLIP_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 16) + + align(GEN6_CC_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) + + align(GEN6_SCISSOR_RECT__SIZE * ILO_MAX_VIEWPORTS, 8); + } + else { + size += + align(GEN6_SF_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) + + align(GEN6_CLIP_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) + + align(GEN6_CC_VIEWPORT__SIZE * ILO_MAX_VIEWPORTS, 8) + + align(GEN6_SCISSOR_RECT__SIZE * ILO_MAX_VIEWPORTS, 8); } + + static_size = size; } size = static_size; - /* - * render targets (fs) - * stream outputs (gs) - * sampler views (vs, fs) - * constant buffers (vs, fs) - */ - count = ilo->fb.state.nr_cbufs; + for (sh_type = 0; sh_type < PIPE_SHADER_TYPES; sh_type++) { + const int alignment = 32 / 4; + int num_samplers, num_surfaces, pcb_size; - if (ilo->gs) { - const struct pipe_stream_output_info *so_info = - ilo_shader_get_kernel_so_info(ilo->gs); + /* samplers */ + num_samplers = ilo->sampler[sh_type].count; - count += so_info->num_outputs; - } - else if (ilo->vs) { - const struct pipe_stream_output_info *so_info = - ilo_shader_get_kernel_so_info(ilo->vs); + /* sampler views and constant buffers */ + num_surfaces = ilo->view[sh_type].count + + util_bitcount(ilo->cbuf[sh_type].enabled_mask); - count += so_info->num_outputs; - } + pcb_size = 0; - for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) { - count += ilo->view[shader_type].count; - count += util_bitcount(ilo->cbuf[shader_type].enabled_mask); - } + switch (sh_type) { + case PIPE_SHADER_VERTEX: + if (ilo->vs) { + if (p->dev->gen == ILO_GEN(6)) { + const struct pipe_stream_output_info *so_info = + ilo_shader_get_kernel_so_info(ilo->vs); - if (count) { - size += ilo_gpe_gen6_estimate_state_size(p->dev, - ILO_GPE_GEN6_SURFACE_STATE, count); - } + /* stream outputs */ + num_surfaces += so_info->num_outputs; + } - /* samplers (vs, fs) */ - for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) { - count = ilo->sampler[shader_type].count; - if (count) { - size += ilo_gpe_gen6_estimate_state_size(p->dev, - ILO_GPE_GEN6_SAMPLER_BORDER_COLOR_STATE, count); - size += ilo_gpe_gen6_estimate_state_size(p->dev, - ILO_GPE_GEN6_SAMPLER_STATE, count); - } - } + pcb_size = ilo_shader_get_kernel_param(ilo->vs, + ILO_KERNEL_PCB_CBUF0_SIZE); + pcb_size += ilo_shader_get_kernel_param(ilo->vs, + ILO_KERNEL_VS_PCB_UCP_SIZE); + } + break; + case PIPE_SHADER_GEOMETRY: + if (ilo->gs && p->dev->gen == ILO_GEN(6)) { + const struct pipe_stream_output_info *so_info = + ilo_shader_get_kernel_so_info(ilo->gs); - /* pcb (vs) */ - if (ilo->vs) { - const int cbuf0_size = - ilo_shader_get_kernel_param(ilo->vs, ILO_KERNEL_PCB_CBUF0_SIZE); - const int ucp_size = - ilo_shader_get_kernel_param(ilo->vs, ILO_KERNEL_VS_PCB_UCP_SIZE); + /* stream outputs */ + num_surfaces += so_info->num_outputs; + } + break; + case PIPE_SHADER_FRAGMENT: + /* render targets */ + num_surfaces += ilo->fb.state.nr_cbufs; - size += ilo_gpe_gen6_estimate_state_size(p->dev, - ILO_GPE_GEN6_PUSH_CONSTANT_BUFFER, cbuf0_size + ucp_size); - } + if (ilo->fs) { + pcb_size = ilo_shader_get_kernel_param(ilo->fs, + ILO_KERNEL_PCB_CBUF0_SIZE); + } + break; + default: + break; + } - /* pcb (fs) */ - if (ilo->fs) { - const int cbuf0_size = - ilo_shader_get_kernel_param(ilo->fs, ILO_KERNEL_PCB_CBUF0_SIZE); + /* SAMPLER_STATE array and SAMPLER_BORDER_COLORs */ + if (num_samplers) { + size += align(GEN6_SAMPLER_STATE__SIZE * num_samplers, alignment) + + align(GEN6_SAMPLER_BORDER_COLOR__SIZE, alignment) * num_samplers; + } + + /* BINDING_TABLE_STATE and SURFACE_STATEs */ + if (num_surfaces) { + size += align(num_surfaces, alignment) + + align(GEN6_SURFACE_STATE__SIZE, alignment) * num_surfaces; + } - size += ilo_gpe_gen6_estimate_state_size(p->dev, - ILO_GPE_GEN6_PUSH_CONSTANT_BUFFER, cbuf0_size); + /* PCB */ + if (pcb_size) + size += align(pcb_size, alignment); } return size; @@ -1900,8 +1907,8 @@ ilo_3d_pipeline_estimate_size_gen6(struct ilo_3d_pipeline *p, { const struct ilo_context *ilo = arg; - size = gen6_pipeline_estimate_commands(p, ilo) + - gen6_pipeline_estimate_states(p, ilo); + size = gen6_pipeline_max_command_size(p) + + gen6_pipeline_estimate_state_size(p, ilo); } break; case ILO_3D_PIPELINE_FLUSH: diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h index 7e375919eed..16e96c07b72 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.h @@ -149,6 +149,10 @@ gen6_pipeline_update_max_svbi(struct ilo_3d_pipeline *p, const struct ilo_context *ilo, struct gen6_pipeline_session *session); +int +gen6_pipeline_estimate_state_size(const struct ilo_3d_pipeline *p, + const struct ilo_context *ilo); + void ilo_3d_pipeline_emit_flush_gen6(struct ilo_3d_pipeline *p); diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c index a712a46f6bb..557e5a8a271 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c @@ -881,8 +881,7 @@ ilo_3d_pipeline_emit_rectlist_gen7(struct ilo_3d_pipeline *p, } static int -gen7_pipeline_estimate_commands(const struct ilo_3d_pipeline *p, - const struct ilo_context *ilo) +gen7_pipeline_max_command_size(const struct ilo_3d_pipeline *p) { static int size; @@ -932,93 +931,6 @@ gen7_pipeline_estimate_commands(const struct ilo_3d_pipeline *p, return size; } -static int -gen7_pipeline_estimate_states(const struct ilo_3d_pipeline *p, - const struct ilo_context *ilo) -{ - static int static_size; - int shader_type, count, size; - - if (!static_size) { - struct { - enum ilo_gpe_gen7_state state; - int count; - } static_states[] = { - /* viewports */ - { ILO_GPE_GEN7_SF_CLIP_VIEWPORT, 1 }, - { ILO_GPE_GEN7_CC_VIEWPORT, 1 }, - /* cc */ - { ILO_GPE_GEN7_COLOR_CALC_STATE, 1 }, - { ILO_GPE_GEN7_BLEND_STATE, ILO_MAX_DRAW_BUFFERS }, - { ILO_GPE_GEN7_DEPTH_STENCIL_STATE, 1 }, - /* scissors */ - { ILO_GPE_GEN7_SCISSOR_RECT, 1 }, - /* binding table (vs, gs, fs) */ - { ILO_GPE_GEN7_BINDING_TABLE_STATE, ILO_MAX_VS_SURFACES }, - { ILO_GPE_GEN7_BINDING_TABLE_STATE, ILO_MAX_GS_SURFACES }, - { ILO_GPE_GEN7_BINDING_TABLE_STATE, ILO_MAX_WM_SURFACES }, - }; - int i; - - for (i = 0; i < Elements(static_states); i++) { - static_size += ilo_gpe_gen7_estimate_state_size(p->dev, - static_states[i].state, - static_states[i].count); - } - } - - size = static_size; - - /* - * render targets (fs) - * sampler views (vs, fs) - * constant buffers (vs, fs) - */ - count = ilo->fb.state.nr_cbufs; - for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) { - count += ilo->view[shader_type].count; - count += util_bitcount(ilo->cbuf[shader_type].enabled_mask); - } - - if (count) { - size += ilo_gpe_gen7_estimate_state_size(p->dev, - ILO_GPE_GEN7_SURFACE_STATE, count); - } - - /* samplers (vs, fs) */ - for (shader_type = 0; shader_type < PIPE_SHADER_TYPES; shader_type++) { - count = ilo->sampler[shader_type].count; - if (count) { - size += ilo_gpe_gen7_estimate_state_size(p->dev, - ILO_GPE_GEN7_SAMPLER_BORDER_COLOR_STATE, count); - size += ilo_gpe_gen7_estimate_state_size(p->dev, - ILO_GPE_GEN7_SAMPLER_STATE, count); - } - } - - /* pcb (vs) */ - if (ilo->vs) { - const int cbuf0_size = - ilo_shader_get_kernel_param(ilo->vs, ILO_KERNEL_PCB_CBUF0_SIZE); - const int ucp_size = - ilo_shader_get_kernel_param(ilo->vs, ILO_KERNEL_VS_PCB_UCP_SIZE); - - size += ilo_gpe_gen7_estimate_state_size(p->dev, - ILO_GPE_GEN7_PUSH_CONSTANT_BUFFER, cbuf0_size + ucp_size); - } - - /* pcb (fs) */ - if (ilo->fs) { - const int cbuf0_size = - ilo_shader_get_kernel_param(ilo->fs, ILO_KERNEL_PCB_CBUF0_SIZE); - - size += ilo_gpe_gen7_estimate_state_size(p->dev, - ILO_GPE_GEN7_PUSH_CONSTANT_BUFFER, cbuf0_size); - } - - return size; -} - static int ilo_3d_pipeline_estimate_size_gen7(struct ilo_3d_pipeline *p, enum ilo_3d_pipeline_action action, @@ -1031,8 +943,8 @@ ilo_3d_pipeline_estimate_size_gen7(struct ilo_3d_pipeline *p, { const struct ilo_context *ilo = arg; - size = gen7_pipeline_estimate_commands(p, ilo) + - gen7_pipeline_estimate_states(p, ilo); + size = gen7_pipeline_max_command_size(p) + + gen6_pipeline_estimate_state_size(p, ilo); } break; case ILO_3D_PIPELINE_FLUSH: diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.c b/src/gallium/drivers/ilo/ilo_gpe_gen6.c index 3e5ebfcb34c..11972b96897 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen6.c +++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.c @@ -2570,54 +2570,3 @@ ilo_gpe_set_fb(const struct ilo_dev_info *dev, } } } - -int -ilo_gpe_gen6_estimate_state_size(const struct ilo_dev_info *dev, - enum ilo_gpe_gen6_state state, - int arg) -{ - static const struct { - int alignment; - int body; - bool is_array; - } gen6_state_size_table[ILO_GPE_GEN6_STATE_COUNT] = { - [ILO_GPE_GEN6_INTERFACE_DESCRIPTOR_DATA] = { 8, 8, true }, - [ILO_GPE_GEN6_SF_VIEWPORT] = { 8, 8, true }, - [ILO_GPE_GEN6_CLIP_VIEWPORT] = { 8, 4, true }, - [ILO_GPE_GEN6_CC_VIEWPORT] = { 8, 2, true }, - [ILO_GPE_GEN6_COLOR_CALC_STATE] = { 16, 6, false }, - [ILO_GPE_GEN6_BLEND_STATE] = { 16, 2, true }, - [ILO_GPE_GEN6_DEPTH_STENCIL_STATE] = { 16, 3, false }, - [ILO_GPE_GEN6_SCISSOR_RECT] = { 8, 2, true }, - [ILO_GPE_GEN6_BINDING_TABLE_STATE] = { 8, 1, true }, - [ILO_GPE_GEN6_SURFACE_STATE] = { 8, 6, false }, - [ILO_GPE_GEN6_SAMPLER_STATE] = { 8, 4, true }, - [ILO_GPE_GEN6_SAMPLER_BORDER_COLOR_STATE] = { 8, 12, false }, - [ILO_GPE_GEN6_PUSH_CONSTANT_BUFFER] = { 8, 1, true }, - }; - const int alignment = gen6_state_size_table[state].alignment; - const int body = gen6_state_size_table[state].body; - const bool is_array = gen6_state_size_table[state].is_array; - const int count = arg; - int estimate; - - ILO_GPE_VALID_GEN(dev, 6, 6); - assert(state < ILO_GPE_GEN6_STATE_COUNT); - - if (likely(count)) { - if (is_array) { - estimate = (alignment - 1) + body * count; - } - else { - estimate = (alignment - 1) + body; - /* all states are aligned */ - if (count > 1) - estimate += util_align_npot(body, alignment) * (count - 1); - } - } - else { - estimate = 0; - } - - return estimate; -} diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_gpe_gen6.h index 9652b609d24..e5647184fd7 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h +++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.h @@ -46,32 +46,6 @@ #define ILO_GPE_CMD(pipeline, op, subop) \ (0x3 << 29 | (pipeline) << 27 | (op) << 24 | (subop) << 16) -/** - * Indirect states that GEN6 GPE could emit. - */ -enum ilo_gpe_gen6_state { - ILO_GPE_GEN6_INTERFACE_DESCRIPTOR_DATA, - ILO_GPE_GEN6_SF_VIEWPORT, - ILO_GPE_GEN6_CLIP_VIEWPORT, - ILO_GPE_GEN6_CC_VIEWPORT, - ILO_GPE_GEN6_COLOR_CALC_STATE, - ILO_GPE_GEN6_BLEND_STATE, - ILO_GPE_GEN6_DEPTH_STENCIL_STATE, - ILO_GPE_GEN6_SCISSOR_RECT, - ILO_GPE_GEN6_BINDING_TABLE_STATE, - ILO_GPE_GEN6_SURFACE_STATE, - ILO_GPE_GEN6_SAMPLER_STATE, - ILO_GPE_GEN6_SAMPLER_BORDER_COLOR_STATE, - ILO_GPE_GEN6_PUSH_CONSTANT_BUFFER, - - ILO_GPE_GEN6_STATE_COUNT, -}; - -int -ilo_gpe_gen6_estimate_state_size(const struct ilo_dev_info *dev, - enum ilo_gpe_gen6_state state, - int arg); - /** * Translate winsys tiling to hardware tiling. */ diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.c b/src/gallium/drivers/ilo/ilo_gpe_gen7.c index e6c1556e3e2..6d3397f2d62 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen7.c +++ b/src/gallium/drivers/ilo/ilo_gpe_gen7.c @@ -670,53 +670,3 @@ ilo_gpe_init_view_surface_for_texture_gen7(const struct ilo_dev_info *dev, /* do not increment reference count */ surf->bo = tex->bo; } - -int -ilo_gpe_gen7_estimate_state_size(const struct ilo_dev_info *dev, - enum ilo_gpe_gen7_state state, - int arg) -{ - static const struct { - int alignment; - int body; - bool is_array; - } gen7_state_size_table[ILO_GPE_GEN7_STATE_COUNT] = { - [ILO_GPE_GEN7_INTERFACE_DESCRIPTOR_DATA] = { 8, 8, true }, - [ILO_GPE_GEN7_SF_CLIP_VIEWPORT] = { 16, 16, true }, - [ILO_GPE_GEN7_CC_VIEWPORT] = { 8, 2, true }, - [ILO_GPE_GEN7_COLOR_CALC_STATE] = { 16, 6, false }, - [ILO_GPE_GEN7_BLEND_STATE] = { 16, 2, true }, - [ILO_GPE_GEN7_DEPTH_STENCIL_STATE] = { 16, 3, false }, - [ILO_GPE_GEN7_SCISSOR_RECT] = { 8, 2, true }, - [ILO_GPE_GEN7_BINDING_TABLE_STATE] = { 8, 1, true }, - [ILO_GPE_GEN7_SURFACE_STATE] = { 8, 8, false }, - [ILO_GPE_GEN7_SAMPLER_STATE] = { 8, 4, true }, - [ILO_GPE_GEN7_SAMPLER_BORDER_COLOR_STATE] = { 8, 4, false }, - [ILO_GPE_GEN7_PUSH_CONSTANT_BUFFER] = { 8, 1, true }, - }; - const int alignment = gen7_state_size_table[state].alignment; - const int body = gen7_state_size_table[state].body; - const bool is_array = gen7_state_size_table[state].is_array; - const int count = arg; - int estimate; - - ILO_GPE_VALID_GEN(dev, 7, 7.5); - assert(state < ILO_GPE_GEN7_STATE_COUNT); - - if (likely(count)) { - if (is_array) { - estimate = (alignment - 1) + body * count; - } - else { - estimate = (alignment - 1) + body; - /* all states are aligned */ - if (count > 1) - estimate += util_align_npot(body, alignment) * (count - 1); - } - } - else { - estimate = 0; - } - - return estimate; -} diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.h b/src/gallium/drivers/ilo/ilo_gpe_gen7.h index 097852090d8..0816fd67477 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen7.h +++ b/src/gallium/drivers/ilo/ilo_gpe_gen7.h @@ -36,31 +36,6 @@ #include "ilo_shader.h" #include "ilo_gpe_gen6.h" -/** - * Indirect states that GEN7 GPE could emit. - */ -enum ilo_gpe_gen7_state { - ILO_GPE_GEN7_INTERFACE_DESCRIPTOR_DATA, - ILO_GPE_GEN7_SF_CLIP_VIEWPORT, - ILO_GPE_GEN7_CC_VIEWPORT, - ILO_GPE_GEN7_COLOR_CALC_STATE, - ILO_GPE_GEN7_BLEND_STATE, - ILO_GPE_GEN7_DEPTH_STENCIL_STATE, - ILO_GPE_GEN7_SCISSOR_RECT, - ILO_GPE_GEN7_BINDING_TABLE_STATE, - ILO_GPE_GEN7_SURFACE_STATE, - ILO_GPE_GEN7_SAMPLER_STATE, - ILO_GPE_GEN7_SAMPLER_BORDER_COLOR_STATE, - ILO_GPE_GEN7_PUSH_CONSTANT_BUFFER, - - ILO_GPE_GEN7_STATE_COUNT, -}; - -int -ilo_gpe_gen7_estimate_state_size(const struct ilo_dev_info *dev, - enum ilo_gpe_gen7_state state, - int arg); - static inline void gen7_emit_GPGPU_WALKER(const struct ilo_dev_info *dev, struct ilo_cp *cp) -- 2.30.2