diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-29 12:26:07 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-05-14 13:34:38 -0700 |
| commit | fc58cb543fe2430576216680c4f6a55ec22b937e (patch) | |
| tree | 876f8c72702f66010f44b44f64fdfa343edc68ed | |
| parent | a0e6e5f21ffea8acb9500ef699b204c557214b75 (diff) | |
nir/builder: Generate the alu helpers directly in python
There's no reason for having a macro *and* a python generator. We can
easily just do the whole thing in python. This has the advantage that we
are no longer definining ALU# macros which conflict with the ones in
brw_fs_builder.h.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/compiler/nir/nir_builder.h | 30 | ||||
| -rw-r--r-- | src/compiler/nir/nir_builder_opcodes_h.py | 14 |
2 files changed, 13 insertions, 31 deletions
diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index a142d48b82e..14159fa79a5 100644 --- a/src/compiler/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h @@ -233,36 +233,6 @@ nir_build_alu(nir_builder *build, nir_op op, nir_ssa_def *src0, return &instr->dest.dest.ssa; } -#define ALU1(op) \ -static inline nir_ssa_def * \ -nir_##op(nir_builder *build, nir_ssa_def *src0) \ -{ \ - return nir_build_alu(build, nir_op_##op, src0, NULL, NULL, NULL); \ -} - -#define ALU2(op) \ -static inline nir_ssa_def * \ -nir_##op(nir_builder *build, nir_ssa_def *src0, nir_ssa_def *src1) \ -{ \ - return nir_build_alu(build, nir_op_##op, src0, src1, NULL, NULL); \ -} - -#define ALU3(op) \ -static inline nir_ssa_def * \ -nir_##op(nir_builder *build, nir_ssa_def *src0, \ - nir_ssa_def *src1, nir_ssa_def *src2) \ -{ \ - return nir_build_alu(build, nir_op_##op, src0, src1, src2, NULL); \ -} - -#define ALU4(op) \ -static inline nir_ssa_def * \ -nir_##op(nir_builder *build, nir_ssa_def *src0, \ - nir_ssa_def *src1, nir_ssa_def *src2, nir_ssa_def *src3) \ -{ \ - return nir_build_alu(build, nir_op_##op, src0, src1, src2, src3); \ -} - #include "nir_builder_opcodes.h" static inline nir_ssa_def * diff --git a/src/compiler/nir/nir_builder_opcodes_h.py b/src/compiler/nir/nir_builder_opcodes_h.py index 038e2b4e1ef..42eb6e0b097 100644 --- a/src/compiler/nir/nir_builder_opcodes_h.py +++ b/src/compiler/nir/nir_builder_opcodes_h.py @@ -26,8 +26,20 @@ template = """\ #ifndef _NIR_BUILDER_OPCODES_ #define _NIR_BUILDER_OPCODES_ +<% +def src_decl_list(num_srcs): + return ', '.join('nir_ssa_def *src' + str(i) for i in range(num_srcs)) + +def src_list(num_srcs): + return ', '.join('src' + str(i) if i < num_srcs else 'NULL' for i in range(4)) +%> + % for name, opcode in sorted(opcodes.iteritems()): -ALU${opcode.num_inputs}(${name}) +static inline nir_ssa_def * +nir_${name}(nir_builder *build, ${src_decl_list(opcode.num_inputs)}) +{ + return nir_build_alu(build, nir_op_${name}, ${src_list(opcode.num_inputs)}); +} % endfor #endif /* _NIR_BUILDER_OPCODES_ */""" |