From e8328e55e7ac26bbf3b3a47a1bb1cae4ab9130a2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 10 Jan 2017 15:47:31 +1100 Subject: [PATCH] nir/algebraic: add support for conditional helper functions to expressions Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_algebraic.py | 5 ++++- src/compiler/nir/nir_search.c | 3 +++ src/compiler/nir/nir_search.h | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py index 19ac6ee2ba4..b0fa9e7092f 100644 --- a/src/compiler/nir/nir_algebraic.py +++ b/src/compiler/nir/nir_algebraic.py @@ -90,6 +90,7 @@ static const ${val.c_type} ${val.name} = { ${'true' if val.inexact else 'false'}, nir_op_${val.opcode}, { ${', '.join(src.c_ptr for src in val.sources)} }, + ${val.cond if val.cond else 'NULL'}, % endif };""") @@ -185,7 +186,8 @@ class Variable(Value): elif self.required_type == 'float': return "nir_type_float" -_opcode_re = re.compile(r"(?P~)?(?P\w+)(?:@(?P\d+))?") +_opcode_re = re.compile(r"(?P~)?(?P\w+)(?:@(?P\d+))?" + r"(?P\([^\)]+\))?") class Expression(Value): def __init__(self, expr, name_base, varset): @@ -198,6 +200,7 @@ class Expression(Value): self.opcode = m.group('opcode') self.bit_size = int(m.group('bits')) if m.group('bits') else 0 self.inexact = m.group('inexact') is not None + self.cond = m.group('cond') self.sources = [ Value.create(src, "{0}_{1}".format(name_base, i), varset) for (i, src) in enumerate(expr[1:]) ] diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c index 10a0941fa20..68275e442fc 100644 --- a/src/compiler/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c @@ -263,6 +263,9 @@ match_expression(const nir_search_expression *expr, nir_alu_instr *instr, unsigned num_components, const uint8_t *swizzle, struct match_state *state) { + if (expr->cond && !expr->cond(instr)) + return false; + if (instr->op != expr->opcode) return false; diff --git a/src/compiler/nir/nir_search.h b/src/compiler/nir/nir_search.h index dec19d53df7..8b409541532 100644 --- a/src/compiler/nir/nir_search.h +++ b/src/compiler/nir/nir_search.h @@ -103,6 +103,14 @@ typedef struct { nir_op opcode; const nir_search_value *srcs[4]; + + /** Optional condition fxn ptr + * + * This allows additional constraints on expression matching, it is + * typically used to match an expressions uses such as the number of times + * the expression is used, and whether its used by an if. + */ + bool (*cond)(nir_alu_instr *instr); } nir_search_expression; NIR_DEFINE_CAST(nir_search_value_as_variable, nir_search_value, -- 2.30.2