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

spirv: Add workaround to ignore OpReturn after OpEmitMeshTasksEXT

Browse Source 
Fixes: 7d1bcf1f55 ("spirv, nir: Handle EmitMeshTasksEXT opcode.")
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18442>
This commit is contained in:
Caio Oliveira
2022-09-19 13:50:55 -07:00
committed by Marge Bot
parent 89f1727654
commit b89a36fc01
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/spirv/spirv_to_nir.c
View File

@@ -6379,6 +6379,17 @@ vtn_create_builder(const uint32_t *words, size_t word_count,
b->wa_llvm_spirv_ignore_workgroup_initializer = b->wa_llvm_spirv_ignore_workgroup_initializer =
b->options->environment == NIR_SPIRV_OPENCL && is_llvm_spirv_translator; b->options->environment == NIR_SPIRV_OPENCL && is_llvm_spirv_translator;
/* Older versions of GLSLang would incorrectly emit OpReturn after
* OpEmitMeshTasksEXT. This is incorrect since the latter is already
* a terminator instruction.
*
* See https://github.com/KhronosGroup/glslang/issues/3020 for details.
*/
b->wa_ignore_return_after_emit_mesh_tasks =
(b->generator_id == vtn_generator_glslang_reference_front_end ||
b->generator_id == vtn_generator_shaderc_over_glslang) &&
generator_version < 11;
/* words[2] == generator magic */ /* words[2] == generator magic */
unsigned value_id_bound = words[3]; unsigned value_id_bound = words[3];
if (words[4] != 0) { if (words[4] != 0) {

6
src/compiler/spirv/vtn_cfg.c
View File

@@ -308,6 +308,12 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpReturn: case SpvOpReturn:
case SpvOpReturnValue: case SpvOpReturnValue:
case SpvOpUnreachable: case SpvOpUnreachable:
if (b->wa_ignore_return_after_emit_mesh_tasks &&
opcode == SpvOpReturn && !b->block) {
/* At this point block was already reset by
* SpvOpEmitMeshTasksEXT. */
break;
}
vtn_assert(b->block && b->block->branch == NULL); vtn_assert(b->block && b->block->branch == NULL);
b->block->branch = w; b->block->branch = w;
b->block = NULL; b->block = NULL;

3
src/compiler/spirv/vtn_private.h
View File

@@ -719,6 +719,9 @@ struct vtn_builder {
/* True if we need to ignore undef initializers */ /* True if we need to ignore undef initializers */
bool wa_llvm_spirv_ignore_workgroup_initializer; bool wa_llvm_spirv_ignore_workgroup_initializer;
/* True if we need to ignore OpReturn after OpEmitMeshTasksEXT. */
bool wa_ignore_return_after_emit_mesh_tasks;
/* Workaround discard bugs in HLSL -> SPIR-V compilers */ /* Workaround discard bugs in HLSL -> SPIR-V compilers */
bool uses_demote_to_helper_invocation; bool uses_demote_to_helper_invocation;
bool convert_discard_to_demote; bool convert_discard_to_demote;