#include "lima_screen.h"
#include "lima_context.h"
+#include "lima_job.h"
#include "lima_program.h"
#include "lima_bo.h"
+#include "lima_format.h"
+
#include "ir/lima_ir.h"
static const nir_shader_compiler_options vs_nir_options = {
.lower_sub = true,
.lower_flrp32 = true,
.lower_flrp64 = true,
- .lower_ftrunc = true,
/* could be implemented by clamp */
.lower_fsat = true,
.lower_bitops = true,
.lower_rotate = true,
.lower_sincos = true,
+ .lower_fceil = true,
};
static const nir_shader_compiler_options fs_nir_options = {
.lower_fsign = true,
.lower_rotate = true,
.lower_fdot = true,
+ .lower_fdph = true,
.lower_bitops = true,
.lower_vector_cmp = true,
};
-static const struct nir_lower_tex_options tex_options = {
- .lower_txp = ~0u,
-};
-
const void *
lima_program_get_compiler_options(enum pipe_shader_type shader)
{
bool progress;
NIR_PASS_V(s, nir_lower_viewport_transform);
- NIR_PASS_V(s, nir_lower_io, nir_var_all, type_size, 0);
+ NIR_PASS_V(s, nir_lower_point_size, 1.0f, 100.0f);
+ NIR_PASS_V(s, nir_lower_io,
+ nir_var_shader_in | nir_var_shader_out, type_size, 0);
NIR_PASS_V(s, nir_lower_load_const_to_scalar);
NIR_PASS_V(s, lima_nir_lower_uniform_to_scalar);
NIR_PASS_V(s, nir_lower_io_to_scalar,
NIR_PASS(progress, s, nir_opt_cse);
NIR_PASS(progress, s, nir_opt_peephole_select, 8, true, true);
NIR_PASS(progress, s, nir_opt_algebraic);
+ NIR_PASS(progress, s, lima_nir_lower_ftrunc);
NIR_PASS(progress, s, nir_opt_constant_folding);
NIR_PASS(progress, s, nir_opt_undef);
NIR_PASS(progress, s, nir_opt_loop_unroll,
} while (progress);
NIR_PASS_V(s, nir_lower_int_to_float);
+ /* int_to_float pass generates ftrunc, so lower it */
+ NIR_PASS(progress, s, lima_nir_lower_ftrunc);
NIR_PASS_V(s, nir_lower_bool_to_float);
- /* Some ops must be lowered after being converted from int ops,
- * so re-run nir_opt_algebraic after int lowering. */
- do {
- progress = false;
- NIR_PASS(progress, s, nir_opt_algebraic);
- } while (progress);
-
NIR_PASS_V(s, nir_copy_prop);
NIR_PASS_V(s, nir_opt_dce);
NIR_PASS_V(s, nir_lower_locals_to_regs);
NIR_PASS_V(s, nir_convert_from_ssa, true);
- NIR_PASS_V(s, nir_remove_dead_variables, nir_var_function_temp);
+ NIR_PASS_V(s, nir_remove_dead_variables, nir_var_function_temp, NULL);
nir_sweep(s);
}
case nir_op_fsqrt:
case nir_op_fsin:
case nir_op_fcos:
- /* nir vec4 fcsel assumes that each component of the condition will be
- * used to select the same component from the two options, but lima
- * can't implement that since we only have 1 component condition */
- case nir_op_fcsel:
- case nir_op_bcsel:
return true;
default:
break;
}
+ /* nir vec4 fcsel assumes that each component of the condition will be
+ * used to select the same component from the two options, but Utgard PP
+ * has only 1 component condition. If all condition components are not the
+ * same we need to lower it to scalar.
+ */
+ switch (alu->op) {
+ case nir_op_bcsel:
+ case nir_op_fcsel:
+ break;
+ default:
+ return false;
+ }
+
+ int num_components = nir_dest_num_components(alu->dest.dest);
+
+ uint8_t swizzle = alu->src[0].swizzle[0];
+
+ for (int i = 1; i < num_components; i++)
+ if (alu->src[0].swizzle[i] != swizzle)
+ return true;
+
return false;
}
void
-lima_program_optimize_fs_nir(struct nir_shader *s)
+lima_program_optimize_fs_nir(struct nir_shader *s,
+ struct nir_lower_tex_options *tex_options)
{
bool progress;
NIR_PASS_V(s, nir_lower_fragcoord_wtrans);
- NIR_PASS_V(s, nir_lower_io, nir_var_all, type_size, 0);
+ NIR_PASS_V(s, nir_lower_io,
+ nir_var_shader_in | nir_var_shader_out, type_size, 0);
NIR_PASS_V(s, nir_lower_regs_to_ssa);
- NIR_PASS_V(s, nir_lower_tex, &tex_options);
+ NIR_PASS_V(s, nir_lower_tex, tex_options);
do {
progress = false;
- NIR_PASS(progress, s, nir_opt_vectorize);
+ NIR_PASS(progress, s, nir_opt_vectorize, NULL, NULL);
} while (progress);
do {
NIR_PASS_V(s, nir_lower_vars_to_ssa);
NIR_PASS(progress, s, nir_lower_alu_to_scalar, lima_alu_to_scalar_filter_cb, NULL);
- NIR_PASS(progress, s, nir_lower_phis_to_scalar);
NIR_PASS(progress, s, nir_copy_prop);
NIR_PASS(progress, s, nir_opt_remove_phis);
NIR_PASS(progress, s, nir_opt_dce);
nir_var_shader_in |
nir_var_shader_out |
nir_var_function_temp);
+ NIR_PASS(progress, s, lima_nir_split_load_input);
} while (progress);
NIR_PASS_V(s, nir_lower_int_to_float);
NIR_PASS_V(s, nir_lower_locals_to_regs);
NIR_PASS_V(s, nir_convert_from_ssa, true);
- NIR_PASS_V(s, nir_remove_dead_variables, nir_var_function_temp);
+ NIR_PASS_V(s, nir_remove_dead_variables, nir_var_function_temp, NULL);
NIR_PASS_V(s, nir_move_vec_src_uses_to_dest);
NIR_PASS_V(s, nir_lower_vec_to_movs);
+ NIR_PASS_V(s, lima_nir_duplicate_load_uniforms);
+ NIR_PASS_V(s, lima_nir_duplicate_load_inputs);
+ NIR_PASS_V(s, lima_nir_duplicate_load_consts);
+
nir_sweep(s);
}
+static bool
+lima_fs_compile_shader(struct lima_context *ctx,
+ struct lima_fs_shader_state *fs,
+ struct nir_lower_tex_options *tex_options)
+{
+ struct lima_screen *screen = lima_screen(ctx->base.screen);
+ nir_shader *nir = nir_shader_clone(fs, fs->base.ir.nir);
+
+ lima_program_optimize_fs_nir(nir, tex_options);
+
+ if (lima_debug & LIMA_DEBUG_PP)
+ nir_print_shader(nir, stdout);
+
+ if (!ppir_compile_nir(fs, nir, screen->pp_ra, &ctx->debug)) {
+ ralloc_free(nir);
+ return false;
+ }
+
+ fs->uses_discard = nir->info.fs.uses_discard;
+ ralloc_free(nir);
+
+ return true;
+}
+
static void *
lima_create_fs_state(struct pipe_context *pctx,
const struct pipe_shader_state *cso)
{
struct lima_context *ctx = lima_context(pctx);
- struct lima_screen *screen = lima_screen(pctx->screen);
struct lima_fs_shader_state *so = rzalloc(NULL, struct lima_fs_shader_state);
if (!so)
nir_shader *nir;
if (cso->type == PIPE_SHADER_IR_NIR)
+ /* The backend takes ownership of the NIR shader on state
+ * creation.
+ */
nir = cso->ir.nir;
else {
assert(cso->type == PIPE_SHADER_IR_TGSI);
- nir = tgsi_to_nir(cso->tokens, pctx->screen);
+ nir = tgsi_to_nir(cso->tokens, pctx->screen, false);
}
- lima_program_optimize_fs_nir(nir);
+ so->base.type = PIPE_SHADER_IR_NIR;
+ so->base.ir.nir = nir;
- if (lima_debug & LIMA_DEBUG_PP)
- nir_print_shader(nir, stdout);
+ uint8_t identity[4] = { PIPE_SWIZZLE_X,
+ PIPE_SWIZZLE_Y,
+ PIPE_SWIZZLE_Z,
+ PIPE_SWIZZLE_W };
+
+ struct nir_lower_tex_options tex_options = {
+ .lower_txp = ~0u,
+ .swizzle_result = 0,
+ };
- if (!ppir_compile_nir(so, nir, screen->pp_ra, &ctx->debug)) {
+ /* Initialize with identity swizzles. That should suffice for most shaders */
+ for (int i = 0; i < PIPE_MAX_SAMPLERS; i++)
+ memcpy(so->swizzles[i], identity, 4);
+
+ if (!lima_fs_compile_shader(ctx, so, &tex_options)) {
ralloc_free(so);
return NULL;
}
struct lima_fs_shader_state *so = hwcso;
if (so->bo)
- lima_bo_free(so->bo);
+ lima_bo_unreference(so->bo);
+ ralloc_free(so->base.ir.nir);
ralloc_free(so);
}
lima_update_fs_state(struct lima_context *ctx)
{
struct lima_fs_shader_state *fs = ctx->fs;
+ struct lima_texture_stateobj *lima_tex = &ctx->tex_stateobj;
+ struct nir_lower_tex_options tex_options = {
+ .lower_txp = ~0u,
+ .swizzle_result = 0,
+ };
+ bool needs_recompile = false;
+
+ /* Check if texture formats has changed since last compilation.
+ * If it has we need to recompile shader.
+ */
+ if (((ctx->dirty & LIMA_CONTEXT_DIRTY_TEXTURES) &&
+ lima_tex->num_samplers &&
+ lima_tex->num_textures)) {
+ uint8_t identity[4] = { PIPE_SWIZZLE_X,
+ PIPE_SWIZZLE_Y,
+ PIPE_SWIZZLE_Z,
+ PIPE_SWIZZLE_W };
+ for (int i = 0; i < lima_tex->num_samplers; i++) {
+ struct lima_sampler_view *texture = lima_sampler_view(lima_tex->textures[i]);
+ struct pipe_resource *prsc = texture->base.texture;
+ const uint8_t *swizzle = lima_format_get_texel_swizzle(prsc->format);
+ if (memcmp(fs->swizzles[i], swizzle, 4)) {
+ needs_recompile = true;
+ memcpy(fs->swizzles[i], swizzle, 4);
+ }
+
+ for (int j = 0; j < 4; j++)
+ tex_options.swizzles[i][j] = swizzle[j];
+
+ if (memcmp(swizzle, identity, 4))
+ tex_options.swizzle_result |= (1 << i);
+ }
+
+ /* Fill rest with identity swizzle */
+ for (int i = lima_tex->num_samplers; i < PIPE_MAX_SAMPLERS; i++)
+ memcpy(fs->swizzles[i], identity, 4);
+ }
+
+ if (needs_recompile) {
+ if (fs->bo) {
+ lima_bo_unreference(fs->bo);
+ fs->bo = NULL;
+ }
+
+ if (!lima_fs_compile_shader(ctx, fs, &tex_options))
+ return false;
+ }
+
if (!fs->bo) {
struct lima_screen *screen = lima_screen(ctx->base.screen);
fs->bo = lima_bo_create(screen, fs->shader_size, 0);
fs->shader = NULL;
}
- ctx->pp_max_stack_size = MAX2(ctx->pp_max_stack_size, ctx->fs->stack_size);
+ struct lima_job *job = lima_job_get(ctx);
+ job->pp_max_stack_size = MAX2(job->pp_max_stack_size, ctx->fs->stack_size);
return true;
}
else {
assert(cso->type == PIPE_SHADER_IR_TGSI);
- nir = tgsi_to_nir(cso->tokens, pctx->screen);
+ nir = tgsi_to_nir(cso->tokens, pctx->screen, false);
}
lima_program_optimize_vs_nir(nir);
return NULL;
}
+ ralloc_free(nir);
+
return so;
}
struct lima_vs_shader_state *so = hwcso;
if (so->bo)
- lima_bo_free(so->bo);
+ lima_bo_unreference(so->bo);
ralloc_free(so);
}
projects / mesa.git / blobdiff