AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv: Add cast and loop helpers for vtn_cf_node

Browse Source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3820>
This commit is contained in:
Jason Ekstrand
2020-02-12 15:00:30 -06:00
committed by Marge Bot
parent 8c5c65d0d6
commit 9d7fcf1de0
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/spirv/vtn_cfg.c
+5 -5
View File
@@ -918,10 +918,10 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list,
nir_variable *switch_fall_var, bool *has_switch_break,
vtn_instruction_handler handler)
{
list_for_each_entry(struct vtn_cf_node, node, cf_list, link) {
vtn_foreach_cf_node(node, cf_list) {
switch (node->type) {
case vtn_cf_node_type_block: {
struct vtn_block *block = (struct vtn_block *)node;
struct vtn_block *block = vtn_cf_node_as_block(node);
const uint32_t *block_start = block->label;
const uint32_t *block_end = block->merge ? block->merge :
@@ -959,7 +959,7 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list,
}
case vtn_cf_node_type_if: {
struct vtn_if *vtn_if = (struct vtn_if *)node;
struct vtn_if *vtn_if = vtn_cf_node_as_if(node);
bool sw_break = false;
nir_if *nif =
@@ -998,7 +998,7 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list,
}
case vtn_cf_node_type_loop: {
struct vtn_loop *vtn_loop = (struct vtn_loop *)node;
struct vtn_loop *vtn_loop = vtn_cf_node_as_loop(node);
nir_loop *loop = nir_push_loop(&b->nb);
loop->control = vtn_loop_control(b, vtn_loop);
@@ -1035,7 +1035,7 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list,
}
case vtn_cf_node_type_switch: {
struct vtn_switch *vtn_switch = (struct vtn_switch *)node;
struct vtn_switch *vtn_switch = vtn_cf_node_as_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
src/compiler/spirv/vtn_private.h
+16
View File
@@ -242,6 +242,22 @@ struct vtn_function {
SpvFunctionControlMask control;
};
#define VTN_DECL_CF_NODE_CAST(_type) \
static inline struct vtn_##_type * \
vtn_cf_node_as_##_type(struct vtn_cf_node *node) \
{ \
assert(node->type == vtn_cf_node_type_##_type); \
return (struct vtn_##_type *)node; \
}
VTN_DECL_CF_NODE_CAST(block)
VTN_DECL_CF_NODE_CAST(loop)
VTN_DECL_CF_NODE_CAST(if)
VTN_DECL_CF_NODE_CAST(switch)
#define vtn_foreach_cf_node(node, cf_list) \
list_for_each_entry(struct vtn_cf_node, node, cf_list, link)
typedef bool (*vtn_instruction_handler)(struct vtn_builder *, SpvOp,
const uint32_t *, unsigned);