<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Jul 14, 2017 at 6:39 PM, Ian Romanick <<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>> The old table based spirv_*_to_string functions would return NULL for any values "inside" the table that didn't have entries. The tables also needed to be updated by hand each time a new spirv.h was imported. Generate the file instead. </blockquote><div> </div><div>Thanks for working on this! This is way better than having a hand-rolled table that requires updating. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>> Suggested-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>> --- I am pretty sure the scons changes are bogus... halp, plz? </blockquote><div> </div><div>I'm going to let Emil review your autotools and write you some Android.mk. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> src/compiler/Makefile.am | 2 + src/compiler/<a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> | 1 + src/compiler/Makefile.sources | 4 +- src/compiler/<a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> | 31 ++++++++ src/compiler/SConscript | 1 + src/compiler/SConscript.spirv | 32 ++++++++ src/compiler/spirv/spirv_info.c | 156 ------------------------------------- src/compiler/spirv/spirv_info_c.py | 90 +++++++++++++++++++++ 8 files changed, 160 insertions(+), 157 deletions(-) create mode 100644 src/compiler/<a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> create mode 100644 src/compiler/SConscript.spirv delete mode 100644 src/compiler/spirv/spirv_info.c create mode 100644 src/compiler/spirv/spirv_info_c.py diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 4c83365..b8f6697 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -63,3 +63,5 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) include <a href="http://Makefile.glsl.am" rel="noreferrer" target="_blank">Makefile.glsl.am</a> include <a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> + +include <a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> diff --git a/src/compiler/<a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> b/src/compiler/<a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> index 13f02a7..d10f173 100644 --- a/src/compiler/<a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> +++ b/src/compiler/<a href="http://Makefile.nir.am" rel="noreferrer" target="_blank">Makefile.nir.am</a> @@ -29,6 +29,7 @@ nir_libnir_la_LIBADD = \ nir_libnir_la_SOURCES = \ $(NIR_FILES) \ $(SPIRV_FILES) \ + $(SPIRV_GENERATED_FILES) \ $(NIR_GENERATED_FILES) nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index d3447fb..785782b 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -277,12 +277,14 @@ NIR_FILES = \ nir/nir_worklist.c \ nir/nir_worklist.h +SPIRV_GENERATED_FILES = \ + spirv/spirv_info.c + SPIRV_FILES = \ spirv/GLSL.std.450.h \ spirv/nir_spirv.h \ spirv/spirv.h \ spirv/spirv_info.h \ - spirv/spirv_info.c \ spirv/spirv_to_nir.c \ spirv/vtn_alu.c \ spirv/vtn_cfg.c \ diff --git a/src/compiler/<a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> b/src/compiler/<a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> new file mode 100644 index 0000000..6d5dfc0 --- /dev/null +++ b/src/compiler/<a href="http://Makefile.spirv.am" rel="noreferrer" target="_blank">Makefile.spirv.am</a> @@ -0,0 +1,31 @@ +# Copyright (C) 2017 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +spirv/spirv_info.c: spirv/spirv_info_c.py spirv/spirv.core.grammar.json + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/spirv/spirv_info_c.py > $@ || ($(RM) $@; false) </blockquote><div> </div><div>I'm sorry for all the pain I'm sure this caused you... Being the first one to add auto-generation to a directory is the worst... </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +BUILT_SOURCES += $(SPIRV_GENERATED_FILES) +CLEANFILES += $(SPIRV_GENERATED_FILES) + +EXTRA_DIST += \ + spirv/spirv_info_c.py \ + spirv/spirv.core.grammar.json diff --git a/src/compiler/SConscript b/src/compiler/SConscript index 44509a9..2797abe 100644 --- a/src/compiler/SConscript +++ b/src/compiler/SConscript @@ -26,4 +26,5 @@ compiler = env.ConvenienceLibrary( Export('compiler') SConscript('SConscript.glsl') +SConscript('SConscript.spirv') SConscript('SConscript.nir') diff --git a/src/compiler/SConscript.spirv b/src/compiler/SConscript.spirv new file mode 100644 index 0000000..8a90c2f --- /dev/null +++ b/src/compiler/SConscript.spirv @@ -0,0 +1,32 @@ +import common + +Import('*') + +from sys import executable as python_cmd + +env = env.Clone() + +env.MSVC2013Compat() + +env.Prepend(CPPPATH = [ + '#include', + '#src', + '#src/mapi', + '#src/mesa', + '#src/gallium/include', + '#src/gallium/auxiliary', + '#src/compiler/nir', +]) + +# Make generated headers reachable from the include path. +env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath]) +env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath]) + +# SPIR-V generated sources + +spirv_info_c = env.CodeGenerate( + target = 'spirv/spirv_info.c', + script = 'spirv/spirv_info_c.py', + source = [], + command = python_cmd + ' $SCRIPT > $TARGET' +) diff --git a/src/compiler/spirv/spirv_info.c b/src/compiler/spirv/spirv_info.c deleted file mode 100644 index 1036b41..0000000 --- a/src/compiler/spirv/spirv_info.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright © 2016 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include "spirv_info.h" -#include "util/macros.h" - -#define CAPABILITY(cap) [SpvCapability##cap] = #cap -static const char * const capability_to_string[] = { - CAPABILITY(Matrix), - CAPABILITY(Shader), - CAPABILITY(Geometry), - CAPABILITY(Tessellation), - CAPABILITY(Addresses), - CAPABILITY(Linkage), - CAPABILITY(Kernel), - CAPABILITY(Vector16), - CAPABILITY(Float16Buffer), - CAPABILITY(Float16), - CAPABILITY(Float64), - CAPABILITY(Int64), - CAPABILITY(Int64Atomics), - CAPABILITY(ImageBasic), - CAPABILITY(ImageReadWrite), - CAPABILITY(ImageMipmap), - CAPABILITY(Pipes), - CAPABILITY(Groups), - CAPABILITY(DeviceEnqueue), - CAPABILITY(LiteralSampler), - CAPABILITY(AtomicStorage), - CAPABILITY(Int16), - CAPABILITY(TessellationPointSize), - CAPABILITY(GeometryPointSize), - CAPABILITY(ImageGatherExtended), - CAPABILITY(StorageImageMultisample), - CAPABILITY(UniformBufferArrayDynamicIndexing), - CAPABILITY(SampledImageArrayDynamicIndexing), - CAPABILITY(StorageBufferArrayDynamicIndexing), - CAPABILITY(StorageImageArrayDynamicIndexing), - CAPABILITY(ClipDistance), - CAPABILITY(CullDistance), - CAPABILITY(ImageCubeArray), - CAPABILITY(SampleRateShading), - CAPABILITY(ImageRect), - CAPABILITY(SampledRect), - CAPABILITY(GenericPointer), - CAPABILITY(Int8), - CAPABILITY(InputAttachment), - CAPABILITY(SparseResidency), - CAPABILITY(MinLod), - CAPABILITY(Sampled1D), - CAPABILITY(Image1D), - CAPABILITY(SampledCubeArray), - CAPABILITY(SampledBuffer), - CAPABILITY(ImageBuffer), - CAPABILITY(ImageMSArray), - CAPABILITY(StorageImageExtendedFormats), - CAPABILITY(ImageQuery), - CAPABILITY(DerivativeControl), - CAPABILITY(InterpolationFunction), - CAPABILITY(TransformFeedback), - CAPABILITY(GeometryStreams), - CAPABILITY(StorageImageReadWithoutFormat), - CAPABILITY(StorageImageWriteWithoutFormat), - CAPABILITY(MultiViewport), - CAPABILITY(SubgroupDispatch), - CAPABILITY(NamedBarrier), - CAPABILITY(PipeStorage), - CAPABILITY(SubgroupBallotKHR), - CAPABILITY(DrawParameters), -}; - -const char * -spirv_capability_to_string(SpvCapability cap) -{ - if (cap < ARRAY_SIZE(capability_to_string)) - return capability_to_string[cap]; - else - return "unknown"; -} - -#define DECORATION(dec) [SpvDecoration##dec] = #dec -static const char * const decoration_to_string[] = { - DECORATION(RelaxedPrecision), - DECORATION(SpecId), - DECORATION(Block), - DECORATION(BufferBlock), - DECORATION(RowMajor), - DECORATION(ColMajor), - DECORATION(ArrayStride), - DECORATION(MatrixStride), - DECORATION(GLSLShared), - DECORATION(GLSLPacked), - DECORATION(CPacked), - DECORATION(BuiltIn), - DECORATION(NoPerspective), - DECORATION(Flat), - DECORATION(Patch), - DECORATION(Centroid), - DECORATION(Sample), - DECORATION(Invariant), - DECORATION(Restrict), - DECORATION(Aliased), - DECORATION(Volatile), - DECORATION(Constant), - DECORATION(Coherent), - DECORATION(NonWritable), - DECORATION(NonReadable), - DECORATION(Uniform), - DECORATION(SaturatedConversion), - DECORATION(Stream), - DECORATION(Location), - DECORATION(Component), - DECORATION(Index), - DECORATION(Binding), - DECORATION(DescriptorSet), - DECORATION(Offset), - DECORATION(XfbBuffer), - DECORATION(XfbStride), - DECORATION(FuncParamAttr), - DECORATION(FPRoundingMode), - DECORATION(FPFastMathMode), - DECORATION(LinkageAttributes), - DECORATION(NoContraction), - DECORATION(InputAttachmentIndex), - DECORATION(Alignment), - DECORATION(MaxByteOffset), -}; - -const char * -spirv_decoration_to_string(SpvDecoration dec) -{ - if (dec < ARRAY_SIZE(decoration_to_string)) - return decoration_to_string[dec]; - else - return "unknown"; -} diff --git a/src/compiler/spirv/spirv_info_c.py b/src/compiler/spirv/spirv_info_c.py new file mode 100644 index 0000000..5af832e --- /dev/null +++ b/src/compiler/spirv/spirv_info_c.py @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- + +# Copyright © 2017 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. </blockquote><div> </div><div>What you have is fine here but I've been really liking the style that's used in mesa/main/format_fallbacks.py and the anv_extensions.py that I sent out which does </div><div>COPYRIGHT=""" </div><div>\* The usual C copyright */ """ </div><div>and then maybe some functions and then </div><div>TEMPLATE = mako.template.Template(COPYRIGHT + """ </div><div>/* My template goes here */ </div><div>""") </div><div>Followed by the main function. Putting the template inside the main function (or if statement in this case) means the indentation gets really weird. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +import json +import mako.template + +def collect_data(spirv, kind): + for x in spirv["operand_kinds"]: + if x["kind"] == kind: + operands = x </blockquote><div> </div><div>break? </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + + # There are some duplicate values in some of the tables (thanks guys!), so + # filter them out. </blockquote><div> </div><div>That's unfortunate... </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + last_value = -1 + values = [] + for x in operands["enumerants"]: + if x["value"] != last_value: + last_value = x["value"] + values.append(x["enumerant"]) </blockquote><div> </div><div>This assumes that the duplicate values will be sequential. Is that always the case? I suppose it isn't since the C compiles. Maybe better to use a set and do </div><div>if x["value"] not in seen_values: </div><div> seen_values.add(x["value"]) </div><div>What you have here works though so we can always make that change later if it's ever a problem. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + + return (kind, values) + +if __name__ == "__main__": + t = mako.template.Template("""/* + * Copyright (C) 2017 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "spirv_info.h" + % for kind,values in info: </blockquote><div> </div><div>Dylan will probably tell you to indent your C code along with the mako. I, personally, don't care. If anything, I would just dedent all the mako by a step. But I don't really care all that much. It's readable as-is and we don't really have a mako style guide. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + +const char * +spirv_${kind.lower()}_to_string(Spv${kind} v) +{ + switch (v) { + % for name in values: + case Spv${kind}${name}: return "Spv${kind}${name}"; + % endfor + case Spv${kind}Max: break; /* silence warnings about unhandled enums. */ + } + + return "unknown"; +} + % endfor +""") + + spirv_info = json.JSONDecoder().decode(open("spirv/spirv.core.grammar.json", "r").read()) + + capabilities = collect_data(spirv_info, "Capability") + decorations = collect_data(spirv_info, "Decoration") + + print(t.render(info=[capabilities, decorations]))</blockquote><div> </div><div>The more recent generators have started using python's argparse and have --xml (or --json in this case) parameter for the input and --out for the output. Take a look at mesa/main/format_fallbacks.py for an example. Having the generator write the output file makes adding it to automake a bit easier to do correctly. </div><div>--Jason </div></div></div></div>