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

radv: do not dump meta shader stats

Browse Source 
That's quite useless and that pollutes the output.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2018-01-31 11:40:24 +01:00
parent 26cc3e74b9
commit a097a6f519
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/amd/vulkan/radv_pipeline.c
View File

@@ -110,18 +110,6 @@ void radv_DestroyPipeline(
radv_pipeline_destroy(device, pipeline, pAllocator); radv_pipeline_destroy(device, pipeline, pAllocator);
} }
static void radv_dump_pipeline_stats(struct radv_device *device, struct radv_pipeline *pipeline)
{
int i;
for (i = 0; i < MESA_SHADER_STAGES; i++) {
if (!pipeline->shaders[i])
continue;
radv_shader_dump_stats(device, pipeline->shaders[i], i, stderr);
}
}
static uint32_t get_hash_flags(struct radv_device *device) static uint32_t get_hash_flags(struct radv_device *device)
{ {
uint32_t hash_flags = 0; uint32_t hash_flags = 0;
@@ -1861,8 +1849,15 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
for (int i = 0; i < MESA_SHADER_STAGES; ++i) { for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
free(codes[i]); free(codes[i]);
if (modules[i] && !pipeline->device->keep_shader_info) if (modules[i]) {
ralloc_free(nir[i]); if (!pipeline->device->keep_shader_info)
ralloc_free(nir[i]);
if (radv_can_dump_shader_stats(device, modules[i]))
radv_shader_dump_stats(device,
pipeline->shaders[i],
i, stderr);
}
} }
if (fs_m.nir) if (fs_m.nir)
@@ -3233,10 +3228,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
pipeline->graphics.vtx_emit_num = 2; pipeline->graphics.vtx_emit_num = 2;
} }
if (device->instance->debug_flags & RADV_DEBUG_DUMP_SHADER_STATS) {
radv_dump_pipeline_stats(device, pipeline);
}
result = radv_pipeline_scratch_init(device, pipeline); result = radv_pipeline_scratch_init(device, pipeline);
radv_pipeline_generate_pm4(pipeline, pCreateInfo, extra, &blend, &tess, &gs, prim, gs_out); radv_pipeline_generate_pm4(pipeline, pCreateInfo, extra, &blend, &tess, &gs, prim, gs_out);
@@ -3400,9 +3391,6 @@ static VkResult radv_compute_pipeline_create(
*pPipeline = radv_pipeline_to_handle(pipeline); *pPipeline = radv_pipeline_to_handle(pipeline);
if (device->instance->debug_flags & RADV_DEBUG_DUMP_SHADER_STATS) {
radv_dump_pipeline_stats(device, pipeline);
}
return VK_SUCCESS; return VK_SUCCESS;
} }

9
src/amd/vulkan/radv_shader.h
View File

@@ -122,4 +122,13 @@ radv_can_dump_shader(struct radv_device *device,
module && !module->nir; module && !module->nir;
} }
static inline bool
radv_can_dump_shader_stats(struct radv_device *device,
struct radv_shader_module *module)
{
/* Only dump non-meta shader stats. */
return device->instance->debug_flags & RADV_DEBUG_DUMP_SHADER_STATS &&
module && !module->nir;
}
#endif #endif