fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-25 07:00:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

gallium: drop pipe_compute_state.req_private_mem

Browse source 
nothing used it and nothing will use it, so just drop it and clean up some
dead struct fields in drivers.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18581>
This commit is contained in:
Karol Herbst 2022-09-13 18:58:07 +02:00 • committed by Marge Bot
parent b5a3b9f555
commit 2a52297141
13 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/auxiliary/driver_trace/tr_dump_state.c
View file

@ -350,7 +350,6 @@ void trace_dump_compute_state(const struct pipe_compute_state *state)
trace_dump_member_end();
trace_dump_member(uint, state, req_local_mem);
trace_dump_member(uint, state, req_private_mem);
trace_dump_member(uint, state, req_input_mem);
trace_dump_struct_end();

1
src/gallium/drivers/nouveau/nv50/nv50_program.h
View file

@ -107,7 +107,6 @@ struct nv50_program {
} gp;
struct {
uint32_t lmem_size; /* local memory (TGSI PRIVATE resource) size */
uint32_t smem_size; /* shared memory (TGSI LOCAL resource) size */
struct nv50_gmem_state gmem[NV50_MAX_GLOBALS];
} cp;

1
src/gallium/drivers/nouveau/nv50/nv50_state.c
View file

@ -862,7 +862,6 @@ nv50_cp_state_create(struct pipe_context *pipe,
}
prog->cp.smem_size = cso->req_local_mem;
prog->cp.lmem_size = cso->req_private_mem;
prog->parm_size = cso->req_input_mem;
return (void *)prog;

2
src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
View file

@ -441,7 +441,7 @@ nvc0_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
PUSH_DATA (push, cp->code_base);
BEGIN_NVC0(push, NVC0_CP(LOCAL_POS_ALLOC), 3);
PUSH_DATA (push, (cp->hdr[1] & 0xfffff0) + align(cp->cp.lmem_size, 0x10));
PUSH_DATA (push, cp->hdr[1] & 0xfffff0);
PUSH_DATA (push, 0);
PUSH_DATA (push, 0x800); /* WARP_CSTACK_SIZE */

1
src/gallium/drivers/nouveau/nvc0/nvc0_program.h
View file

@ -60,7 +60,6 @@ struct nvc0_program {
uint32_t tess_mode; /* ~0 if defined by the other stage */
} tp;
struct {
uint32_t lmem_size; /* local memory (TGSI PRIVATE resource) size */
uint32_t smem_size; /* shared memory (TGSI LOCAL resource) size */
} cp;
uint8_t num_barriers;

1
src/gallium/drivers/nouveau/nvc0/nvc0_state.c
View file

@ -742,7 +742,6 @@ nvc0_cp_state_create(struct pipe_context *pipe,
prog->pipe.type = cso->ir_type;
prog->cp.smem_size = cso->req_local_mem;
prog->cp.lmem_size = cso->req_private_mem;
prog->parm_size = cso->req_input_mem;
switch(cso->ir_type) {

12
src/gallium/drivers/nouveau/nvc0/nve4_compute.c
View file

@ -649,9 +649,7 @@ nve4_compute_setup_launch_desc(struct nvc0_context *nvc0, uint32_t *qmd,
NVA0C0_QMDV00_06_VAL_SET(qmd, SHARED_MEMORY_SIZE,
align(cp->cp.smem_size, 0x100));
NVA0C0_QMDV00_06_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE,
(cp->hdr[1] & 0xfffff0) +
align(cp->cp.lmem_size, 0x10));
NVA0C0_QMDV00_06_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE, cp->hdr[1] & 0xfffff0);
NVA0C0_QMDV00_06_VAL_SET(qmd, SHADER_LOCAL_MEMORY_HIGH_SIZE, 0);
NVA0C0_QMDV00_06_VAL_SET(qmd, SHADER_LOCAL_MEMORY_CRS_SIZE, 0x800);
@ -709,9 +707,7 @@ gp100_compute_setup_launch_desc(struct nvc0_context *nvc0, uint32_t *qmd,
NVC0C0_QMDV02_01_VAL_SET(qmd, SHARED_MEMORY_SIZE,
align(cp->cp.smem_size, 0x100));
NVC0C0_QMDV02_01_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE,
(cp->hdr[1] & 0xfffff0) +
align(cp->cp.lmem_size, 0x10));
NVC0C0_QMDV02_01_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE, cp->hdr[1] & 0xfffff0);
NVC0C0_QMDV02_01_VAL_SET(qmd, SHADER_LOCAL_MEMORY_HIGH_SIZE, 0);
NVC0C0_QMDV02_01_VAL_SET(qmd, SHADER_LOCAL_MEMORY_CRS_SIZE, 0x800);
@ -759,9 +755,7 @@ gv100_compute_setup_launch_desc(struct nvc0_context *nvc0, u32 *qmd,
NVC3C0_QMDV02_02_DEF_SET(qmd, SAMPLER_INDEX, INDEPENDENTLY);
NVC3C0_QMDV02_02_VAL_SET(qmd, SHARED_MEMORY_SIZE,
align(cp->cp.smem_size, 0x100));
NVC3C0_QMDV02_02_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE,
(cp->hdr[1] & 0xfffff0) +
align(cp->cp.lmem_size, 0x10));
NVC3C0_QMDV02_02_VAL_SET(qmd, SHADER_LOCAL_MEMORY_LOW_SIZE, cp->hdr[1] & 0xfffff0);
NVC3C0_QMDV02_02_VAL_SET(qmd, SHADER_LOCAL_MEMORY_HIGH_SIZE, 0);
NVC3C0_QMDV02_02_VAL_SET(qmd, MIN_SM_CONFIG_SHARED_MEM_SIZE,
gv100_sm_config_smem_size(8 * 1024));

1
src/gallium/drivers/r600/evergreen_compute.c
View file

@ -436,7 +436,6 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx,
shader->ctx = rctx;
shader->local_size = cso->req_local_mem;
shader->private_size = cso->req_private_mem;
shader->input_size = cso->req_input_mem;
shader->ir_type = cso->ir_type;

1
src/gallium/drivers/r600/evergreen_compute_internal.h
View file

@ -81,7 +81,6 @@ struct r600_pipe_compute {
struct r600_bytecode bc;
unsigned local_size;
unsigned private_size;
unsigned input_size;
struct r600_resource *kernel_param;

3
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -49,7 +49,6 @@ struct dispatch_packet {
uint32_t grid_size_x;
uint32_t grid_size_y;
uint32_t grid_size_z;
uint32_t private_segment_size;
uint32_t group_segment_size;
uint64_t kernel_object;
uint64_t kernarg_address;
@ -245,7 +244,6 @@ static void *si_create_compute_state(struct pipe_context *ctx, const struct pipe
program->shader.selector = &program->sel;
program->shader.wave_size = si_determine_wave_size(sscreen, &program->shader);
program->ir_type = cso->ir_type;
program->private_size = cso->req_private_mem;
program->input_size = cso->req_input_mem;
if (cso->ir_type != PIPE_SHADER_IR_NATIVE) {
@ -684,7 +682,6 @@ static void si_setup_user_sgprs_co_v2(struct si_context *sctx, const amd_kernel_
dispatch.grid_size_y = util_cpu_to_le32(info->grid[1] * info->block[1]);
dispatch.grid_size_z = util_cpu_to_le32(info->grid[2] * info->block[2]);
dispatch.private_segment_size = util_cpu_to_le32(program->private_size);
dispatch.group_segment_size = util_cpu_to_le32(program->sel.info.base.shared_size);
dispatch.kernarg_address = util_cpu_to_le64(kernel_args_va);

1
src/gallium/drivers/radeonsi/si_compute.h
View file

@ -33,7 +33,6 @@ struct si_compute {
struct si_shader shader;
unsigned ir_type;
unsigned private_size;
unsigned input_size;
int max_global_buffers;

1
src/gallium/frontends/rusticl/mesa/pipe/context.rs
View file

@ -276,7 +276,6 @@ impl PipeContext {
prog: nir.dup_for_driver().cast(),
req_input_mem: input_mem,
req_local_mem: local_mem,
req_private_mem: 0,
};
unsafe { self.pipe.as_ref().create_compute_state.unwrap()(self.pipe.as_ptr(), &state) }
}

1
src/gallium/include/pipe/p_state.h
View file

@ -1006,7 +1006,6 @@ struct pipe_compute_state
enum pipe_shader_ir ir_type; /**< IR type contained in prog. */
const void *prog; /**< Compute program to be executed. */
unsigned req_local_mem; /**< Required size of the LOCAL resource. */
unsigned req_private_mem; /**< Required size of the PRIVATE resource. */
unsigned req_input_mem; /**< Required size of the INPUT resource. */
};