[Mesa-dev] [PATCH 2/2] nvc0: remove an attempt at uploading all IMMD into a CB
Ilia Mirkin
imirkin at alum.mit.edu
Wed Aug 31 15:44:30 UTC 2016
Series is
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
I think this was an attempt to feed immediates via a constbuf. Not
sure what the advantage is, although at least on nv50 many
instructions can't take an immediate. Like you said, this was never
completed, I think it's fine to remove.
On Wed, Aug 31, 2016 at 11:42 AM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> This has never been used because info->immd.bufSize is always 0
> and anyways this is an experimental code which has never been
> completed.
>
> This gets rid of some unused code in the program validation process.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
> src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 17 -----------------
> src/gallium/drivers/nouveau/nvc0/nvc0_program.h | 3 ---
> src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c | 20 --------------------
> 3 files changed, 40 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> index ae21789..8d97201 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c
> @@ -604,8 +604,6 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset,
>
> prog->code = info->bin.code;
> prog->code_size = info->bin.codeSize;
> - prog->immd_data = info->immd.buf;
> - prog->immd_size = info->immd.bufSize;
> prog->relocs = info->bin.relocData;
> prog->fixups = info->bin.fixupData;
> prog->num_gprs = MAX2(4, (info->bin.maxGPR + 1));
> @@ -692,13 +690,6 @@ nvc0_program_upload_code(struct nvc0_context *nvc0, struct nvc0_program *prog)
> uint32_t lib_pos = screen->lib_code->start;
> uint32_t code_pos;
>
> - /* c[] bindings need to be aligned to 0x100, but we could use relocations
> - * to save space. */
> - if (prog->immd_size) {
> - prog->immd_base = size;
> - size = align(size, 0x40);
> - size += prog->immd_size + 0xc0; /* add 0xc0 for align 0x40 -> 0x100 */
> - }
> /* On Fermi, SP_START_ID must be aligned to 0x40.
> * On Kepler, the first instruction must be aligned to 0x80 because
> * latency information is expected only at certain positions.
> @@ -726,9 +717,6 @@ nvc0_program_upload_code(struct nvc0_context *nvc0, struct nvc0_program *prog)
> IMMED_NVC0(nvc0->base.pushbuf, NVC0_3D(SERIALIZE), 0);
> }
> prog->code_base = prog->mem->start;
> - prog->immd_base = align(prog->mem->start + prog->immd_base, 0x100);
> - assert((prog->immd_size == 0) || (prog->immd_base + prog->immd_size <=
> - prog->mem->start + prog->mem->size));
>
> if (!is_cp) {
> if (screen->base.class_3d >= NVE4_3D_CLASS) {
> @@ -783,10 +771,6 @@ nvc0_program_upload_code(struct nvc0_context *nvc0, struct nvc0_program *prog)
> NV_VRAM_DOMAIN(&screen->base), NVC0_SHADER_HEADER_SIZE, prog->hdr);
> nvc0->base.push_data(&nvc0->base, screen->text, code_pos,
> NV_VRAM_DOMAIN(&screen->base), prog->code_size, prog->code);
> - if (prog->immd_size)
> - nvc0->base.push_data(&nvc0->base,
> - screen->text, prog->immd_base, NV_VRAM_DOMAIN(&screen->base),
> - prog->immd_size, prog->immd_data);
>
> BEGIN_NVC0(nvc0->base.pushbuf, NVC0_3D(MEM_BARRIER), 1);
> PUSH_DATA (nvc0->base.pushbuf, 0x1011);
> @@ -830,7 +814,6 @@ nvc0_program_destroy(struct nvc0_context *nvc0, struct nvc0_program *prog)
> if (prog->mem)
> nouveau_heap_free(&prog->mem);
> FREE(prog->code); /* may be 0 for hardcoded shaders */
> - FREE(prog->immd_data);
> FREE(prog->relocs);
> FREE(prog->fixups);
> if (prog->type == PIPE_SHADER_COMPUTE && prog->cp.syms)
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.h b/src/gallium/drivers/nouveau/nvc0/nvc0_program.h
> index 328088e..d33aa04 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.h
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.h
> @@ -26,11 +26,8 @@ struct nvc0_program {
> uint8_t num_gprs;
>
> uint32_t *code;
> - uint32_t *immd_data;
> unsigned code_base;
> unsigned code_size;
> - unsigned immd_base;
> - unsigned immd_size; /* size of immediate array data */
> unsigned parm_size; /* size of non-bindable uniforms (c0[]) */
>
> uint32_t hdr[20];
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
> index 01fe7ce..0ae4bb1 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
> @@ -34,8 +34,6 @@ static inline void
> nvc0_program_update_context_state(struct nvc0_context *nvc0,
> struct nvc0_program *prog, int stage)
> {
> - struct nouveau_pushbuf *push = nvc0->base.pushbuf;
> -
> if (prog && prog->need_tls) {
> const uint32_t flags = NV_VRAM_DOMAIN(&nvc0->screen->base) | NOUVEAU_BO_RDWR;
> if (!nvc0->state.tls_required)
> @@ -46,24 +44,6 @@ nvc0_program_update_context_state(struct nvc0_context *nvc0,
> nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TLS);
> nvc0->state.tls_required &= ~(1 << stage);
> }
> -
> - if (prog && prog->immd_size) {
> - BEGIN_NVC0(push, NVC0_3D(CB_SIZE), 3);
> - /* NOTE: may overlap code of a different shader */
> - PUSH_DATA (push, align(prog->immd_size, 0x100));
> - PUSH_DATAh(push, nvc0->screen->text->offset + prog->immd_base);
> - PUSH_DATA (push, nvc0->screen->text->offset + prog->immd_base);
> - BEGIN_NVC0(push, NVC0_3D(CB_BIND(stage)), 1);
> - PUSH_DATA (push, (14 << 4) | 1);
> -
> - nvc0->state.c14_bound |= 1 << stage;
> - } else
> - if (nvc0->state.c14_bound & (1 << stage)) {
> - BEGIN_NVC0(push, NVC0_3D(CB_BIND(stage)), 1);
> - PUSH_DATA (push, (14 << 4) | 0);
> -
> - nvc0->state.c14_bound &= ~(1 << stage);
> - }
> }
>
> static inline bool
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list