Mesa (master): microsoft/compiler: Add spirv2dxil executable
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 22 22:54:34 UTC 2020
Module: Mesa
Branch: master
Commit: 0b3379c7bedcaf1b9a71c0ff7cdee57d0c61480f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b3379c7bedcaf1b9a71c0ff7cdee57d0c61480f
Author: Michael Tang <tangm at microsoft.com>
Date: Tue Dec 22 13:27:12 2020 -0800
microsoft/compiler: Add spirv2dxil executable
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8043>
---
src/microsoft/spirv_to_dxil/meson.build | 12 +++
src/microsoft/spirv_to_dxil/spirv2dxil.c | 142 ++++++++++++++++++++++++++++
src/microsoft/spirv_to_dxil/spirv_to_dxil.c | 14 +--
3 files changed, 157 insertions(+), 11 deletions(-)
diff --git a/src/microsoft/spirv_to_dxil/meson.build b/src/microsoft/spirv_to_dxil/meson.build
index deafe91b1d3..c76d63c7f23 100644
--- a/src/microsoft/spirv_to_dxil/meson.build
+++ b/src/microsoft/spirv_to_dxil/meson.build
@@ -29,3 +29,15 @@ libspirv_to_dxil = both_libraries(
dependencies : [idep_nir, idep_libdxil_compiler],
include_directories : [inc_include, inc_src, inc_compiler, inc_gallium],
)
+
+spirv_to_dxil = executable(
+ 'spirv2dxil',
+ files(
+ 'spirv2dxil.c',
+ ),
+ dependencies : [idep_nir, idep_libdxil_compiler, idep_getopt],
+ include_directories : [inc_include, inc_src, inc_compiler, inc_gallium],
+ link_with : libspirv_to_dxil.get_static_lib(),
+ build_by_default : true,
+ install : true,
+)
diff --git a/src/microsoft/spirv_to_dxil/spirv2dxil.c b/src/microsoft/spirv_to_dxil/spirv2dxil.c
new file mode 100644
index 00000000000..47be6d49d0b
--- /dev/null
+++ b/src/microsoft/spirv_to_dxil/spirv2dxil.c
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ * Copyright © Microsoft 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.
+ */
+
+/*
+ * A simple executable that opens a SPIR-V shader, converts it to DXIL via
+ * NIR, and dumps out the result. This should be useful for testing the
+ * nir_to_dxil code. Based on spirv2nir.c.
+ */
+
+#include "nir_to_dxil.h"
+#include "spirv/nir_spirv.h"
+#include "spirv_to_dxil.h"
+
+#include "util/os_file.h"
+#include <errno.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <string.h>
+
+#define WORD_SIZE 4
+
+static gl_shader_stage
+stage_to_enum(char *stage)
+{
+ if (!strcmp(stage, "vertex"))
+ return MESA_SHADER_VERTEX;
+ else if (!strcmp(stage, "tess-ctrl"))
+ return MESA_SHADER_TESS_CTRL;
+ else if (!strcmp(stage, "tess-eval"))
+ return MESA_SHADER_TESS_EVAL;
+ else if (!strcmp(stage, "geometry"))
+ return MESA_SHADER_GEOMETRY;
+ else if (!strcmp(stage, "fragment"))
+ return MESA_SHADER_FRAGMENT;
+ else if (!strcmp(stage, "compute"))
+ return MESA_SHADER_COMPUTE;
+ else if (!strcmp(stage, "kernel"))
+ return MESA_SHADER_KERNEL;
+ else
+ return MESA_SHADER_NONE;
+}
+
+int
+main(int argc, char **argv)
+{
+ gl_shader_stage shader_stage = MESA_SHADER_FRAGMENT;
+ char *entry_point = "main";
+ char *output_file = "";
+ int ch;
+
+ static struct option long_options[] = {
+ {"stage", required_argument, 0, 's'},
+ {"entry", required_argument, 0, 'e'},
+ {"output", required_argument, 0, 'o'},
+ {0, 0, 0, 0}};
+
+ while ((ch = getopt_long(argc, argv, "s:e:o:", long_options, NULL)) !=
+ -1) {
+ switch (ch) {
+ case 's':
+ shader_stage = stage_to_enum(optarg);
+ if (shader_stage == MESA_SHADER_NONE) {
+ fprintf(stderr, "Unknown stage %s\n", optarg);
+ return 1;
+ }
+ break;
+ case 'e':
+ entry_point = optarg;
+ break;
+ case 'o':
+ output_file = optarg;
+ break;
+ default:
+ fprintf(stderr, "Unrecognized option.\n");
+ return 1;
+ }
+ }
+
+ if (optind != argc - 1) {
+ if (optind < argc)
+ fprintf(stderr, "Please specify only one input file.");
+ else
+ fprintf(stderr, "Please specify an input file.");
+ return 1;
+ }
+
+ const char *filename = argv[optind];
+ size_t file_size;
+ char *file_contents = os_read_file(filename, &file_size);
+ if (!file_contents) {
+ fprintf(stderr, "Failed to open %s\n", filename);
+ return 1;
+ }
+
+ size_t word_count = file_size / WORD_SIZE;
+
+ void *data;
+ size_t size;
+ if (spirv_to_dxil((void *)file_contents, word_count, NULL, 0,
+ (dxil_spirv_shader_stage)shader_stage, entry_point,
+ &data, &size)) {
+ FILE *file = fopen(output_file, "w");
+ if (!file) {
+ fprintf(stderr, "Failed to open %s, %s\n", output_file,
+ strerror(errno));
+ spirv_to_dxil_free(data);
+ free(file_contents);
+ return 1;
+ }
+
+ fwrite(data, 1, size, file);
+ fclose(file);
+ spirv_to_dxil_free(data);
+ } else {
+ fprintf(stderr, "Compilation failed\n");
+ }
+
+ free(file_contents);
+
+ return 0;
+}
diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
index 79ea74730a1..7f57dc0980f 100644
--- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
+++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
@@ -33,18 +33,10 @@ spirv_to_dxil(const uint32_t *words, size_t word_count,
unsigned int num_specializations, dxil_spirv_shader_stage stage,
const char *entry_point_name, void **buffer, size_t *size)
{
+ if (stage == MESA_SHADER_NONE || stage == MESA_SHADER_KERNEL)
+ return false;
+
struct spirv_to_nir_options spirv_opts = {0};
- if (stage == MESA_SHADER_KERNEL) {
- spirv_opts.environment = NIR_SPIRV_OPENCL;
- spirv_opts.caps.address = true;
- spirv_opts.caps.float64 = true;
- spirv_opts.caps.int8 = true;
- spirv_opts.caps.int16 = true;
- spirv_opts.caps.int64 = true;
- spirv_opts.caps.kernel = true;
- } else {
- spirv_opts.environment = NIR_SPIRV_VULKAN;
- }
glsl_type_singleton_init_or_ref();
More information about the mesa-commit
mailing list