OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: Save a single copy of the softfp64 shader in the context.

Browse Source 
We were recompiling the softfp64 library of functions from GLSL to NIR
every time we compiled a shader that used fp64.  Worse, we were ralloc
stealing it to the GL context.  This meant that we'd accumulate lots of
copies for the lifetime of the context, which was a big space leak.

Instead, we can simply stash a single copy in the GL context, and use
it for subsequent compiles.  Having a single copy should be fine from
a memory context point of view: nir_inline_function_impl already clones
the necessary nir_function_impl's as it inlines.

KHR-GL45.enhanced_layouts.ssb_member_align_non_power_of_2 was previously
OOM'ing a system with 16GB of RAM when using softfp64.  Now it finishes
much more quickly and uses only ~200MB of RAM.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Kenneth Graunke
2019-07-09 00:32:42 -07:00
parent ae4ccb67be
commit ce93bf1876
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/drivers/dri/i965/brw_program.c
View File

@@ -110,14 +110,12 @@ brw_create_nir(struct brw_context *brw,
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
nir_shader *softfp64 = NULL; if (!ctx->SoftFP64 && nir->info.uses_64bit &&
if ((options->lower_doubles_options & nir_lower_fp64_full_software) && (options->lower_doubles_options & nir_lower_fp64_full_software)) {
nir->info.uses_64bit) { ctx->SoftFP64 = glsl_float64_funcs_to_nir(ctx, options);
softfp64 = glsl_float64_funcs_to_nir(ctx, options);
ralloc_steal(ralloc_parent(nir), softfp64);
} }
brw_preprocess_nir(brw->screen->compiler, nir, softfp64); brw_preprocess_nir(brw->screen->compiler, nir, ctx->SoftFP64);
if (stage == MESA_SHADER_TESS_CTRL) { if (stage == MESA_SHADER_TESS_CTRL) {
/* Lower gl_PatchVerticesIn from a sys. value to a uniform on Gen8+. */ /* Lower gl_PatchVerticesIn from a sys. value to a uniform on Gen8+. */

2
src/mesa/main/context.c
View File

@@ -1397,6 +1397,8 @@ _mesa_free_context_data(struct gl_context *ctx, bool destroy_compiler_types)
if (destroy_compiler_types) if (destroy_compiler_types)
_mesa_destroy_shader_compiler_types(); _mesa_destroy_shader_compiler_types();
ralloc_free(ctx->SoftFP64);
/* unbind the context if it's currently bound */ /* unbind the context if it's currently bound */
if (ctx == _mesa_get_current_context()) { if (ctx == _mesa_get_current_context()) {
_mesa_make_current(NULL, NULL, NULL); _mesa_make_current(NULL, NULL, NULL);

5
src/mesa/main/mtypes.h
View File

@@ -4970,6 +4970,11 @@ struct gl_context
*/ */
struct gl_pipeline_object *_Shader; struct gl_pipeline_object *_Shader;
/**
* NIR containing the functions that implement software fp64 support.
*/
struct nir_shader *SoftFP64;
struct gl_query_state Query; /**< occlusion, timer queries */ struct gl_query_state Query; /**< occlusion, timer queries */
struct gl_transform_feedback_state TransformFeedback; struct gl_transform_feedback_state TransformFeedback;

8
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -328,11 +328,9 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
} }
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
nir_shader *softfp64 = NULL; if (!st->ctx->SoftFP64 && nir->info.uses_64bit &&
if (nir->info.uses_64bit &&
(options->lower_doubles_options & nir_lower_fp64_full_software) != 0) { (options->lower_doubles_options & nir_lower_fp64_full_software) != 0) {
softfp64 = glsl_float64_funcs_to_nir(st->ctx, options); st->ctx->SoftFP64 = glsl_float64_funcs_to_nir(st->ctx, options);
ralloc_steal(ralloc_parent(nir), softfp64);
} }
nir_variable_mode mask = nir_variable_mode mask =
@@ -381,7 +379,7 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
} }
if (options->lower_doubles_options) { if (options->lower_doubles_options) {
NIR_PASS(progress, nir, nir_lower_doubles, NIR_PASS(progress, nir, nir_lower_doubles,
softfp64, options->lower_doubles_options); st->ctx->SoftFP64, options->lower_doubles_options);
} }
NIR_PASS(progress, nir, nir_opt_algebraic); NIR_PASS(progress, nir, nir_opt_algebraic);
lowered_64bit_ops |= progress; lowered_64bit_ops |= progress;