diff options
| author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-08-24 17:16:04 +0200 |
|---|---|---|
| committer | Samuel Iglesias Gonsálvez <siglesias@igalia.com> | 2017-09-12 07:01:40 +0200 |
| commit | 806ae6a648326327ead48d1b9aec6f44f74f06f9 (patch) | |
| tree | 192672233327612f7d84698e6a7d8d68ef4215a3 | |
| parent | 5666d3e3e5a5d598c5ea4a2b2d3682ef97c3f877 (diff) | |
nir/spirv: handle if's with same label in both branches
When a conditional branch has the same labels in the "if" part and in the
"else" part, then we have the same cfg block, and it must be handled
once.
v2: handle it the same way as OpBranch (Jason).
Fixes:
dEQP-VK.spirv_assembly.instruction.compute.conditional_branch.same_labels*
dEQP-VK.spirv_assembly.instruction.graphics.conditional_branch.same_labels*
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
| -rw-r--r-- | src/compiler/spirv/vtn_cfg.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c index 03c452cb31a..3ad20b9ad83 100644 --- a/src/compiler/spirv/vtn_cfg.c +++ b/src/compiler/spirv/vtn_cfg.c @@ -356,8 +356,16 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, switch_case, switch_break, loop_break, loop_cont); - if (if_stmt->then_type == vtn_branch_type_none && - if_stmt->else_type == vtn_branch_type_none) { + if (then_block == else_block) { + block->branch_type = if_stmt->then_type; + if (block->branch_type == vtn_branch_type_none) { + block = then_block; + continue; + } else { + return; + } + } else if (if_stmt->then_type == vtn_branch_type_none && + if_stmt->else_type == vtn_branch_type_none) { /* Neither side of the if is something we can short-circuit. */ assert((*block->merge & SpvOpCodeMask) == SpvOpSelectionMerge); struct vtn_block *merge_block = |