From: Jason Ekstrand Date: Tue, 29 Dec 2015 18:24:54 +0000 (-0800) Subject: nir/spirv: Add support for switch statements X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e22cd2e32d9d579e3496be710c71b802e08b614;p=mesa.git nir/spirv: Add support for switch statements --- diff --git a/src/glsl/nir/spirv/spirv_to_nir.c b/src/glsl/nir/spirv/spirv_to_nir.c index 7aea750cb02..1539c750036 100644 --- a/src/glsl/nir/spirv/spirv_to_nir.c +++ b/src/glsl/nir/spirv/spirv_to_nir.c @@ -3574,26 +3574,42 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, return true; } -static void vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list); +/* XXX: This should go in nir_builder.h */ +static inline void +nir_jump(nir_builder *build, nir_jump_type jump_type) +{ + nir_jump_instr *jump = nir_jump_instr_create(build->shader, jump_type); + nir_builder_instr_insert(build, &jump->instr); +} static void -vtn_emit_branch(struct vtn_builder *b, enum vtn_branch_type branch_type) +vtn_emit_branch(struct vtn_builder *b, enum vtn_branch_type branch_type, + nir_variable *switch_fall_var, bool *has_switch_break) { - nir_jump_type jump_type; switch (branch_type) { - case vtn_branch_type_break: jump_type = nir_jump_break; break; - case vtn_branch_type_continue: jump_type = nir_jump_continue; break; - case vtn_branch_type_return: jump_type = nir_jump_return; break; + case vtn_branch_type_switch_break: + nir_store_var(&b->nb, switch_fall_var, nir_imm_int(&b->nb, NIR_FALSE), 1); + *has_switch_break = true; + break; + case vtn_branch_type_switch_fallthrough: + break; /* Nothing to do */ + case vtn_branch_type_loop_break: + nir_jump(&b->nb, nir_jump_break); + break; + case vtn_branch_type_loop_continue: + nir_jump(&b->nb, nir_jump_continue); + break; + case vtn_branch_type_return: + nir_jump(&b->nb, nir_jump_return); + break; default: unreachable("Invalid branch type"); } - - nir_jump_instr *jump = nir_jump_instr_create(b->shader, jump_type); - nir_builder_instr_insert(&b->nb, &jump->instr); } static void -vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list) +vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list, + nir_variable *switch_fall_var, bool *has_switch_break) { list_for_each_entry(struct vtn_cf_node, node, cf_list, link) { switch (node->type) { @@ -3614,8 +3630,10 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list) NULL); } - if (block->branch_type != vtn_branch_type_none) - vtn_emit_branch(b, block->branch_type); + if (block->branch_type != vtn_branch_type_none) { + vtn_emit_branch(b, block->branch_type, + switch_fall_var, has_switch_break); + } break; } @@ -3628,19 +3646,38 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list) nir_src_for_ssa(vtn_ssa_value(b, vtn_if->condition)->def); nir_cf_node_insert(b->nb.cursor, &if_stmt->cf_node); + bool sw_break = false; + b->nb.cursor = nir_after_cf_list(&if_stmt->then_list); if (vtn_if->then_type == vtn_branch_type_none) - vtn_emit_cf_list(b, &vtn_if->then_body); + vtn_emit_cf_list(b, &vtn_if->then_body, switch_fall_var, &sw_break); else - vtn_emit_branch(b, vtn_if->then_type); + vtn_emit_branch(b, vtn_if->then_type, switch_fall_var, &sw_break); b->nb.cursor = nir_after_cf_list(&if_stmt->else_list); if (vtn_if->else_type == vtn_branch_type_none) - vtn_emit_cf_list(b, &vtn_if->else_body); + vtn_emit_cf_list(b, &vtn_if->else_body, switch_fall_var, &sw_break); else - vtn_emit_branch(b, vtn_if->else_type); + vtn_emit_branch(b, vtn_if->else_type, switch_fall_var, &sw_break); b->nb.cursor = nir_after_cf_node(&if_stmt->cf_node); + + /* If we encountered a switch break somewhere inside of the if, + * then it would have been handled correctly by calling + * emit_cf_list or emit_branch for the interrior. However, we + * need to predicate everything following on wether or not we're + * still going. + */ + if (sw_break) { + *has_switch_break = true; + + nir_if *switch_if = nir_if_create(b->shader); + switch_if->condition = + nir_src_for_ssa(nir_load_var(&b->nb, switch_fall_var)); + nir_cf_node_insert(b->nb.cursor, &switch_if->cf_node); + + b->nb.cursor = nir_after_cf_list(&if_stmt->then_list); + } break; } @@ -3667,21 +3704,89 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list) nir_cf_node_insert(b->nb.cursor, &cont_if->cf_node); b->nb.cursor = nir_after_cf_list(&cont_if->then_list); - vtn_emit_cf_list(b, &vtn_loop->cont_body); + vtn_emit_cf_list(b, &vtn_loop->cont_body, NULL, NULL); b->nb.cursor = nir_after_cf_node(&cont_if->cf_node); nir_store_var(&b->nb, do_cont, nir_imm_int(&b->nb, NIR_TRUE), 1); } b->nb.cursor = nir_after_cf_list(&loop->body); - vtn_emit_cf_list(b, &vtn_loop->body); + vtn_emit_cf_list(b, &vtn_loop->body, NULL, NULL); b->nb.cursor = nir_after_cf_node(&loop->cf_node); break; } - case vtn_cf_node_type_switch: - case vtn_cf_node_type_case: + case vtn_cf_node_type_switch: { + struct vtn_switch *vtn_switch = (struct vtn_switch *)node; + + /* First, we create a variable to keep track of whether or not the + * switch is still going at any given point. Any switch breaks + * will set this variable to false. + */ + nir_variable *fall_var = + nir_local_variable_create(b->nb.impl, glsl_bool_type(), "fall"); + nir_store_var(&b->nb, fall_var, nir_imm_int(&b->nb, NIR_TRUE), 1); + + /* Next, we gather up all of the conditions. We have to do this + * up-front because we also need to build an "any" condition so + * that we can use !any for default. + */ + const int num_cases = list_length(&vtn_switch->cases); + NIR_VLA(nir_ssa_def *, conditions, num_cases); + + nir_ssa_def *sel = vtn_ssa_value(b, vtn_switch->selector)->def; + /* An accumulation of all conditions. Used for the default */ + nir_ssa_def *any = NULL; + + int i = 0; + list_for_each_entry(struct vtn_case, cse, &vtn_switch->cases, link) { + if (cse->is_default) { + conditions[i++] = NULL; + continue; + } + + nir_ssa_def *cond = NULL; + nir_array_foreach(&cse->values, uint32_t, val) { + nir_ssa_def *is_val = + nir_ieq(&b->nb, sel, nir_imm_int(&b->nb, *val)); + + cond = cond ? nir_ior(&b->nb, cond, is_val) : is_val; + } + + any = any ? nir_ior(&b->nb, any, cond) : cond; + conditions[i++] = cond; + } + assert(i == num_cases); + + /* Now we can walk the list of cases and actually emit code */ + i = 0; + list_for_each_entry(struct vtn_case, cse, &vtn_switch->cases, link) { + /* Figure out the condition */ + nir_ssa_def *cond = conditions[i++]; + if (cse->is_default) { + assert(cond == NULL); + cond = nir_inot(&b->nb, any); + } + /* Take fallthrough into account */ + cond = nir_ior(&b->nb, cond, nir_load_var(&b->nb, fall_var)); + + nir_if *case_if = nir_if_create(b->nb.shader); + case_if->condition = nir_src_for_ssa(cond); + nir_cf_node_insert(b->nb.cursor, &case_if->cf_node); + + bool has_break = false; + b->nb.cursor = nir_after_cf_list(&case_if->then_list); + vtn_emit_cf_list(b, &cse->body, fall_var, &has_break); + (void)has_break; /* We don't care */ + + b->nb.cursor = nir_after_cf_node(&case_if->cf_node); + } + assert(i == num_cases); + + break; + } + default: unreachable("Invalid CF node type"); } @@ -3736,7 +3841,7 @@ spirv_to_nir(const uint32_t *words, size_t word_count, _mesa_key_pointer_equal); nir_builder_init(&b->nb, b->impl); b->nb.cursor = nir_after_cf_list(&b->impl->body); - vtn_emit_cf_list(b, &func->body); + vtn_emit_cf_list(b, &func->body, NULL, NULL); vtn_foreach_instruction(b, func->start_block->label, func->end, vtn_handle_phi_second_pass); } diff --git a/src/glsl/nir/spirv/vtn_cfg.c b/src/glsl/nir/spirv/vtn_cfg.c index ee49dc23791..9d8d451b5e0 100644 --- a/src/glsl/nir/spirv/vtn_cfg.c +++ b/src/glsl/nir/spirv/vtn_cfg.c @@ -147,13 +147,99 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode, return true; } +static void +vtn_add_case(struct vtn_builder *b, struct vtn_switch *swtch, + struct vtn_block *break_block, + uint32_t block_id, uint32_t val, bool is_default) +{ + struct vtn_block *case_block = + vtn_value(b, block_id, vtn_value_type_block)->block; + + /* Don't create dummy cases that just break */ + if (case_block == break_block) + return; + + if (case_block->switch_case == NULL) { + struct vtn_case *c = ralloc(b, struct vtn_case); + + list_inithead(&c->body); + c->fallthrough = NULL; + nir_array_init(&c->values, b); + c->is_default = false; + c->visited = false; + + list_addtail(&c->link, &swtch->cases); + + case_block->switch_case = c; + } + + if (is_default) { + case_block->switch_case->is_default = true; + } else { + nir_array_add(&case_block->switch_case->values, uint32_t, val); + } +} + +/* This function performs a depth-first search of the cases and puts them + * in fall-through order. + */ +static void +vtn_order_case(struct vtn_switch *swtch, struct vtn_case *cse) +{ + if (cse->visited) + return; + + cse->visited = true; + + list_del(&cse->link); + + if (cse->fallthrough) { + vtn_order_case(swtch, cse->fallthrough); + + /* If we have a fall-through, place this case right before the case it + * falls through to. This ensures that fallthroughs come one after + * the other. These two can never get separated because that would + * imply something else falling through to the same case. Also, this + * can't break ordering because the DFS ensures that this case is + * visited before anything that falls through to it. + */ + list_addtail(&cse->link, &cse->fallthrough->link); + } else { + list_add(&cse->link, &swtch->cases); + } +} + +static enum vtn_branch_type +vtn_get_branch_type(struct vtn_block *block, + struct vtn_case *swcase, struct vtn_block *switch_break, + struct vtn_block *loop_break, struct vtn_block *loop_cont) +{ + if (block->switch_case) { + /* This branch is actually a fallthrough */ + assert(swcase->fallthrough == NULL || + swcase->fallthrough == block->switch_case); + swcase->fallthrough = block->switch_case; + return vtn_branch_type_switch_fallthrough; + } else if (block == switch_break) { + return vtn_branch_type_switch_break; + } else if (block == loop_break) { + return vtn_branch_type_loop_break; + } else if (block == loop_cont) { + return vtn_branch_type_loop_continue; + } else { + return vtn_branch_type_none; + } +} + static void vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, - struct vtn_block *start, struct vtn_block *break_block, - struct vtn_block *cont_block, struct vtn_block *end_block) + struct vtn_block *start, struct vtn_case *switch_case, + struct vtn_block *switch_break, + struct vtn_block *loop_break, struct vtn_block *loop_cont, + struct vtn_block *end) { struct vtn_block *block = start; - while (block != end_block) { + while (block != end) { if (block->merge && (*block->merge & SpvOpCodeMask) == SpvOpLoopMerge && !block->loop) { struct vtn_loop *loop = ralloc(b, struct vtn_loop); @@ -166,9 +252,9 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, list_addtail(&loop->node.link, cf_list); block->loop = loop; - struct vtn_block *loop_break = + struct vtn_block *new_loop_break = vtn_value(b, block->merge[1], vtn_value_type_block)->block; - struct vtn_block *loop_cont = + struct vtn_block *new_loop_cont = vtn_value(b, block->merge[2], vtn_value_type_block)->block; /* Note: This recursive call will start with the current block as @@ -178,12 +264,19 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, * way, we only create the loop once and the second call that * tries to handle this loop goes to the cases below and gets * handled as a regular block. + * + * Note: When we make the recursive walk calls, we pass NULL for + * the switch break since you have to break out of the loop first. + * We do, however, still pass the current switch case because it's + * possible that the merge block for the loop is the start of + * another case. */ - vtn_cfg_walk_blocks(b, &loop->body, block, - loop_break, loop_cont, NULL ); - vtn_cfg_walk_blocks(b, &loop->cont_body, loop_cont, NULL, NULL, block); + vtn_cfg_walk_blocks(b, &loop->body, block, switch_case, NULL, + new_loop_break, new_loop_cont, NULL ); + vtn_cfg_walk_blocks(b, &loop->cont_body, new_loop_cont, NULL, NULL, + NULL, NULL, block); - block = loop_break; + block = new_loop_break; continue; } @@ -194,23 +287,15 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, struct vtn_block *branch_block = vtn_value(b, block->branch[1], vtn_value_type_block)->block; - if (branch_block == break_block) { - block->branch_type = vtn_branch_type_break; - return; - } else if (branch_block == cont_block) { - block->branch_type = vtn_branch_type_continue; - return; - } else if (branch_block == end_block) { - block->branch_type = vtn_branch_type_none; + block->branch_type = vtn_get_branch_type(branch_block, + switch_case, switch_break, + loop_break, loop_cont); + + if (block->branch_type != vtn_branch_type_none) return; - } else { - /* If it's not one of the above, then we must be jumping to the - * next block in the current CF list. Just keep going. - */ - block->branch_type = vtn_branch_type_none; - block = branch_block; - continue; - } + + block = branch_block; + continue; } case SpvOpReturn: @@ -244,24 +329,12 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, if ((*block->merge & SpvOpCodeMask) == SpvOpSelectionMerge) if_stmt->control = block->merge[2]; - struct vtn_block *next_block = NULL; - if (then_block == break_block) { - if_stmt->then_type = vtn_branch_type_break; - } else if (then_block == cont_block) { - if_stmt->then_type = vtn_branch_type_continue; - } else { - if_stmt->then_type = vtn_branch_type_none; - next_block = then_block; - } - - if (else_block == break_block) { - if_stmt->else_type = vtn_branch_type_break; - } else if (else_block == cont_block) { - if_stmt->else_type = vtn_branch_type_continue; - } else { - if_stmt->else_type = vtn_branch_type_none; - next_block = else_block; - } + if_stmt->then_type = vtn_get_branch_type(then_block, + switch_case, switch_break, + loop_break, loop_cont); + if_stmt->else_type = vtn_get_branch_type(else_block, + 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) { @@ -271,9 +344,11 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, vtn_value(b, block->merge[1], vtn_value_type_block)->block; vtn_cfg_walk_blocks(b, &if_stmt->then_body, then_block, - break_block, cont_block, merge_block); + switch_case, switch_break, + loop_break, loop_cont, merge_block); vtn_cfg_walk_blocks(b, &if_stmt->else_body, else_block, - break_block, cont_block, merge_block); + switch_case, switch_break, + loop_break, loop_cont, merge_block); block = merge_block; continue; @@ -287,13 +362,74 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list, * continue on with the other side as if it were what comes * after the if. */ - block = next_block; + if (if_stmt->then_type == vtn_branch_type_none) { + block = then_block; + } else { + block = else_block; + } continue; } unreachable("Should have returned or continued"); } - case SpvOpSwitch: + case SpvOpSwitch: { + assert((*block->merge & SpvOpCodeMask) == SpvOpSelectionMerge); + struct vtn_block *break_block = + vtn_value(b, block->merge[1], vtn_value_type_block)->block; + + struct vtn_switch *swtch = ralloc(b, struct vtn_switch); + + swtch->node.type = vtn_cf_node_type_switch; + swtch->selector = block->branch[1]; + list_inithead(&swtch->cases); + + list_addtail(&swtch->node.link, cf_list); + + /* First, we go through and record all of the cases. */ + const uint32_t *branch_end = + block->branch + (block->branch[0] >> SpvWordCountShift); + + vtn_add_case(b, swtch, break_block, block->branch[2], 0, true); + for (const uint32_t *w = block->branch + 3; w < branch_end; w += 2) + vtn_add_case(b, swtch, break_block, w[1], w[0], false); + + /* Now, we go through and walk the blocks. While we walk through + * the blocks, we also gather the much-needed fall-through + * information. + */ + for (const uint32_t *w = block->branch + 2; w < branch_end; w += 2) { + struct vtn_block *case_block = + vtn_value(b, *w, vtn_value_type_block)->block; + + if (case_block == break_block) + continue; + + assert(case_block->switch_case); + + vtn_cfg_walk_blocks(b, &case_block->switch_case->body, case_block, + case_block->switch_case, break_block, + NULL, loop_cont, NULL); + } + + /* Finally, we walk over all of the cases one more time and put + * them in fall-through order. + */ + for (const uint32_t *w = block->branch + 2; w < branch_end; w += 2) { + struct vtn_block *case_block = + vtn_value(b, *w, vtn_value_type_block)->block; + + if (case_block == break_block) + continue; + + assert(case_block->switch_case); + + vtn_order_case(swtch, case_block->switch_case); + } + + block = break_block; + continue; + } + case SpvOpUnreachable: default: unreachable("Unhandled opcode"); @@ -307,6 +443,8 @@ vtn_build_cfg(struct vtn_builder *b, const uint32_t *words, const uint32_t *end) vtn_foreach_instruction(b, words, end, vtn_cfg_handle_prepass_instruction); - foreach_list_typed(struct vtn_function, func, node, &b->functions) - vtn_cfg_walk_blocks(b, &func->body, func->start_block, NULL, NULL, NULL); + foreach_list_typed(struct vtn_function, func, node, &b->functions) { + vtn_cfg_walk_blocks(b, &func->body, func->start_block, + NULL, NULL, NULL, NULL, NULL); + } } diff --git a/src/glsl/nir/spirv/vtn_private.h b/src/glsl/nir/spirv/vtn_private.h index e6d8e190cb9..6dfd01d5c24 100644 --- a/src/glsl/nir/spirv/vtn_private.h +++ b/src/glsl/nir/spirv/vtn_private.h @@ -27,6 +27,7 @@ #include "nir/nir.h" #include "nir/nir_builder.h" +#include "nir/nir_array.h" #include "nir_spirv.h" #include "spirv.h" @@ -51,8 +52,10 @@ enum vtn_value_type { enum vtn_branch_type { vtn_branch_type_none, - vtn_branch_type_break, - vtn_branch_type_continue, + vtn_branch_type_switch_break, + vtn_branch_type_switch_fallthrough, + vtn_branch_type_loop_break, + vtn_branch_type_loop_continue, vtn_branch_type_discard, vtn_branch_type_return, }; @@ -62,7 +65,6 @@ enum vtn_cf_node_type { vtn_cf_node_type_if, vtn_cf_node_type_loop, vtn_cf_node_type_switch, - vtn_cf_node_type_case, }; struct vtn_cf_node { @@ -98,6 +100,32 @@ struct vtn_if { SpvSelectionControlMask control; }; +struct vtn_case { + struct list_head link; + + struct list_head body; + + /* The fallthrough case, if any */ + struct vtn_case *fallthrough; + + /* The uint32_t values that map to this case */ + nir_array values; + + /* True if this is the default case */ + bool is_default; + + /* Initialized to false; used when sorting the list of cases */ + bool visited; +}; + +struct vtn_switch { + struct vtn_cf_node node; + + uint32_t selector; + + struct list_head cases; +}; + struct vtn_block { struct vtn_cf_node node; @@ -115,6 +143,9 @@ struct vtn_block { /** Points to the loop that this block starts (if it starts a loop) */ struct vtn_loop *loop; + /** Points to the switch case started by this block (if any) */ + struct vtn_case *switch_case; + nir_block *block; };