From: Alyssa Rosenzweig Date: Fri, 30 Aug 2019 20:08:16 +0000 (-0700) Subject: pan/midgard: Count shader-db stats by bundled instructions X-Git-Tag: upstream/19.3.0~2337 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67909c8ff288483106bea63e893752e6989eb3e3;p=platform%2Fupstream%2Fmesa.git pan/midgard: Count shader-db stats by bundled instructions This does not affect shaders in any way. Rather, it makes the shader-db instruction count recorded in the compiler accurate with the in-order scheduler, matching up with what we calculate from pandecode. Though shaders are the same, instruction counts cannot be compared across this commit for this reason. Signed-off-by: Alyssa Rosenzweig --- diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 74796b6..6996685 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2800,15 +2800,14 @@ midgard_compile_shader_nir(struct midgard_screen *screen, nir_shader *nir, midga /* Count instructions and bundles */ - mir_foreach_instr_global(ctx, ins) { - nr_ins++; - } - mir_foreach_block(ctx, block) { nr_bundles += util_dynarray_num_elements( &block->bundles, midgard_bundle); nr_quadwords += block->quadword_count; + + mir_foreach_bundle_in_block(block, bun) + nr_ins += bun->instruction_count; } /* Calculate thread count. There are certain cutoffs by