From 4ddadd63709769ff923687b4232e870f6fbcb8a8 Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Thu, 12 Sep 2019 11:07:40 +0200 Subject: lima/ppir: Rename ppir_op_dummy to ppir_op_undef Signed-off-by: Andreas Baierl Reviewed-by: Vasily Khoruzhick Reviewed-by: Erico Nunes --- src/gallium/drivers/lima/ir/pp/nir.c | 4 ++-- src/gallium/drivers/lima/ir/pp/node.c | 4 ++-- src/gallium/drivers/lima/ir/pp/ppir.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c index cc92722861c..faccb9dea2d 100644 --- a/src/gallium/drivers/lima/ir/pp/nir.c +++ b/src/gallium/drivers/lima/ir/pp/nir.c @@ -151,12 +151,12 @@ static void ppir_node_add_src(ppir_compiler *comp, ppir_node *node, child = comp->var_nodes[(reg->index << 2) + comp->reg_base + swizzle]; /* Reg is read before it was written, create a dummy node for it */ if (!child) { - child = ppir_node_create_reg(node->block, ppir_op_dummy, reg, + child = ppir_node_create_reg(node->block, ppir_op_undef, reg, u_bit_consecutive(0, 4)); comp->var_nodes[(reg->index << 2) + comp->reg_base + swizzle] = child; } /* Don't add dummies or recursive deps for ops like r1 = r1 + ssa1 */ - if (child && node != child && child->op != ppir_op_dummy) + if (child && node != child && child->op != ppir_op_undef) ppir_node_add_dep(node, child); } } diff --git a/src/gallium/drivers/lima/ir/pp/node.c b/src/gallium/drivers/lima/ir/pp/node.c index d5a17304630..20c48a1d36a 100644 --- a/src/gallium/drivers/lima/ir/pp/node.c +++ b/src/gallium/drivers/lima/ir/pp/node.c @@ -335,8 +335,8 @@ const ppir_op_info ppir_op_infos[] = { PPIR_INSTR_SLOT_BRANCH, PPIR_INSTR_SLOT_END }, }, - [ppir_op_dummy] = { - .name = "dummy", + [ppir_op_undef] = { + .name = "undef", .type = ppir_node_type_alu, .slots = (int []) { }, diff --git a/src/gallium/drivers/lima/ir/pp/ppir.h b/src/gallium/drivers/lima/ir/pp/ppir.h index cdacad01c1f..b1de7b5a7d8 100644 --- a/src/gallium/drivers/lima/ir/pp/ppir.h +++ b/src/gallium/drivers/lima/ir/pp/ppir.h @@ -113,7 +113,7 @@ typedef enum { ppir_op_discard, ppir_op_branch, - ppir_op_dummy, + ppir_op_undef, ppir_op_num, } ppir_op; -- cgit v1.2.1