diff options
| author | Connor Abbott <[email protected]> | 2015-01-22 23:32:14 -0500 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-01-24 21:33:56 -0800 |
| commit | fa4bc6c1309e8ece8c0f18e8031bf7c92064fc35 (patch) | |
| tree | 58841a5b9dcf99f9d77681ca13c86d483137651b /src/glsl/Makefile.sources | |
| parent | d2811c29daa604b7ceb8465ef10e370efa933a47 (diff) | |
nir: use Python to autogenerate opcode information
Before, we used a system where a file, nir_opcodes.h, defined some macros that
were included to generate the enum values and the nir_op_infos structure. This
worked pretty well, but for development the error messages were never very
useful, Python tools couldn't understand the opcode list, and it was difficult
to use nir_opcodes.h to do other things like autogenerate a builder API. Now, we
store opcode information in nir_opcodes.py, and we have nir_opcodes_c.py to
generate the old nir_opcodes.c and nir_opcodes_h.py to generate nir_opcodes.h,
which contains all the enum names and gets included into nir.h like before. In
addition to solving the above problems, using Python and Mako to generate
everything means that it's much easier to add keep information centralized as we
add new things like constant propagation that require per-opcode information.
v2:
- make Opcode derive from object (Dylan)
- don't use assert like it's a function (Dylan)
- style fixes for fnoise, use xrange (Dylan)
- use iterkeys() in nir_opcodes_h.py (Dylan)
- use pydoc-style comments (Jason)
- don't make fmin/fmax commutative and associative yet (Jason)
Signed-off-by: Connor Abbott <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
v3 Jason Ekstrand <[email protected]>
- Alphabetize source file lists
- Generate nir_opcodes.h in the builddir instead of the source dir
- Include $(builddir)/src/glsl/nir in the i965 build
- Rework nir_opcodes.h generation so it generates a complete header file
instead of one that has to be embedded inside an enum declaration
Diffstat (limited to 'src/glsl/Makefile.sources')
| -rw-r--r-- | src/glsl/Makefile.sources | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 96c4ec54c72..97c637ebdc3 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -11,6 +11,8 @@ LIBGLCPP_GENERATED_FILES = \ glcpp/glcpp-parse.c NIR_GENERATED_FILES = \ + nir/nir_opcodes.c \ + nir/nir_opcodes.h \ nir/nir_opt_algebraic.c NIR_FILES = \ @@ -35,8 +37,6 @@ NIR_FILES = \ nir/nir_lower_var_copies.c \ nir/nir_lower_vec_to_movs.c \ nir/nir_metadata.c \ - nir/nir_opcodes.c \ - nir/nir_opcodes.h \ nir/nir_opt_constant_folding.c \ nir/nir_opt_copy_propagate.c \ nir/nir_opt_cse.c \ |