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

panvk: Use indirect path for indexed draw on JM

Browse Source 
Now that we know that indirect draw works, we can switch to the new
indexed draw codepath.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35724>
This commit is contained in:
Mary Guillemard
2025-06-24 18:50:37 +02:00
committed by Marge Bot
parent a382e97339
commit e25064c026
2 changed files with 4 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/panfrost/ci/panfrost-g52-fails.txt
View File

@@ -396,44 +396,6 @@ dEQP-VK.api.device_init.create_device_global_priority_khr.basic,Fail
dEQP-VK.api.device_init.create_device_global_priority_query.basic,Fail
dEQP-VK.api.device_init.create_device_global_priority_query_khr.basic,Fail
dEQP-VK.device_group.afr,Fail
dEQP-VK.device_group.afr_dedicated,Fail
dEQP-VK.device_group.afr_sys,Fail
dEQP-VK.device_group.sfr,Fail
dEQP-VK.device_group.sfr_dedicated,Fail
dEQP-VK.device_group.sfr_sys,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.renderpass.indexed_draw.draw_instanced_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.1024,Fail
dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.1048576,Fail
dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.65536,Fail
dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.8192,Fail
# New with vk_clear
dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_no_cab.4_bit,Fail
dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.copy_with_regions_before_resolving.4_bit,Fail
@@ -456,79 +418,6 @@ dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_primary_cmdb
dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.partial_binding_depth_stencil,Fail
dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.single_cmdbuffer_resuming,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_list_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_minus_one_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_offset_negative_large_with_bind_offset_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_alloc_offset,Fail
dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.indexed_draw.draw_instanced_indexed_triangle_strip_with_bind_offset_with_alloc_offset,Fail
# CTS bug, see https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5700
dEQP-VK.image.load_store.without_any_format.buffer.b8g8r8_srgb,Fail
dEQP-VK.image.load_store.without_any_format.buffer.b8g8r8_srgb_linear,Fail

76
src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
View File

@@ -84,7 +84,8 @@ struct panvk_draw_data {
static bool
is_indirect_draw(const struct panvk_draw_data *draw)
{
return draw->info.indirect.buffer_dev_addr != 0;
return draw->info.indirect.buffer_dev_addr != 0 ||
draw->info.index.size != 0;
}
static bool
@@ -969,19 +970,7 @@ panvk_emit_tiler_primitive(struct panvk_cmd_buffer *cmdbuf,
}
/* In case of indirect draw, the descriptor will be patched at runtime */
/* XXX: Use indirect draw path for indexed draw */
if (!is_indirect_draw(draw)) {
cfg.index_count = draw->info.vertex.count;
if (draw->info.index.size) {
cfg.indices = cmdbuf->state.gfx.ib.dev_addr +
draw->info.index.offset * draw->info.index.size;
cfg.base_vertex_offset =
(int64_t)draw->info.vertex.base - draw->info.vertex.raw_offset;
}
} else {
cfg.index_count = 1;
}
cfg.index_count = is_indirect_draw(draw) ? 1 : draw->info.vertex.count;
cfg.low_depth_cull = cfg.high_depth_cull =
vk_rasterization_state_depth_clip_enable(rs);
@@ -1865,50 +1854,6 @@ panvk_per_arch(CmdDraw)(VkCommandBuffer commandBuffer, uint32_t vertexCount,
panvk_cmd_draw(cmdbuf, &draw);
}
static void
panvk_index_minmax_search(struct panvk_cmd_buffer *cmdbuf, uint32_t start,
uint32_t count, bool restart, uint32_t *min,
uint32_t *max)
{
struct panvk_device *dev = to_panvk_device(cmdbuf->vk.base.device);
struct panvk_instance *instance =
to_panvk_instance(dev->vk.physical->instance);
void *ptr = cmdbuf->state.gfx.ib.host_addr;
assert(PAN_ARCH < 9 && ptr);
if (!(instance->debug_flags & PANVK_DEBUG_NO_KNOWN_WARN)) {
mesa_logw("Crawling index buffers from the CPU isn't valid in Vulkan\n");
}
*max = 0;
/* TODO: Use pan_minmax_cache */
/* TODO: Read full cacheline of data to mitigate the uncached
* mapping slowness.
*/
switch (cmdbuf->state.gfx.ib.index_size * 8) {
#define MINMAX_SEARCH_CASE(sz) \
case sz: { \
uint##sz##_t *indices = ptr; \
*min = UINT##sz##_MAX; \
for (uint32_t i = 0; i < count; i++) { \
if (restart && indices[i + start] == UINT##sz##_MAX) \
continue; \
*min = MIN2(indices[i + start], *min); \
*max = MAX2(indices[i + start], *max); \
} \
break; \
}
MINMAX_SEARCH_CASE(32)
MINMAX_SEARCH_CASE(16)
MINMAX_SEARCH_CASE(8)
#undef MINMAX_SEARCH_CASE
default:
UNREACHABLE("Invalid index size");
}
}
VKAPI_ATTR void VKAPI_CALL
panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer,
uint32_t indexCount, uint32_t instanceCount,
@@ -1916,7 +1861,6 @@ panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer,
uint32_t firstInstance)
{
VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
uint32_t min_vertex, max_vertex;
if (instanceCount == 0 || indexCount == 0)
return;
@@ -1925,30 +1869,18 @@ panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer,
* firstInstnace. */
assert(firstInstance < INT32_MAX);
const struct vk_input_assembly_state *ia =
&cmdbuf->vk.dynamic_graphics_state.ia;
bool primitive_restart = ia->primitive_restart_enable;
panvk_index_minmax_search(cmdbuf, firstIndex, indexCount, primitive_restart,
&min_vertex, &max_vertex);
unsigned vertex_range = max_vertex - min_vertex + 1;
struct panvk_draw_data draw = {
.info = {
.index.size = cmdbuf->state.gfx.ib.index_size,
.index.offset = firstIndex,
.vertex.base = vertexOffset,
.vertex.raw_offset = min_vertex + vertexOffset,
.vertex.count = indexCount,
.instance.base = firstInstance,
.instance.count = instanceCount,
},
.vertex_range = vertex_range,
.padded_vertex_count =
padded_vertex_count(cmdbuf, vertex_range, instanceCount),
};
panvk_cmd_draw(cmdbuf, &draw);
panvk_cmd_draw_indirect(cmdbuf, &draw);
}
VKAPI_ATTR void VKAPI_CALL