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

freedreno: a2xx: use nir_lower_io for TGSI shaders

Browse source 
Allows removing the load_deref/store_deref code in the compiler.

tgsi_to_nir now uses screen instead of options so we can simplify that too.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Jonathan Marek 2019-04-10 14:11:26 -04:00 • committed by Rob Clark
parent bce4f11dbc
commit 7f670ca5fd
2 changed files with 11 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gallium/drivers/freedreno/a2xx/fd2_program.c
View file

@ -32,6 +32,7 @@
#include "util/u_format.h" #include "util/u_format.h"
#include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_dump.h"
#include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_parse.h"
#include "nir/tgsi_to_nir.h"
#include "freedreno_program.h" #include "freedreno_program.h"
@ -96,14 +97,11 @@ fd2_fp_state_create(struct pipe_context *pctx,
if (!so) if (!so)
return NULL; return NULL;
if (cso->type == PIPE_SHADER_IR_NIR) { so->nir = (cso->type == PIPE_SHADER_IR_NIR) ? cso->ir.nir :
so->nir = cso->ir.nir; tgsi_to_nir(cso->tokens, pctx->screen);
NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
(nir_lower_io_options)0); (nir_lower_io_options)0);
} else {
assert(cso->type == PIPE_SHADER_IR_TGSI);
so->nir = ir2_tgsi_to_nir(cso->tokens, pctx->screen);
}
if (ir2_optimize_nir(so->nir, true)) if (ir2_optimize_nir(so->nir, true))
goto fail; goto fail;
@ -136,14 +134,11 @@ fd2_vp_state_create(struct pipe_context *pctx,
if (!so) if (!so)
return NULL; return NULL;
if (cso->type == PIPE_SHADER_IR_NIR) { so->nir = (cso->type == PIPE_SHADER_IR_NIR) ? cso->ir.nir :
so->nir = cso->ir.nir; tgsi_to_nir(cso->tokens, pctx->screen);
NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
NIR_PASS_V(so->nir, nir_lower_io, nir_var_all, ir2_glsl_type_size,
(nir_lower_io_options)0); (nir_lower_io_options)0);
} else {
assert(cso->type == PIPE_SHADER_IR_TGSI);
so->nir = ir2_tgsi_to_nir(cso->tokens, pctx->screen);
}
if (ir2_optimize_nir(so->nir, true)) if (ir2_optimize_nir(so->nir, true))
goto fail; goto fail;

38
src/gallium/drivers/freedreno/a2xx/ir2_nir.c
View file

@ -25,7 +25,6 @@
*/ */
#include "ir2_private.h" #include "ir2_private.h"
#include "nir/tgsi_to_nir.h"
#include "freedreno_util.h" #include "freedreno_util.h"
#include "fd2_program.h" #include "fd2_program.h"
@ -42,17 +41,6 @@ static const nir_shader_compiler_options options = {
.vertex_id_zero_based = true, /* its not implemented anyway */ .vertex_id_zero_based = true, /* its not implemented anyway */
}; };
struct nir_shader *
ir2_tgsi_to_nir(const struct tgsi_token *tokens,
struct pipe_screen *screen)
{
if (!screen) {
return tgsi_to_nir_noscreen(tokens, &options);
}
return tgsi_to_nir(tokens, screen);
}
const nir_shader_compiler_options * const nir_shader_compiler_options *
ir2_get_compiler_options(void) ir2_get_compiler_options(void)
{ {
@ -598,7 +586,6 @@ emit_intrinsic(struct ir2_context *ctx, nir_intrinsic_instr *intr)
{ {
struct ir2_instr *instr; struct ir2_instr *instr;
nir_const_value *const_offset; nir_const_value *const_offset;
nir_deref_instr *deref;
unsigned idx; unsigned idx;
switch (intr->intrinsic) { switch (intr->intrinsic) {
@ -608,16 +595,6 @@ emit_intrinsic(struct ir2_context *ctx, nir_intrinsic_instr *intr)
case nir_intrinsic_store_output: case nir_intrinsic_store_output:
store_output(ctx, intr->src[0], output_slot(ctx, intr), intr->num_components); store_output(ctx, intr->src[0], output_slot(ctx, intr), intr->num_components);
break; break;
case nir_intrinsic_load_deref:
deref = nir_src_as_deref(intr->src[0]);
assert(deref->deref_type == nir_deref_type_var);
load_input(ctx, &intr->dest, deref->var->data.driver_location);
break;
case nir_intrinsic_store_deref:
deref = nir_src_as_deref(intr->src[0]);
assert(deref->deref_type == nir_deref_type_var);
store_output(ctx, intr->src[1], deref->var->data.location, intr->num_components);
break;
case nir_intrinsic_load_uniform: case nir_intrinsic_load_uniform:
const_offset = nir_src_as_const_value(intr->src[0]); const_offset = nir_src_as_const_value(intr->src[0]);
assert(const_offset); /* TODO can be false in ES2? */ assert(const_offset); /* TODO can be false in ES2? */
@ -1066,21 +1043,10 @@ static void cleanup_binning(struct ir2_context *ctx)
continue; continue;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
unsigned slot; if (intr->intrinsic != nir_intrinsic_store_output)
switch (intr->intrinsic) {
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intr->src[0]);
assert(deref->deref_type == nir_deref_type_var);
slot = deref->var->data.location;
} break;
case nir_intrinsic_store_output:
slot = output_slot(ctx, intr);
break;
default:
continue; continue;
}
if (slot != VARYING_SLOT_POS) if (output_slot(ctx, intr) != VARYING_SLOT_POS)
nir_instr_remove(instr); nir_instr_remove(instr);
} }
} }