OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/builder: Generate the alu helpers directly in python

Browse Source 
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 <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2016-04-29 12:26:07 -07:00
parent a0e6e5f21f
commit fc58cb543f
2 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/nir/nir_builder.h
View File

@@ -233,36 +233,6 @@ nir_build_alu(nir_builder *build, nir_op op, nir_ssa_def *src0,
return &instr->dest.dest.ssa; 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" #include "nir_builder_opcodes.h"
static inline nir_ssa_def * static inline nir_ssa_def *

14
src/compiler/nir/nir_builder_opcodes_h.py
View File

@@ -26,8 +26,20 @@ template = """\
#ifndef _NIR_BUILDER_OPCODES_ #ifndef _NIR_BUILDER_OPCODES_
#define _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()): % 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 % endfor
#endif /* _NIR_BUILDER_OPCODES_ */""" #endif /* _NIR_BUILDER_OPCODES_ */"""