OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Drop useless 'if (total_scratch > 0) {' block in cmd_buffer_ensure_cfe_state()

Browse Source 
cmd_buffer_ensure_cfe_state() returns ealier if total_scratch == 0 here:

if (total_scratch <= comp_state->scratch_size)
      return;

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30271>
This commit is contained in:
José Roberto de Souza
2024-07-18 10:16:02 -07:00
committed by Marge Bot
parent de5d767f9a
commit 69ee1c4b46
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/intel/vulkan/genX_cmd_compute.c
View File

@@ -54,36 +54,30 @@ genX(cmd_buffer_ensure_cfe_state)(struct anv_cmd_buffer *cmd_buffer,
const struct intel_device_info *devinfo = cmd_buffer->device->info; const struct intel_device_info *devinfo = cmd_buffer->device->info;
anv_batch_emit(&cmd_buffer->batch, GENX(CFE_STATE), cfe) { anv_batch_emit(&cmd_buffer->batch, GENX(CFE_STATE), cfe) {
cfe.MaximumNumberofThreads = cfe.MaximumNumberofThreads = devinfo->max_cs_threads * devinfo->subslice_total;
devinfo->max_cs_threads * devinfo->subslice_total;
uint32_t scratch_surf = 0xffffffff; uint32_t scratch_surf;
if (total_scratch > 0) { struct anv_scratch_pool *scratch_pool =
struct anv_scratch_pool *scratch_pool = (cmd_buffer->vk.pool->flags & VK_COMMAND_POOL_CREATE_PROTECTED_BIT) ?
(cmd_buffer->vk.pool->flags & VK_COMMAND_POOL_CREATE_PROTECTED_BIT) ? &cmd_buffer->device->protected_scratch_pool :
&cmd_buffer->device->protected_scratch_pool : &cmd_buffer->device->scratch_pool;
&cmd_buffer->device->scratch_pool; struct anv_bo *scratch_bo =
struct anv_bo *scratch_bo = anv_scratch_pool_alloc(cmd_buffer->device, scratch_pool,
anv_scratch_pool_alloc(cmd_buffer->device, scratch_pool, MESA_SHADER_COMPUTE,
MESA_SHADER_COMPUTE, total_scratch);
total_scratch); anv_reloc_list_add_bo(cmd_buffer->batch.relocs, scratch_bo);
anv_reloc_list_add_bo(cmd_buffer->batch.relocs, scratch_surf = anv_scratch_pool_get_surf(cmd_buffer->device, scratch_pool,
scratch_bo); total_scratch);
scratch_surf = cfe.ScratchSpaceBuffer = scratch_surf >> ANV_SCRATCH_SPACE_SHIFT(GFX_VER);
anv_scratch_pool_get_surf(cmd_buffer->device, scratch_pool,
total_scratch);
cfe.ScratchSpaceBuffer =
scratch_surf >> ANV_SCRATCH_SPACE_SHIFT(GFX_VER);
#if GFX_VER >= 20 #if GFX_VER >= 20
switch (cmd_buffer->device->physical->instance->stack_ids) { switch (cmd_buffer->device->physical->instance->stack_ids) {
case 256: cfe.StackIDControl = StackIDs256; break; case 256: cfe.StackIDControl = StackIDs256; break;
case 512: cfe.StackIDControl = StackIDs512; break; case 512: cfe.StackIDControl = StackIDs512; break;
case 1024: cfe.StackIDControl = StackIDs1024; break; case 1024: cfe.StackIDControl = StackIDs1024; break;
case 2048: cfe.StackIDControl = StackIDs2048; break; case 2048: cfe.StackIDControl = StackIDs2048; break;
default: unreachable("invalid stack_ids value"); default: unreachable("invalid stack_ids value");
}
#endif
} }
#endif
cfe.OverDispatchControl = 2; /* 50% overdispatch */ cfe.OverDispatchControl = 2; /* 50% overdispatch */
} }