From 92196fe74b8a4cc1001162edf4637bfe267e3cec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 27 Sep 2019 18:09:11 -0400 Subject: [PATCH] st/mesa: use pipe_screen::finalize_nir Reviewed-by: Kenneth Graunke --- src/mesa/state_tracker/st_context.c | 1 + src/mesa/state_tracker/st_context.h | 11 ++++ src/mesa/state_tracker/st_glsl_to_nir.cpp | 9 +++- src/mesa/state_tracker/st_nir.h | 2 +- src/mesa/state_tracker/st_nir_builtins.c | 7 ++- src/mesa/state_tracker/st_program.c | 84 +++++++++++++++++++++++-------- 6 files changed, 89 insertions(+), 25 deletions(-) diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 5549d25..82961b8 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -687,6 +687,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, !screen->get_param(screen, PIPE_CAP_TWO_SIDED_COLOR); st->lower_ucp = !screen->get_param(screen, PIPE_CAP_CLIP_PLANES); + st->allow_st_finalize_nir_twice = screen->finalize_nir != NULL; st->has_hw_atomics = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 4a265c4..21ba2f4 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -153,6 +153,17 @@ struct st_context boolean lower_two_sided_color; boolean lower_ucp; + /* There are consequences for drivers wanting to call st_finalize_nir + * twice, once before shader caching and once after lowering for shader + * variants. If shader variants use lowering passes that are not ready + * for that, things can blow up. + * + * If this is true, st_finalize_nir and pipe_screen::finalize_nir will be + * called before the result is stored in the shader cache. If lowering for + * shader variants is invoked, the functions will be called again. + */ + boolean allow_st_finalize_nir_twice; + /** * If a shader can be created when we get its source. * This means it has only 1 variant, not counting glBitmap and diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 67d93d6..0e24937 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -498,6 +498,9 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog, st_finalize_nir_before_variants(nir); + if (st->allow_st_finalize_nir_twice) + st_finalize_nir(st, prog, shader_program, nir, true); + if (st->ctx->_Shader->Flags & GLSL_DUMP) { _mesa_log("\n"); _mesa_log("NIR IR for linked %s program %d:\n", @@ -903,7 +906,8 @@ st_nir_lower_samplers(struct pipe_screen *screen, nir_shader *nir, */ void st_finalize_nir(struct st_context *st, struct gl_program *prog, - struct gl_shader_program *shader_program, nir_shader *nir) + struct gl_shader_program *shader_program, + nir_shader *nir, bool finalize_by_driver) { struct pipe_screen *screen = st->pipe->screen; @@ -927,6 +931,9 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, } st_nir_lower_samplers(screen, nir, shader_program, prog); + + if (finalize_by_driver && screen->finalize_nir) + screen->finalize_nir(screen, nir, false); } } /* extern "C" */ diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h index 2135841..1d1bf1b 100644 --- a/src/mesa/state_tracker/st_nir.h +++ b/src/mesa/state_tracker/st_nir.h @@ -43,7 +43,7 @@ void st_nir_lower_wpos_ytransform(struct nir_shader *nir, void st_finalize_nir(struct st_context *st, struct gl_program *prog, struct gl_shader_program *shader_program, - struct nir_shader *nir); + struct nir_shader *nir, bool finalize_by_driver); void st_nir_opts(struct nir_shader *nir); diff --git a/src/mesa/state_tracker/st_nir_builtins.c b/src/mesa/state_tracker/st_nir_builtins.c index b09d470..aa26c65 100644 --- a/src/mesa/state_tracker/st_nir_builtins.c +++ b/src/mesa/state_tracker/st_nir_builtins.c @@ -52,8 +52,6 @@ st_nir_finish_builtin_shader(struct st_context *st, NIR_PASS_V(nir, nir_lower_io_to_scalar_early, mask); } - st_nir_opts(nir); - nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); st_nir_assign_vs_in_locations(nir); @@ -70,6 +68,11 @@ st_nir_finish_builtin_shader(struct st_context *st, (nir_lower_io_options)0); } + if (screen->finalize_nir) + screen->finalize_nir(screen, nir, true); + else + st_nir_opts(nir); + struct pipe_shader_state state = { .type = PIPE_SHADER_IR_NIR, .ir.nir = nir, diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 56da0c3..e72586e 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -411,6 +411,7 @@ static nir_shader * st_translate_prog_to_nir(struct st_context *st, struct gl_program *prog, gl_shader_stage stage) { + struct pipe_screen *screen = st->pipe->screen; const struct gl_shader_compiler_options *options = &st->ctx->Const.ShaderCompilerOptions[stage]; @@ -419,14 +420,18 @@ st_translate_prog_to_nir(struct st_context *st, struct gl_program *prog, NIR_PASS_V(nir, nir_lower_regs_to_ssa); /* turn registers into SSA */ nir_validate_shader(nir, "after st/ptn lower_regs_to_ssa"); - NIR_PASS_V(nir, st_nir_lower_wpos_ytransform, prog, st->pipe->screen); + NIR_PASS_V(nir, st_nir_lower_wpos_ytransform, prog, screen); NIR_PASS_V(nir, nir_lower_system_values); /* Optimise NIR */ NIR_PASS_V(nir, nir_opt_constant_folding); st_nir_opts(nir); st_finalize_nir_before_variants(nir); - nir_validate_shader(nir, "after st/ptn NIR opts"); + + if (st->allow_st_finalize_nir_twice) + st_finalize_nir(st, prog, NULL, nir, true); + + nir_validate_shader(nir, "after st/glsl finalize_nir"); return nir; } @@ -665,6 +670,7 @@ st_create_vp_variant(struct st_context *st, { struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant); struct pipe_context *pipe = st->pipe; + struct pipe_screen *screen = pipe->screen; struct pipe_shader_state state = {0}; static const gl_state_index16 point_size_state[STATE_LENGTH] = @@ -677,23 +683,28 @@ st_create_vp_variant(struct st_context *st, state.stream_output = stvp->state.stream_output; if (stvp->state.type == PIPE_SHADER_IR_NIR) { + bool finalize = false; + state.type = PIPE_SHADER_IR_NIR; state.ir.nir = nir_shader_clone(NULL, stvp->state.ir.nir); - if (key->clamp_color) + if (key->clamp_color) { NIR_PASS_V(state.ir.nir, nir_lower_clamp_color_outputs); + finalize = true; + } if (key->passthrough_edgeflags) { NIR_PASS_V(state.ir.nir, nir_lower_passthrough_edgeflags); vpv->num_inputs++; + finalize = true; } if (key->lower_point_size) { _mesa_add_state_reference(params, point_size_state); NIR_PASS_V(state.ir.nir, nir_lower_point_size_mov, point_size_state); + finalize = true; } if (key->lower_ucp) { - struct pipe_screen *screen = pipe->screen; bool can_compact = screen->get_param(screen, PIPE_CAP_NIR_COMPACT_ARRAYS); @@ -715,14 +726,17 @@ st_create_vp_variant(struct st_context *st, true, can_compact, clipplane_state); NIR_PASS_V(state.ir.nir, nir_lower_io_to_temporaries, nir_shader_get_entrypoint(state.ir.nir), true, false); + finalize = true; } - st_finalize_nir(st, &stvp->Base, stvp->shader_program, - state.ir.nir); + if (finalize || !st->allow_st_finalize_nir_twice) { + st_finalize_nir(st, &stvp->Base, stvp->shader_program, state.ir.nir, + true); - /* Some of the lowering above may have introduced new varyings */ - nir_shader_gather_info(state.ir.nir, - nir_shader_get_entrypoint(state.ir.nir)); + /* Some of the lowering above may have introduced new varyings */ + nir_shader_gather_info(state.ir.nir, + nir_shader_get_entrypoint(state.ir.nir)); + } vpv->driver_shader = pipe->create_vs_state(pipe, &state); @@ -1222,28 +1236,38 @@ st_create_fp_variant(struct st_context *st, return NULL; if (stfp->state.type == PIPE_SHADER_IR_NIR) { + bool finalize = false; + state.type = PIPE_SHADER_IR_NIR; state.ir.nir = nir_shader_clone(NULL, stfp->state.ir.nir); - if (key->clamp_color) + if (key->clamp_color) { NIR_PASS_V(state.ir.nir, nir_lower_clamp_color_outputs); + finalize = true; + } - if (key->lower_flatshade) + if (key->lower_flatshade) { NIR_PASS_V(state.ir.nir, nir_lower_flatshade); + finalize = true; + } if (key->lower_alpha_func != COMPARE_FUNC_NEVER) { _mesa_add_state_reference(params, alpha_ref_state); NIR_PASS_V(state.ir.nir, nir_lower_alpha_test, key->lower_alpha_func, false, alpha_ref_state); + finalize = true; } - if (key->lower_two_sided_color) + if (key->lower_two_sided_color) { NIR_PASS_V(state.ir.nir, nir_lower_two_sided_color); + finalize = true; + } if (key->persample_shading) { nir_shader *shader = state.ir.nir; nir_foreach_variable(var, &shader->inputs) var->data.sample = true; + finalize = true; } assert(!(key->bitmap && key->drawpixels)); @@ -1257,6 +1281,7 @@ st_create_fp_variant(struct st_context *st, options.swizzle_xxxx = st->bitmap.tex_format == PIPE_FORMAT_R8_UNORM; NIR_PASS_V(state.ir.nir, nir_lower_bitmap, &options); + finalize = true; } /* glDrawPixels (color only) */ @@ -1290,6 +1315,7 @@ st_create_fp_variant(struct st_context *st, sizeof(options.texcoord_state_tokens)); NIR_PASS_V(state.ir.nir, nir_lower_drawpixels, &options); + finalize = true; } if (unlikely(key->external.lower_nv12 || key->external.lower_iyuv || @@ -1303,23 +1329,34 @@ st_create_fp_variant(struct st_context *st, options.lower_ayuv_external = key->external.lower_ayuv; options.lower_xyuv_external = key->external.lower_xyuv; NIR_PASS_V(state.ir.nir, nir_lower_tex, &options); + finalize = true; } - st_finalize_nir(st, &stfp->Base, stfp->shader_program, state.ir.nir); + if (finalize || !st->allow_st_finalize_nir_twice) { + st_finalize_nir(st, &stfp->Base, stfp->shader_program, state.ir.nir, + false); + } + /* This pass needs to happen *after* nir_lower_sampler */ if (unlikely(key->external.lower_nv12 || key->external.lower_iyuv || key->external.lower_xy_uxvx || key->external.lower_yx_xuxv)) { - /* This pass needs to happen *after* nir_lower_sampler */ NIR_PASS_V(state.ir.nir, st_nir_lower_tex_src_plane, ~stfp->Base.SamplersUsed, key->external.lower_nv12 || key->external.lower_xy_uxvx || key->external.lower_yx_xuxv, key->external.lower_iyuv); + finalize = true; } - /* Some of the lowering above may have introduced new varyings */ - nir_shader_gather_info(state.ir.nir, - nir_shader_get_entrypoint(state.ir.nir)); + if (finalize || !st->allow_st_finalize_nir_twice) { + /* Some of the lowering above may have introduced new varyings */ + nir_shader_gather_info(state.ir.nir, + nir_shader_get_entrypoint(state.ir.nir)); + + struct pipe_screen *screen = pipe->screen; + if (screen->finalize_nir) + screen->finalize_nir(screen, state.ir.nir, false); + } variant->driver_shader = pipe->create_fs_state(pipe, &state); variant->key = *key; @@ -1728,18 +1765,23 @@ st_get_common_variant(struct st_context *st, /* create new */ v = CALLOC_STRUCT(st_common_variant); if (v) { - if (prog->state.type == PIPE_SHADER_IR_NIR) { + bool finalize = false; + state.type = PIPE_SHADER_IR_NIR; state.ir.nir = nir_shader_clone(NULL, prog->state.ir.nir); - if (key->clamp_color) + if (key->clamp_color) { NIR_PASS_V(state.ir.nir, nir_lower_clamp_color_outputs); + finalize = true; + } state.stream_output = prog->state.stream_output; - st_finalize_nir(st, &prog->Base, prog->shader_program, - state.ir.nir); + if (finalize || !st->allow_st_finalize_nir_twice) { + st_finalize_nir(st, &prog->Base, prog->shader_program, + state.ir.nir, true); + } } else { if (key->lower_depth_clamp) { struct gl_program_parameter_list *params = prog->Base.Parameters; -- 2.7.4