#include "tgsi/tgsi_text.h"
#include "tgsi/tgsi_dump.h"
-#include "freedreno_util.h"
-
-#include "ir3_compiler.h"
-#include "ir3_nir.h"
-#include "instr-a3xx.h"
-#include "ir3.h"
+#include "ir3/ir3_compiler.h"
+#include "ir3/ir3_gallium.h"
+#include "ir3/ir3_nir.h"
+#include "ir3/instr-a3xx.h"
+#include "ir3/ir3.h"
#include "compiler/glsl/standalone.h"
#include "compiler/glsl/glsl_to_nir.h"
+#include "compiler/glsl/gl_nir.h"
#include "compiler/nir_types.h"
+#include "compiler/spirv/nir_spirv.h"
static void dump_info(struct ir3_shader_variant *so, const char *str)
{
const char *type = ir3_shader_stage(so->shader);
bin = ir3_shader_assemble(so, so->shader->compiler->gpu_id);
debug_printf("; %s: %s\n", type, str);
- ir3_shader_disasm(so, bin);
+ ir3_shader_disasm(so, bin, stdout);
free(bin);
}
load_glsl(unsigned num_files, char* const* files, gl_shader_stage stage)
{
static const struct standalone_options options = {
- .glsl_version = 140,
+ .glsl_version = 460,
.do_link = true,
};
struct gl_shader_program *prog;
+ const nir_shader_compiler_options *nir_options =
+ ir3_get_compiler_options(compiler);
prog = standalone_compile_shader(&options, num_files, files);
if (!prog)
errx(1, "couldn't parse `%s'", files[0]);
- nir_shader *nir = glsl_to_nir(prog, stage, ir3_get_compiler_options(compiler));
+ nir_shader *nir = glsl_to_nir(prog, stage, nir_options);
/* required NIR passes: */
- /* TODO cmdline args for some of the conditional lowering passes? */
+ if (nir_options->lower_all_io_to_temps ||
+ nir->info.stage == MESA_SHADER_VERTEX ||
+ nir->info.stage == MESA_SHADER_GEOMETRY) {
+ NIR_PASS_V(nir, nir_lower_io_to_temporaries,
+ nir_shader_get_entrypoint(nir),
+ true, true);
+ } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
+ NIR_PASS_V(nir, nir_lower_io_to_temporaries,
+ nir_shader_get_entrypoint(nir),
+ true, false);
+ }
- NIR_PASS_V(nir, nir_lower_io_to_temporaries,
- nir_shader_get_entrypoint(nir),
- true, true);
NIR_PASS_V(nir, nir_lower_global_vars_to_local);
NIR_PASS_V(nir, nir_split_var_copies);
NIR_PASS_V(nir, nir_lower_var_copies);
NIR_PASS_V(nir, nir_split_var_copies);
NIR_PASS_V(nir, nir_lower_var_copies);
- NIR_PASS_V(nir, nir_lower_io_types);
+ nir_print_shader(nir, stdout);
+ NIR_PASS_V(nir, gl_nir_lower_atomics, prog, true);
+ NIR_PASS_V(nir, nir_lower_atomics_to_ssbo, 8);
+ nir_print_shader(nir, stdout);
switch (stage) {
case MESA_SHADER_VERTEX:
&nir->num_outputs,
ir3_glsl_type_size);
break;
+ case MESA_SHADER_COMPUTE:
+ break;
default:
errx(1, "unhandled shader stage: %d", stage);
}
NIR_PASS_V(nir, nir_lower_system_values);
NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size, 0);
- NIR_PASS_V(nir, nir_lower_samplers, prog);
+ NIR_PASS_V(nir, gl_nir_lower_samplers, prog);
return nir;
}
return 0;
}
+static void debug_func(void *priv, enum nir_spirv_debug_level level,
+ size_t spirv_offset, const char *message)
+{
+// printf("%s\n", message);
+}
+
+static nir_shader *
+load_spirv(const char *filename, const char *entry, gl_shader_stage stage)
+{
+ const struct spirv_to_nir_options spirv_options = {
+ /* these caps are just make-believe */
+ .caps = {
+ .draw_parameters = true,
+ .float64 = true,
+ .image_read_without_format = true,
+ .image_write_without_format = true,
+ .int64 = true,
+ .variable_pointers = true,
+ },
+ .lower_workgroup_access_to_offsets = true,
+ .lower_ubo_ssbo_access_to_offsets = true,
+ .debug = {
+ .func = debug_func,
+ }
+ };
+ nir_function *entry_point;
+ void *buf;
+ size_t size;
+
+ read_file(filename, &buf, &size);
+
+ entry_point = spirv_to_nir(buf, size / 4,
+ NULL, 0, /* spec_entries */
+ stage, entry,
+ &spirv_options,
+ ir3_get_compiler_options(compiler));
+
+ nir_print_shader(entry_point->shader, stdout);
+
+ return entry_point->shader;
+}
+
static void print_usage(void)
{
- printf("Usage: ir3_compiler [OPTIONS]... <file.tgsi | (file.vert | file.frag)*>\n");
+ printf("Usage: ir3_compiler [OPTIONS]... <file.tgsi | file.spv entry_point | (file.vert | file.frag)*>\n");
printf(" --verbose - verbose compiler/debug messages\n");
printf(" --binning-pass - generate binning pass shader (VERT)\n");
printf(" --color-two-side - emulate two-sided color (FRAG)\n");
/* TODO cmdline option to target different gpus: */
unsigned gpu_id = 320;
const char *info;
+ const char *entry;
void *ptr;
+ bool from_spirv = false;
size_t size;
memset(&s, 0, sizeof(s));
while (n < argc) {
if (!strcmp(argv[n], "--verbose")) {
- fd_mesa_debug |= FD_DBG_MSGS | FD_DBG_OPTMSGS | FD_DBG_DISASM;
+ ir3_shader_debug |= IR3_DBG_OPTMSGS | IR3_DBG_DISASM;
n++;
continue;
}
if (!strcmp(argv[n], "--binning-pass")) {
debug_printf(" %s", argv[n]);
- key.binning_pass = true;
+ v.binning_pass = true;
n++;
continue;
}
}
if (!strcmp(argv[n], "--stream-out")) {
- struct pipe_stream_output_info *so = &s.stream_output;
+ struct ir3_stream_output_info *so = &s.stream_output;
debug_printf(" %s", argv[n]);
/* TODO more dynamic config based on number of outputs, etc
* rather than just hard-code for first output:
while (n < argc) {
char *filename = argv[n];
- char *ext = rindex(filename, '.');
+ char *ext = strrchr(filename, '.');
if (strcmp(ext, ".tgsi") == 0) {
if (num_files != 0)
errx(1, "in TGSI mode, only a single file may be specified");
s.from_tgsi = true;
+ } else if (strcmp(ext, ".spv") == 0) {
+ if (num_files != 0)
+ errx(1, "in SPIR-V mode, only a single file may be specified");
+ stage = MESA_SHADER_COMPUTE;
+ from_spirv = true;
+ filenames[num_files++] = filename;
+ n++;
+ if (n == argc)
+ errx(1, "in SPIR-V mode, an entry point must be specified");
+ entry = argv[n];
+ n++;
+ } else if (strcmp(ext, ".comp") == 0) {
+ if (s.from_tgsi || from_spirv)
+ errx(1, "cannot mix GLSL/TGSI/SPIRV");
+ if (num_files >= ARRAY_SIZE(filenames))
+ errx(1, "too many GLSL files");
+ stage = MESA_SHADER_COMPUTE;
} else if (strcmp(ext, ".frag") == 0) {
- if (s.from_tgsi)
- errx(1, "cannot mix GLSL and TGSI");
+ if (s.from_tgsi || from_spirv)
+ errx(1, "cannot mix GLSL/TGSI/SPIRV");
if (num_files >= ARRAY_SIZE(filenames))
errx(1, "too many GLSL files");
stage = MESA_SHADER_FRAGMENT;
return ret;
}
- if (fd_mesa_debug & FD_DBG_OPTMSGS)
+ if (ir3_shader_debug & IR3_DBG_OPTMSGS)
debug_printf("%s\n", (char *)ptr);
if (!tgsi_text_translate(ptr, toks, ARRAY_SIZE(toks)))
errx(1, "could not parse `%s'", filenames[0]);
- if (fd_mesa_debug & FD_DBG_OPTMSGS)
+ if (ir3_shader_debug & IR3_DBG_OPTMSGS)
tgsi_dump(toks, 0);
- nir = ir3_tgsi_to_nir(toks);
+ nir = ir3_tgsi_to_nir(compiler, toks);
+ NIR_PASS_V(nir, nir_lower_global_vars_to_local);
+ } else if (from_spirv) {
+ nir = load_spirv(filenames[0], entry, stage);
+
+ NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size,
+ (nir_lower_io_options)0);
+
+ /* TODO do this somewhere else */
+ nir_lower_int64(nir, ~0);
+ nir_lower_system_values(nir);
} else if (num_files > 0) {
nir = load_glsl(num_files, filenames, stage);
} else {
v.key = key;
v.shader = &s;
-
- switch (nir->info.stage) {
- case MESA_SHADER_FRAGMENT:
- s.type = v.type = SHADER_FRAGMENT;
- break;
- case MESA_SHADER_VERTEX:
- s.type = v.type = SHADER_VERTEX;
- break;
- case MESA_SHADER_COMPUTE:
- s.type = v.type = SHADER_COMPUTE;
- break;
- default:
- errx(1, "unhandled shader stage: %d", nir->info.stage);
- }
+ s.type = v.type = nir->info.stage;
info = "NIR compiler";
ret = ir3_compile_shader_nir(s.compiler, &v);
projects / mesa.git / blobdiff