On Thursday, September 15, 2016 8:59:30 PM PDT Jason Ekstrand wrote:
> This was something that I wrote in the early days of the spirv_to_nir code
> but deleted once we had a real driver. However, in the absence of a
> shader_runner equivalent, it's extremely useful for debugging the
> spirv_to_nir code so let's bring it back.
> ---
> src/compiler/Makefile.nir.am | 17 +++++++++++++
> src/compiler/spirv/spirv2nir.c | 55
> ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 72 insertions(+)
> create mode 100644 src/compiler/spirv/spirv2nir.c
>
> diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
> index 9aac214..69ff7b1 100644
> --- a/src/compiler/Makefile.nir.am
> +++ b/src/compiler/Makefile.nir.am
> @@ -53,6 +53,23 @@ nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py
> nir/nir_algebraic.py
> $(MKDIR_GEN)
> $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@;
> false)
>
> +noinst_PROGRAMS += spirv2nir
> +
> +spirv2nir_SOURCES = \
> + spirv/spirv2nir.c
> +
> +spirv2nir_CPPFLAGS = \
> + $(AM_CPPFLAGS) \
> + -I$(top_builddir)/src/compiler/nir \
> + -I$(top_srcdir)/src/compiler/nir \
> + -I$(top_srcdir)/src/compiler/spirv
> +
> +spirv2nir_LDADD = \
> + nir/libnir.la \
> + $(top_builddir)/src/util/libmesautil.la \
> + -lm -lstdc++ \
> + $(PTHREAD_LIBS)
> +
>
> check_PROGRAMS += nir/tests/control_flow_tests
>
> diff --git a/src/compiler/spirv/spirv2nir.c b/src/compiler/spirv/spirv2nir.c
> new file mode 100644
> index 0000000..c837186
> --- /dev/null
> +++ b/src/compiler/spirv/spirv2nir.c
> @@ -0,0 +1,55 @@
> +/*
> + * Copyright © 2015 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.
> + *
> + * Authors:
> + * Jason Ekstrand (ja...@jlekstrand.net)
> + *
> + */
> +
> +/*
> + * A simple executable that opens a SPIR-V shader, converts it to NIR, and
> + * dumps out the result. This should be useful for testing the
> + * spirv_to_nir code.
> + */
> +
> +#include "spirv/nir_spirv.h"
> +
> +#include <sys/mman.h>
> +#include <sys/types.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +
> +int main(int argc, char **argv)
> +{
> + int fd = open(argv[1], O_RDONLY);
> + off_t len = lseek(fd, 0, SEEK_END);
> +
> + assert(len % 4 == 0);
> + size_t word_count = len / 4;
> +
> + const void *map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
> + assert(map != NULL);
> +
> + nir_function *func = spirv_to_nir(map, word_count, NULL, 0,
> + MESA_SHADER_FRAGMENT, "main", NULL);
> + nir_print_shader(func->shader, stderr);
> +}
> Seems useful, and this is simple enough. Acked-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
