Commit 9628631a authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

Revert "anv: limit URB reconfigurations when using blorp"

In commit 0d46e404 ("anv: limit URB reconfigurations when using
blorp") we tried to limit the number of URB reconfiguration by
checking if the last allocation is large enough to fit the blorp
dispatch.

We used the last bound pipeline to compare the allocation. The problem
with this is that the pipeline is bound but its commands might not
have been emitted into the command buffer yet.

Let's just revert commit 0d46e404


since it didn't seem to yield any performance improvement.
Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 0d46e404 ("anv: limit URB reconfigurations when using blorp")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110535

Acked-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>
parent cc5b8a93
......@@ -2747,7 +2747,6 @@ struct anv_pipeline {
struct {
const struct gen_l3_config * l3_config;
uint32_t total_size;
unsigned entry_size[4];
} urb;
VkShaderStageFlags active_stages;
......
......@@ -202,13 +202,6 @@ blorp_emit_urb_config(struct blorp_batch *batch,
assert(sf_entry_size == 0);
/* If the last used gfx pipeline in the command buffer has enough VS URB
* space for what the blorp operation needs, skip reconfiguration.
*/
if (cmd_buffer->state.gfx.base.pipeline &&
cmd_buffer->state.gfx.base.pipeline->urb.entry_size[MESA_SHADER_VERTEX] >= vs_entry_size)
return;
const unsigned entry_size[4] = { vs_entry_size, 1, 1, 1 };
genX(emit_urb_setup)(device, &cmd_buffer->batch,
......
......@@ -308,18 +308,18 @@ genX(emit_urb_setup)(struct anv_device *device, struct anv_batch *batch,
static void
emit_urb_setup(struct anv_pipeline *pipeline)
{
unsigned entry_size[4];
for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
const struct brw_vue_prog_data *prog_data =
!anv_pipeline_has_stage(pipeline, i) ? NULL :
(const struct brw_vue_prog_data *) pipeline->shaders[i]->prog_data;
pipeline->urb.entry_size[i] = prog_data ? prog_data->urb_entry_size : 1;
entry_size[i] = prog_data ? prog_data->urb_entry_size : 1;
}
genX(emit_urb_setup)(pipeline->device, &pipeline->batch,
pipeline->urb.l3_config,
pipeline->active_stages,
pipeline->urb.entry_size);
pipeline->active_stages, entry_size);
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment