fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 09:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pvr: Split pds compute shader create and upload code for reuse.

Browse source 
Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18976>
This commit is contained in:
Rajnesh Kanwal 2022-09-28 19:11:21 +01:00 • committed by Marge Bot
parent b8d9afe75c
commit 0923de04ba
2 changed files with 56 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/imagination/vulkan/pds/pvr_pds.h
View file

@ -689,15 +689,6 @@ pvr_pds_compute_shader(struct pvr_pds_compute_shader_program *restrict program,
enum pvr_pds_generate_mode gen_mode,
const struct pvr_device_info *dev_info);
#define pvr_pds_set_sizes_compute_shader(X, Y) \
pvr_pds_compute_shader(X, NULL, PDS_GENERATE_SIZES, Y)
#define pvr_pds_generate_compute_shader_data_segment(X, Y, Z) \
pvr_pds_compute_shader(X, Y, PDS_GENERATE_DATA_SEGMENT, Z)
#define pvr_pds_generate_compute_shader_code_segment(X, Y, Z) \
pvr_pds_compute_shader(X, Y, PDS_GENERATE_CODE_SEGMENT, Z)
/* Vertex Secondary */
#define pvr_pds_set_sizes_vertex_shader_sa(X, Y) \
pvr_pds_vertex_shader_sa(X, NULL, PDS_GENERATE_SIZES, Y)

96
src/imagination/vulkan/pvr_device.c
View file

@ -1124,17 +1124,67 @@ vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName)
return vk_instance_get_physical_device_proc_addr(&instance->vk, pName);
}
static VkResult pvr_device_init_compute_fence_program(struct pvr_device *device)
static VkResult pvr_pds_compute_shader_create_and_upload(
struct pvr_device *device,
struct pvr_pds_compute_shader_program *program,
struct pvr_pds_upload *const pds_upload_out)
{
const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
struct pvr_pds_compute_shader_program program = { 0U };
size_t staging_buffer_size;
uint32_t *staging_buffer;
uint32_t *data_buffer;
uint32_t *code_buffer;
VkResult result;
/* Calculate how much space we'll need for the compute shader PDS program.
*/
pvr_pds_compute_shader(program, NULL, PDS_GENERATE_SIZES, dev_info);
/* FIXME: Fix the below inconsistency of code size being in bytes whereas
* data size being in dwords.
*/
/* Code size is in bytes, data size in dwords. */
staging_buffer_size =
program->data_size * sizeof(uint32_t) + program->code_size;
staging_buffer = vk_alloc(&device->vk.alloc,
staging_buffer_size,
8U,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!staging_buffer)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
data_buffer = staging_buffer;
code_buffer = pvr_pds_compute_shader(program,
data_buffer,
PDS_GENERATE_DATA_SEGMENT,
dev_info);
pvr_pds_compute_shader(program,
code_buffer,
PDS_GENERATE_CODE_SEGMENT,
dev_info);
result = pvr_gpu_upload_pds(device,
data_buffer,
program->data_size,
PVRX(CDMCTRL_KERNEL1_DATA_ADDR_ALIGNMENT),
code_buffer,
program->code_size / sizeof(uint32_t),
PVRX(CDMCTRL_KERNEL2_CODE_ADDR_ALIGNMENT),
cache_line_size,
pds_upload_out);
vk_free(&device->vk.alloc, staging_buffer);
return result;
}
static VkResult pvr_device_init_compute_fence_program(struct pvr_device *device)
{
struct pvr_pds_compute_shader_program program = { 0U };
STATIC_ASSERT(ARRAY_SIZE(program.local_input_regs) ==
ARRAY_SIZE(program.work_group_input_regs));
STATIC_ASSERT(ARRAY_SIZE(program.local_input_regs) ==
@ -1153,44 +1203,10 @@ static VkResult pvr_device_init_compute_fence_program(struct pvr_device *device)
program.fence = true;
program.clear_pds_barrier = true;
/* Calculate how much space we'll need for the compute shader PDS program.
*/
pvr_pds_set_sizes_compute_shader(&program, dev_info);
/* FIXME: Fix the below inconsistency of code size being in bytes whereas
* data size being in dwords.
*/
/* Code size is in bytes, data size in dwords. */
staging_buffer_size =
program.data_size * sizeof(uint32_t) + program.code_size;
staging_buffer = vk_alloc(&device->vk.alloc,
staging_buffer_size,
8U,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!staging_buffer)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
data_buffer = staging_buffer;
code_buffer = pvr_pds_generate_compute_shader_data_segment(&program,
data_buffer,
dev_info);
pvr_pds_generate_compute_shader_code_segment(&program,
code_buffer,
dev_info);
result = pvr_gpu_upload_pds(device,
data_buffer,
program.data_size,
PVRX(CDMCTRL_KERNEL1_DATA_ADDR_ALIGNMENT),
code_buffer,
program.code_size / sizeof(uint32_t),
PVRX(CDMCTRL_KERNEL2_CODE_ADDR_ALIGNMENT),
cache_line_size,
&device->pds_compute_fence_program);
vk_free(&device->vk.alloc, staging_buffer);
return result;
return pvr_pds_compute_shader_create_and_upload(
device,
&program,
&device->pds_compute_fence_program);
}
static VkResult pvr_pds_idfwdf_programs_create_and_upload(