<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Wed, Apr 15, 2015 at 2:24 AM, Kenneth Graunke <<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Jason noticed that shader_time was bumping the reference count on the gl_shader_program and gl_program structures, in code called during compilation. Not only were these never unreferenced, but it meant fragment shaders might be referenced twice (SIMD8 and SIMD16)...or only once. We don't actually need the programs. We just need their numeric ID and their language (GLSL/ARB/FF) or KHR_debug label. If there's a label, we have to strdup it since the underlying program could be deleted. To be fair, we're not exactly cleaning that up either, but we at least ralloc it out of the shader_time arrays, so if we ever bother cleaning those up, they'll go away properly. Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> --- src/mesa/drivers/dri/i965/brw_context.h | 4 +-- src/mesa/drivers/dri/i965/brw_program.c | 52 +++++++++++---------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 0bd0ed1..a6d6787 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1454,8 +1454,8 @@ struct brw_context struct { drm_intel_bo *bo; - struct gl_shader_program **shader_programs; - struct gl_program **programs; + const char **names; + int *ids; enum shader_time_shader_type *types; uint64_t *cumulative; int num_entries; diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 7ea08e6..81a0c19 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -294,10 +294,8 @@ brw_init_shader_time(struct brw_context *brw) brw-><a href="http://shader_time.bo" target="_blank">shader_time.bo</a> = drm_intel_bo_alloc(brw->bufmgr, "shader time", max_entries * SHADER_TIME_STRIDE, 4096); - brw->shader_time.shader_programs = rzalloc_array(brw, struct gl_shader_program *, - max_entries); - brw->shader_time.programs = rzalloc_array(brw, struct gl_program *, - max_entries); + brw->shader_time.names = rzalloc_array(brw, const char *, max_entries); + brw->shader_time.ids = rzalloc_array(brw, int, max_entries); brw->shader_time.types = rzalloc_array(brw, enum shader_time_shader_type, max_entries); brw->shader_time.cumulative = rzalloc_array(brw, uint64_t, @@ -434,36 +432,15 @@ brw_report_shader_time(struct brw_context *brw) fprintf(stderr, "\n"); fprintf(stderr, "type ID cycles spent %% of total\n"); for (int s = 0; s < brw->shader_time.num_entries; s++) { - const char *shader_name; const char *stage; /* Work back from the sorted pointers times to a time to print. */ int i = sorted[s] - scaled; - struct gl_shader_program *prog = brw->shader_time.shader_programs[i]; if (scaled[i] == 0) continue; - int shader_num = 0; - if (prog) { - shader_num = prog->Name; - - if (prog->Label) { - shader_name = prog->Label; - } else if (shader_num == 0) { - shader_name = "ff"; - } else { - shader_name = "glsl"; - } - } else if (brw->shader_time.programs[i]) { - shader_num = brw->shader_time.programs[i]->Id; - if (shader_num == 0) { - shader_name = "ff"; - } else { - shader_name = "prog"; - } - } else { - shader_name = "other"; - } + int shader_num = brw->shader_time.ids[i]; + const char *shader_name = brw->shader_time.names[i]; switch (brw->shader_time.types[i]) { case ST_VS: @@ -543,19 +520,24 @@ brw_get_shader_time_index(struct brw_context *brw, struct gl_program *prog, enum shader_time_shader_type type) { - struct gl_context *ctx = &brw->ctx; - int shader_time_index = brw->shader_time.num_entries++; assert(shader_time_index < brw->shader_time.max_entries); brw->shader_time.types[shader_time_index] = type; - _mesa_reference_shader_program(ctx, - &brw->shader_time.shader_programs[shader_time_index], - shader_prog); + int id = shader_prog ? shader_prog->Name : prog->Id; + const char *name; + if (id == 0) { + name = "ff"; + } else if (!shader_prog) { + name = "prog"; + } else if (shader_prog->Label) { + name = ralloc_strdup(brw->shader_time.names, shader_prog->Label); + } else { + name = "glsl"; + } - _mesa_reference_program(ctx, - &brw->shader_time.programs[shader_time_index], - prog); + brw->shader_time.names[shader_time_index] = name; + brw->shader_time.ids[shader_time_index] = id; return shader_time_index; } -- 2.3.5 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div><div class="gmail_extra">Acked-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>></div></div>