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

zink: add ZINK_DEBUG=nobgc

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22899>
This commit is contained in:
Mike Blumenkrantz
2023-05-08 08:54:01 -04:00
committed by Marge Bot
parent 0fb5f81ab6
commit 6098c3f9c0
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/drivers/zink.rst
View File

@@ -313,6 +313,8 @@ variable:
Debug/use optimal_keys Debug/use optimal_keys
``noopt`` ``noopt``
Disable async optimized pipeline compiles Disable async optimized pipeline compiles
``nobgc``
Disable all async pipeline compiles
Vulkan Validation Layers Vulkan Validation Layers
^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^

24
src/gallium/drivers/zink/zink_program.c
View File

@@ -813,8 +813,15 @@ zink_gfx_program_compile_queue(struct zink_context *ctx, struct zink_gfx_pipelin
struct zink_screen *screen = zink_screen(ctx->base.screen); struct zink_screen *screen = zink_screen(ctx->base.screen);
if (screen->driver_workarounds.disable_optimized_compile) if (screen->driver_workarounds.disable_optimized_compile)
return; return;
util_queue_add_job(&screen->cache_get_thread, pc_entry, &pc_entry->fence, if (zink_debug & ZINK_DEBUG_NOBGC) {
pc_entry->prog->base.uses_shobj ? optimized_shobj_compile_job : optimized_compile_job, NULL, 0); if (pc_entry->prog->base.uses_shobj)
optimized_shobj_compile_job(pc_entry, screen, 0);
else
optimized_compile_job(pc_entry, screen, 0);
} else {
util_queue_add_job(&screen->cache_get_thread, pc_entry, &pc_entry->fence,
pc_entry->prog->base.uses_shobj ? optimized_shobj_compile_job : optimized_compile_job, NULL, 0);
}
} }
static void static void
@@ -2129,7 +2136,10 @@ zink_link_gfx_shader(struct pipe_context *pctx, void **shaders)
} else { } else {
if (zink_screen(pctx->screen)->info.have_EXT_shader_object) if (zink_screen(pctx->screen)->info.have_EXT_shader_object)
prog->base.uses_shobj = !BITSET_TEST(zshaders[MESA_SHADER_FRAGMENT]->info.system_values_read, SYSTEM_VALUE_SAMPLE_MASK_IN); prog->base.uses_shobj = !BITSET_TEST(zshaders[MESA_SHADER_FRAGMENT]->info.system_values_read, SYSTEM_VALUE_SAMPLE_MASK_IN);
util_queue_add_job(&zink_screen(pctx->screen)->cache_get_thread, prog, &prog->base.cache_fence, precompile_job, NULL, 0); if (zink_debug & ZINK_DEBUG_NOBGC)
precompile_job(prog, pctx->screen, 0);
else
util_queue_add_job(&zink_screen(pctx->screen)->cache_get_thread, prog, &prog->base.cache_fence, precompile_job, NULL, 0);
} }
} }
@@ -2161,8 +2171,12 @@ zink_create_gfx_shader_state(struct pipe_context *pctx, const struct pipe_shader
(screen->info.have_EXT_graphics_pipeline_library && (nir->info.stage == MESA_SHADER_FRAGMENT || nir->info.stage == MESA_SHADER_VERTEX)))) { (screen->info.have_EXT_graphics_pipeline_library && (nir->info.stage == MESA_SHADER_FRAGMENT || nir->info.stage == MESA_SHADER_VERTEX)))) {
struct zink_shader *zs = ret; struct zink_shader *zs = ret;
/* sample shading can't precompile */ /* sample shading can't precompile */
if (nir->info.stage != MESA_SHADER_FRAGMENT || !nir->info.fs.uses_sample_shading) if (nir->info.stage != MESA_SHADER_FRAGMENT || !nir->info.fs.uses_sample_shading) {
util_queue_add_job(&screen->cache_get_thread, zs, &zs->precompile.fence, precompile_separate_shader_job, NULL, 0); if (zink_debug & ZINK_DEBUG_NOBGC)
precompile_separate_shader_job(zs, screen, 0);
else
util_queue_add_job(&screen->cache_get_thread, zs, &zs->precompile.fence, precompile_separate_shader_job, NULL, 0);
}
} }
ralloc_free(nir); ralloc_free(nir);

1
src/gallium/drivers/zink/zink_screen.c
View File

@@ -95,6 +95,7 @@ zink_debug_options[] = {
{ "noshobj", ZINK_DEBUG_NOSHOBJ, "Disable EXT_shader_object" }, { "noshobj", ZINK_DEBUG_NOSHOBJ, "Disable EXT_shader_object" },
{ "optimal_keys", ZINK_DEBUG_OPTIMAL_KEYS, "Debug/use optimal_keys" }, { "optimal_keys", ZINK_DEBUG_OPTIMAL_KEYS, "Debug/use optimal_keys" },
{ "noopt", ZINK_DEBUG_NOOPT, "Disable async optimized pipeline compiles" }, { "noopt", ZINK_DEBUG_NOOPT, "Disable async optimized pipeline compiles" },
{ "nobgc", ZINK_DEBUG_NOBGC, "Disable all async pipeline compiles" },
DEBUG_NAMED_VALUE_END DEBUG_NAMED_VALUE_END
}; };

1
src/gallium/drivers/zink/zink_types.h
View File

@@ -224,6 +224,7 @@ enum zink_debug {
ZINK_DEBUG_NOSHOBJ = (1<<13), ZINK_DEBUG_NOSHOBJ = (1<<13),
ZINK_DEBUG_OPTIMAL_KEYS = (1<<14), ZINK_DEBUG_OPTIMAL_KEYS = (1<<14),
ZINK_DEBUG_NOOPT = (1<<15), ZINK_DEBUG_NOOPT = (1<<15),
ZINK_DEBUG_NOBGC = (1<<16),
}; };
enum zink_pv_emulation_primitive { enum zink_pv_emulation_primitive {