#include "nir.h"
#include "compiler/shader_enums.h"
+#include "util/half_float.h"
+#include "vulkan/vulkan_core.h"
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h> /* for PRIx64 macro */
static void
print_tabs(unsigned num_tabs, FILE *fp)
/* an index used to make new non-conflicting names */
unsigned index;
+
+ /**
+ * Optional table of annotations mapping nir object
+ * (such as instr or var) to message to print.
+ */
+ struct hash_table *annotations;
} print_state;
+static void
+print_annotation(print_state *state, void *obj)
+{
+ if (!state->annotations)
+ return;
+
+ struct hash_entry *entry = _mesa_hash_table_search(state->annotations, obj);
+ if (!entry)
+ return;
+
+ const char *note = entry->data;
+ _mesa_hash_table_remove(state->annotations, entry);
+
+ fprintf(stderr, "%s\n\n", note);
+}
+
static void
print_register(nir_register *reg, print_state *state)
{
fprintf(fp, "r%u", reg->index);
}
-static const char *sizes[] = { "error", "vec1", "vec2", "vec3", "vec4" };
+static const char *sizes[] = { "error", "vec1", "vec2", "vec3", "vec4",
+ "error", "error", "error", "vec8",
+ "error", "error", "error", "error",
+ "error", "error", "error", "vec16"};
static void
print_register_decl(nir_register *reg, print_state *state)
{
FILE *fp = state->fp;
- fprintf(fp, "decl_reg %s ", sizes[reg->num_components]);
+ fprintf(fp, "decl_reg %s %u ", sizes[reg->num_components], reg->bit_size);
if (reg->is_packed)
fprintf(fp, "(packed) ");
print_register(reg, state);
FILE *fp = state->fp;
if (def->name != NULL)
fprintf(fp, "/* %s */ ", def->name);
- fprintf(fp, "%s ssa_%u", sizes[def->num_components], def->index);
+ fprintf(fp, "%s %u ssa_%u", sizes[def->num_components], def->bit_size,
+ def->index);
}
static void
fprintf(fp, "ssa_%u", def->index);
}
-static void print_src(nir_src *src, print_state *state);
+static void print_src(const nir_src *src, print_state *state);
static void
-print_reg_src(nir_reg_src *src, print_state *state)
+print_reg_src(const nir_reg_src *src, print_state *state)
{
FILE *fp = state->fp;
print_register(src->reg, state);
}
static void
-print_src(nir_src *src, print_state *state)
+print_src(const nir_src *src, print_state *state)
{
if (src->is_ssa)
print_ssa_use(src->ssa, state);
print_src(&instr->src[src].src, state);
bool print_swizzle = false;
- for (unsigned i = 0; i < 4; i++) {
+ nir_component_mask_t used_channels = 0;
+
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++) {
if (!nir_alu_instr_channel_used(instr, src, i))
continue;
+ used_channels++;
+
if (instr->src[src].swizzle[i] != i) {
print_swizzle = true;
break;
}
}
- if (print_swizzle) {
+ unsigned live_channels = nir_src_num_components(instr->src[src].src);
+
+ if (print_swizzle || used_channels != live_channels) {
fprintf(fp, ".");
- for (unsigned i = 0; i < 4; i++) {
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++) {
if (!nir_alu_instr_channel_used(instr, src, i))
continue;
if (!dest->dest.is_ssa &&
dest->write_mask != (1 << dest->dest.reg.reg->num_components) - 1) {
fprintf(fp, ".");
- for (unsigned i = 0; i < 4; i++)
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
if ((dest->write_mask >> i) & 1)
fprintf(fp, "%c", "xyzw"[i]);
}
print_alu_dest(&instr->dest, state);
fprintf(fp, " = %s", nir_op_infos[instr->op].name);
+ if (instr->exact)
+ fprintf(fp, "!");
if (instr->dest.saturate)
fprintf(fp, ".sat");
fprintf(fp, " ");
get_var_name(nir_variable *var, print_state *state)
{
if (state->ht == NULL)
- return var->name;
+ return var->name ? var->name : "unnamed";
assert(state->syms);
print_constant(nir_constant *c, const struct glsl_type *type, print_state *state)
{
FILE *fp = state->fp;
- unsigned total_elems = glsl_get_components(type);
- unsigned i;
+ const unsigned rows = glsl_get_vector_elements(type);
+ const unsigned cols = glsl_get_matrix_columns(type);
+ unsigned i, j;
switch (glsl_get_base_type(type)) {
+ case GLSL_TYPE_BOOL:
+ /* Only float base types can be matrices. */
+ assert(cols == 1);
+
+ for (i = 0; i < rows; i++) {
+ if (i > 0) fprintf(fp, ", ");
+ fprintf(fp, "%s", c->values[0].b[i] ? "true" : "false");
+ }
+ break;
+
+ case GLSL_TYPE_UINT8:
+ case GLSL_TYPE_INT8:
+ /* Only float base types can be matrices. */
+ assert(cols == 1);
+
+ for (i = 0; i < rows; i++) {
+ if (i > 0) fprintf(fp, ", ");
+ fprintf(fp, "0x%02x", c->values[0].u8[i]);
+ }
+ break;
+
+ case GLSL_TYPE_UINT16:
+ case GLSL_TYPE_INT16:
+ /* Only float base types can be matrices. */
+ assert(cols == 1);
+
+ for (i = 0; i < rows; i++) {
+ if (i > 0) fprintf(fp, ", ");
+ fprintf(fp, "0x%04x", c->values[0].u16[i]);
+ }
+ break;
+
case GLSL_TYPE_UINT:
case GLSL_TYPE_INT:
- case GLSL_TYPE_BOOL:
- for (i = 0; i < total_elems; i++) {
+ /* Only float base types can be matrices. */
+ assert(cols == 1);
+
+ for (i = 0; i < rows; i++) {
if (i > 0) fprintf(fp, ", ");
- fprintf(fp, "0x%08x", c->value.u[i]);
+ fprintf(fp, "0x%08x", c->values[0].u32[i]);
+ }
+ break;
+
+ case GLSL_TYPE_FLOAT16:
+ for (i = 0; i < cols; i++) {
+ for (j = 0; j < rows; j++) {
+ if (i + j > 0) fprintf(fp, ", ");
+ fprintf(fp, "%f", _mesa_half_to_float(c->values[i].u16[j]));
+ }
}
break;
case GLSL_TYPE_FLOAT:
- for (i = 0; i < total_elems; i++) {
+ for (i = 0; i < cols; i++) {
+ for (j = 0; j < rows; j++) {
+ if (i + j > 0) fprintf(fp, ", ");
+ fprintf(fp, "%f", c->values[i].f32[j]);
+ }
+ }
+ break;
+
+ case GLSL_TYPE_DOUBLE:
+ for (i = 0; i < cols; i++) {
+ for (j = 0; j < rows; j++) {
+ if (i + j > 0) fprintf(fp, ", ");
+ fprintf(fp, "%f", c->values[i].f64[j]);
+ }
+ }
+ break;
+
+ case GLSL_TYPE_UINT64:
+ case GLSL_TYPE_INT64:
+ /* Only float base types can be matrices. */
+ assert(cols == 1);
+
+ for (i = 0; i < cols; i++) {
if (i > 0) fprintf(fp, ", ");
- fprintf(fp, "%f", c->value.f[i]);
+ fprintf(fp, "0x%08" PRIx64, c->values[0].u64[i]);
}
break;
}
}
+static const char *
+get_variable_mode_str(nir_variable_mode mode, bool want_local_global_mode)
+{
+ switch (mode) {
+ case nir_var_shader_in:
+ return "shader_in";
+ case nir_var_shader_out:
+ return "shader_out";
+ case nir_var_uniform:
+ return "uniform";
+ case nir_var_mem_ubo:
+ return "ubo";
+ case nir_var_system_value:
+ return "system";
+ case nir_var_mem_ssbo:
+ return "ssbo";
+ case nir_var_mem_shared:
+ return "shared";
+ case nir_var_mem_global:
+ return "global";
+ case nir_var_shader_temp:
+ return want_local_global_mode ? "shader_temp" : "";
+ case nir_var_function_temp:
+ return want_local_global_mode ? "function_temp" : "";
+ default:
+ return "";
+ }
+}
+
static void
print_var_decl(nir_variable *var, print_state *state)
{
const char *const samp = (var->data.sample) ? "sample " : "";
const char *const patch = (var->data.patch) ? "patch " : "";
const char *const inv = (var->data.invariant) ? "invariant " : "";
- const char *const mode[] = { "shader_in ", "shader_out ", "", "",
- "uniform ", "shader_storage ", "shared ",
- "system "};
-
- fprintf(fp, "%s%s%s%s%s%s ",
- cent, samp, patch, inv, mode[var->data.mode],
- glsl_interp_qualifier_name(var->data.interpolation));
-
- glsl_print_type(var->type, fp);
+ fprintf(fp, "%s%s%s%s%s %s ",
+ cent, samp, patch, inv, get_variable_mode_str(var->data.mode, false),
+ glsl_interp_mode_name(var->data.interpolation));
+
+ enum gl_access_qualifier access = var->data.image.access;
+ const char *const coher = (access & ACCESS_COHERENT) ? "coherent " : "";
+ const char *const volat = (access & ACCESS_VOLATILE) ? "volatile " : "";
+ const char *const restr = (access & ACCESS_RESTRICT) ? "restrict " : "";
+ const char *const ronly = (access & ACCESS_NON_WRITEABLE) ? "readonly " : "";
+ const char *const wonly = (access & ACCESS_NON_READABLE) ? "writeonly " : "";
+ fprintf(fp, "%s%s%s%s%s", coher, volat, restr, ronly, wonly);
+
+#define FORMAT_CASE(x) case x: fprintf(stderr, #x " "); break
+ switch (var->data.image.format) {
+ FORMAT_CASE(GL_RGBA32F);
+ FORMAT_CASE(GL_RGBA32UI);
+ FORMAT_CASE(GL_RGBA32I);
+ FORMAT_CASE(GL_R32F);
+ FORMAT_CASE(GL_R32UI);
+ FORMAT_CASE(GL_R32I);
+ FORMAT_CASE(GL_RG32F);
+ FORMAT_CASE(GL_RG32UI);
+ FORMAT_CASE(GL_RG32I);
+ FORMAT_CASE(GL_R8);
+ FORMAT_CASE(GL_RG8);
+ FORMAT_CASE(GL_RGBA8);
+ FORMAT_CASE(GL_R8_SNORM);
+ FORMAT_CASE(GL_RG8_SNORM);
+ FORMAT_CASE(GL_RGBA8_SNORM);
+ FORMAT_CASE(GL_R16);
+ FORMAT_CASE(GL_RG16);
+ FORMAT_CASE(GL_RGBA16);
+ FORMAT_CASE(GL_R16_SNORM);
+ FORMAT_CASE(GL_RG16_SNORM);
+ FORMAT_CASE(GL_RGBA16_SNORM);
+ FORMAT_CASE(GL_R16F);
+ FORMAT_CASE(GL_RG16F);
+ FORMAT_CASE(GL_RGBA16F);
+ FORMAT_CASE(GL_R8UI);
+ FORMAT_CASE(GL_R8I);
+ FORMAT_CASE(GL_RG8UI);
+ FORMAT_CASE(GL_RG8I);
+ FORMAT_CASE(GL_RGBA8UI);
+ FORMAT_CASE(GL_RGBA8I);
+ FORMAT_CASE(GL_R16UI);
+ FORMAT_CASE(GL_R16I);
+ FORMAT_CASE(GL_RG16UI);
+ FORMAT_CASE(GL_RG16I);
+ FORMAT_CASE(GL_RGBA16UI);
+ FORMAT_CASE(GL_RGBA16I);
+ FORMAT_CASE(GL_R11F_G11F_B10F);
+ FORMAT_CASE(GL_RGB9_E5);
+ FORMAT_CASE(GL_RGB10_A2);
+ FORMAT_CASE(GL_RGB10_A2UI);
+ default: /* Including the normal GL_NONE */
+ break;
+ }
+#undef FORMAT_CASE
- fprintf(fp, " %s", get_var_name(var, state));
+ fprintf(fp, "%s %s", glsl_get_type_name(var->type),
+ get_var_name(var, state));
if (var->data.mode == nir_var_shader_in ||
var->data.mode == nir_var_shader_out ||
var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_shader_storage) {
+ var->data.mode == nir_var_mem_ubo ||
+ var->data.mode == nir_var_mem_ssbo) {
const char *loc = NULL;
char buf[4];
- switch (state->shader->stage) {
+ switch (state->shader->info.stage) {
case MESA_SHADER_VERTEX:
if (var->data.mode == nir_var_shader_in)
loc = gl_vert_attrib_name(var->data.location);
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
case MESA_SHADER_COMPUTE:
+ case MESA_SHADER_KERNEL:
default:
/* TODO */
break;
loc = buf;
}
- fprintf(fp, " (%s, %u)", loc, var->data.driver_location);
+ /* For shader I/O vars that have been split to components or packed,
+ * print the fractional location within the input/output.
+ */
+ unsigned int num_components =
+ glsl_get_components(glsl_without_array(var->type));
+ const char *components = NULL;
+ char components_local[6] = {'.' /* the rest is 0-filled */};
+ switch (var->data.mode) {
+ case nir_var_shader_in:
+ case nir_var_shader_out:
+ if (num_components < 4 && num_components != 0) {
+ const char *xyzw = "xyzw";
+ for (int i = 0; i < num_components; i++)
+ components_local[i + 1] = xyzw[i + var->data.location_frac];
+
+ components = components_local;
+ }
+ break;
+ default:
+ break;
+ }
+
+ fprintf(fp, " (%s%s, %u, %u)%s", loc,
+ components ? components : "",
+ var->data.driver_location, var->data.binding,
+ var->data.compact ? " compact" : "");
}
if (var->constant_initializer) {
}
fprintf(fp, "\n");
+ print_annotation(state, var);
}
static void
-print_var(nir_variable *var, print_state *state)
+print_deref_link(const nir_deref_instr *instr, bool whole_chain, print_state *state)
{
FILE *fp = state->fp;
- fprintf(fp, "%s", get_var_name(var, state));
-}
-static void
-print_deref_var(nir_deref_var *deref, print_state *state)
-{
- print_var(deref->var, state);
-}
+ if (instr->deref_type == nir_deref_type_var) {
+ fprintf(fp, "%s", get_var_name(instr->var, state));
+ return;
+ } else if (instr->deref_type == nir_deref_type_cast) {
+ fprintf(fp, "(%s *)", glsl_get_type_name(instr->type));
+ print_src(&instr->parent, state);
+ return;
+ }
-static void
-print_deref_array(nir_deref_array *deref, print_state *state)
-{
- FILE *fp = state->fp;
- fprintf(fp, "[");
- switch (deref->deref_array_type) {
- case nir_deref_array_type_direct:
- fprintf(fp, "%u", deref->base_offset);
+ assert(instr->parent.is_ssa);
+ nir_deref_instr *parent =
+ nir_instr_as_deref(instr->parent.ssa->parent_instr);
+
+ /* Is the parent we're going to print a bare cast? */
+ const bool is_parent_cast =
+ whole_chain && parent->deref_type == nir_deref_type_cast;
+
+ /* If we're not printing the whole chain, the parent we print will be a SSA
+ * value that represents a pointer. The only deref type that naturally
+ * gives a pointer is a cast.
+ */
+ const bool is_parent_pointer =
+ !whole_chain || parent->deref_type == nir_deref_type_cast;
+
+ /* Struct derefs have a nice syntax that works on pointers, arrays derefs
+ * do not.
+ */
+ const bool need_deref =
+ is_parent_pointer && instr->deref_type != nir_deref_type_struct;
+
+ /* Cast need extra parens and so * dereferences */
+ if (is_parent_cast || need_deref)
+ fprintf(fp, "(");
+
+ if (need_deref)
+ fprintf(fp, "*");
+
+ if (whole_chain) {
+ print_deref_link(parent, whole_chain, state);
+ } else {
+ print_src(&instr->parent, state);
+ }
+
+ if (is_parent_cast || need_deref)
+ fprintf(fp, ")");
+
+ switch (instr->deref_type) {
+ case nir_deref_type_struct:
+ fprintf(fp, "%s%s", is_parent_pointer ? "->" : ".",
+ glsl_get_struct_elem_name(parent->type, instr->strct.index));
break;
- case nir_deref_array_type_indirect:
- if (deref->base_offset != 0)
- fprintf(fp, "%u + ", deref->base_offset);
- print_src(&deref->indirect, state);
+
+ case nir_deref_type_array:
+ case nir_deref_type_ptr_as_array: {
+ nir_const_value *const_index = nir_src_as_const_value(instr->arr.index);
+ if (const_index) {
+ fprintf(fp, "[%u]", const_index->u32[0]);
+ } else {
+ fprintf(fp, "[");
+ print_src(&instr->arr.index, state);
+ fprintf(fp, "]");
+ }
break;
- case nir_deref_array_type_wildcard:
- fprintf(fp, "*");
+ }
+
+ case nir_deref_type_array_wildcard:
+ fprintf(fp, "[*]");
break;
+
+ default:
+ unreachable("Invalid deref instruction type");
}
- fprintf(fp, "]");
}
static void
-print_deref_struct(nir_deref_struct *deref, const struct glsl_type *parent_type,
- print_state *state)
+print_deref_instr(nir_deref_instr *instr, print_state *state)
{
FILE *fp = state->fp;
- fprintf(fp, ".%s", glsl_get_struct_elem_name(parent_type, deref->index));
-}
-static void
-print_deref(nir_deref_var *deref, print_state *state)
-{
- nir_deref *tail = &deref->deref;
- nir_deref *pretail = NULL;
- while (tail != NULL) {
- switch (tail->deref_type) {
- case nir_deref_type_var:
- assert(pretail == NULL);
- assert(tail == &deref->deref);
- print_deref_var(deref, state);
- break;
+ print_dest(&instr->dest, state);
- case nir_deref_type_array:
- assert(pretail != NULL);
- print_deref_array(nir_deref_as_array(tail), state);
- break;
+ switch (instr->deref_type) {
+ case nir_deref_type_var:
+ fprintf(fp, " = deref_var ");
+ break;
+ case nir_deref_type_array:
+ case nir_deref_type_array_wildcard:
+ fprintf(fp, " = deref_array ");
+ break;
+ case nir_deref_type_struct:
+ fprintf(fp, " = deref_struct ");
+ break;
+ case nir_deref_type_cast:
+ fprintf(fp, " = deref_cast ");
+ break;
+ case nir_deref_type_ptr_as_array:
+ fprintf(fp, " = deref_ptr_as_array ");
+ break;
+ default:
+ unreachable("Invalid deref instruction type");
+ }
- case nir_deref_type_struct:
- assert(pretail != NULL);
- print_deref_struct(nir_deref_as_struct(tail),
- pretail->type, state);
- break;
+ /* Only casts naturally return a pointer type */
+ if (instr->deref_type != nir_deref_type_cast)
+ fprintf(fp, "&");
- default:
- unreachable("Invalid deref type");
- }
+ print_deref_link(instr, false, state);
+
+ fprintf(fp, " (%s %s) ",
+ get_variable_mode_str(instr->mode, true),
+ glsl_get_type_name(instr->type));
+
+ if (instr->deref_type != nir_deref_type_var &&
+ instr->deref_type != nir_deref_type_cast) {
+ /* Print the entire chain as a comment */
+ fprintf(fp, "/* &");
+ print_deref_link(instr, true, state);
+ fprintf(fp, " */");
+ }
+}
- pretail = tail;
- tail = pretail->child;
+static const char *
+vulkan_descriptor_type_name(VkDescriptorType type)
+{
+ switch (type) {
+ case VK_DESCRIPTOR_TYPE_SAMPLER: return "sampler";
+ case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: return "texture+sampler";
+ case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: return "texture";
+ case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: return "image";
+ case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: return "texture-buffer";
+ case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: return "image-buffer";
+ case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: return "UBO";
+ case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: return "SSBO";
+ case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: return "UBO";
+ case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: return "SSBO";
+ case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: return "input-att";
+ case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: return "inline-UBO";
+ default: return "unknown";
}
}
fprintf(fp, ") (");
- for (unsigned i = 0; i < info->num_variables; i++) {
- if (i != 0)
- fprintf(fp, ", ");
-
- print_deref(instr->variables[i], state);
- }
-
- fprintf(fp, ") (");
-
for (unsigned i = 0; i < info->num_indices; i++) {
if (i != 0)
fprintf(fp, ", ");
[NIR_INTRINSIC_RANGE] = "range",
[NIR_INTRINSIC_DESC_SET] = "desc-set",
[NIR_INTRINSIC_BINDING] = "binding",
+ [NIR_INTRINSIC_COMPONENT] = "component",
+ [NIR_INTRINSIC_INTERP_MODE] = "interp_mode",
+ [NIR_INTRINSIC_REDUCTION_OP] = "reduction_op",
+ [NIR_INTRINSIC_CLUSTER_SIZE] = "cluster_size",
+ [NIR_INTRINSIC_PARAM_IDX] = "param_idx",
+ [NIR_INTRINSIC_IMAGE_DIM] = "image_dim",
+ [NIR_INTRINSIC_IMAGE_ARRAY] = "image_array",
+ [NIR_INTRINSIC_ACCESS] = "access",
+ [NIR_INTRINSIC_FORMAT] = "format",
+ [NIR_INTRINSIC_ALIGN_MUL] = "align_mul",
+ [NIR_INTRINSIC_ALIGN_OFFSET] = "align_offset",
+ [NIR_INTRINSIC_DESC_TYPE] = "desc_type",
};
for (unsigned idx = 1; idx < NIR_INTRINSIC_NUM_INDEX_FLAGS; idx++) {
if (!info->index_map[idx])
for (unsigned i = 0; i < 4; i++)
if ((wrmask >> i) & 1)
fprintf(fp, "%c", "xyzw"[i]);
+ } else if (idx == NIR_INTRINSIC_REDUCTION_OP) {
+ nir_op reduction_op = nir_intrinsic_reduction_op(instr);
+ fprintf(fp, " reduction_op=%s", nir_op_infos[reduction_op].name);
+ } else if (idx == NIR_INTRINSIC_IMAGE_DIM) {
+ static const char *dim_name[] = {
+ [GLSL_SAMPLER_DIM_1D] = "1D",
+ [GLSL_SAMPLER_DIM_2D] = "2D",
+ [GLSL_SAMPLER_DIM_3D] = "3D",
+ [GLSL_SAMPLER_DIM_CUBE] = "Cube",
+ [GLSL_SAMPLER_DIM_RECT] = "Rect",
+ [GLSL_SAMPLER_DIM_BUF] = "Buf",
+ [GLSL_SAMPLER_DIM_MS] = "2D-MSAA",
+ [GLSL_SAMPLER_DIM_SUBPASS] = "Subpass",
+ [GLSL_SAMPLER_DIM_SUBPASS_MS] = "Subpass-MSAA",
+ };
+ enum glsl_sampler_dim dim = nir_intrinsic_image_dim(instr);
+ assert(dim < ARRAY_SIZE(dim_name) && dim_name[dim]);
+ fprintf(fp, " image_dim=%s", dim_name[dim]);
+ } else if (idx == NIR_INTRINSIC_IMAGE_ARRAY) {
+ bool array = nir_intrinsic_image_array(instr);
+ fprintf(fp, " image_array=%s", array ? "true" : "false");
+ } else if (idx == NIR_INTRINSIC_DESC_TYPE) {
+ VkDescriptorType desc_type = nir_intrinsic_desc_type(instr);
+ fprintf(fp, " desc_type=%s", vulkan_descriptor_type_name(desc_type));
} else {
unsigned off = info->index_map[idx] - 1;
assert(index_name[idx]); /* forgot to update index_name table? */
nir_foreach_variable(var, var_list) {
if ((var->data.driver_location == nir_intrinsic_base(instr)) &&
- var->name) {
+ (instr->intrinsic == nir_intrinsic_load_uniform ||
+ (nir_intrinsic_component(instr) >= var->data.location_frac &&
+ nir_intrinsic_component(instr) <
+ (var->data.location_frac + glsl_get_components(var->type)))) &&
+ var->name) {
fprintf(fp, "\t/* %s */", var->name);
break;
}
case nir_texop_txf_ms:
fprintf(fp, "txf_ms ");
break;
+ case nir_texop_txf_ms_mcs:
+ fprintf(fp, "txf_ms_mcs ");
+ break;
case nir_texop_txs:
fprintf(fp, "txs ");
break;
break;
}
+ bool has_texture_deref = false, has_sampler_deref = false;
for (unsigned i = 0; i < instr->num_srcs; i++) {
print_src(&instr->src[i].src, state);
case nir_tex_src_projector:
fprintf(fp, "(projector)");
break;
- case nir_tex_src_comparitor:
- fprintf(fp, "(comparitor)");
+ case nir_tex_src_comparator:
+ fprintf(fp, "(comparator)");
break;
case nir_tex_src_offset:
fprintf(fp, "(offset)");
case nir_tex_src_lod:
fprintf(fp, "(lod)");
break;
+ case nir_tex_src_min_lod:
+ fprintf(fp, "(min_lod)");
+ break;
case nir_tex_src_ms_index:
fprintf(fp, "(ms_index)");
break;
+ case nir_tex_src_ms_mcs:
+ fprintf(fp, "(ms_mcs)");
+ break;
case nir_tex_src_ddx:
fprintf(fp, "(ddx)");
break;
case nir_tex_src_ddy:
fprintf(fp, "(ddy)");
break;
+ case nir_tex_src_texture_deref:
+ has_texture_deref = true;
+ fprintf(fp, "(texture_deref)");
+ break;
+ case nir_tex_src_sampler_deref:
+ has_sampler_deref = true;
+ fprintf(fp, "(sampler_deref)");
+ break;
case nir_tex_src_texture_offset:
fprintf(fp, "(texture_offset)");
break;
case nir_tex_src_sampler_offset:
fprintf(fp, "(sampler_offset)");
break;
+ case nir_tex_src_texture_handle:
+ fprintf(fp, "(texture_handle)");
+ break;
+ case nir_tex_src_sampler_handle:
+ fprintf(fp, "(sampler_handle)");
+ break;
+ case nir_tex_src_plane:
+ fprintf(fp, "(plane)");
+ break;
default:
unreachable("Invalid texture source type");
fprintf(fp, "%u (gather_component), ", instr->component);
}
- if (instr->texture) {
- print_deref(instr->texture, state);
- fprintf(fp, " (texture)");
- if (instr->sampler) {
- print_deref(instr->sampler, state);
- fprintf(fp, " (sampler)");
- }
- } else {
- assert(instr->sampler == NULL);
- fprintf(fp, "%u (texture) %u (sampler)",
- instr->texture_index, instr->sampler_index);
+ if (nir_tex_instr_has_explicit_tg4_offsets(instr)) {
+ fprintf(fp, "{ (%i, %i)", instr->tg4_offsets[0][0], instr->tg4_offsets[0][1]);
+ for (unsigned i = 1; i < 4; ++i)
+ fprintf(fp, ", (%i, %i)", instr->tg4_offsets[i][0],
+ instr->tg4_offsets[i][1]);
+ fprintf(fp, " } (offsets), ");
+ }
+
+ if (!has_texture_deref) {
+ fprintf(fp, "%u (texture), ", instr->texture_index);
+ }
+
+ if (!has_sampler_deref) {
+ fprintf(fp, "%u (sampler), ", instr->sampler_index);
}
}
if (i != 0)
fprintf(fp, ", ");
- print_deref(instr->params[i], state);
- }
-
- if (instr->return_deref != NULL) {
- if (instr->num_params != 0)
- fprintf(fp, ", ");
- fprintf(fp, "returning ");
- print_deref(instr->return_deref, state);
+ print_src(&instr->params[i], state);
}
}
* and then print the float in a comment for readability.
*/
- fprintf(fp, "0x%08x /* %f */", instr->value.u[i], instr->value.f[i]);
+ switch (instr->def.bit_size) {
+ case 64:
+ fprintf(fp, "0x%16" PRIx64 " /* %f */", instr->value.u64[i],
+ instr->value.f64[i]);
+ break;
+ case 32:
+ fprintf(fp, "0x%08x /* %f */", instr->value.u32[i], instr->value.f32[i]);
+ break;
+ case 16:
+ fprintf(fp, "0x%04x /* %f */", instr->value.u16[i],
+ _mesa_half_to_float(instr->value.u16[i]));
+ break;
+ case 8:
+ fprintf(fp, "0x%02x", instr->value.u8[i]);
+ break;
+ case 1:
+ fprintf(fp, "%s", instr->value.b[i] ? "true" : "false");
+ break;
+ }
}
fprintf(fp, ")");
FILE *fp = state->fp;
print_dest(&instr->dest, state);
fprintf(fp, " = phi ");
- nir_foreach_phi_src(instr, src) {
+ nir_foreach_phi_src(src, instr) {
if (&src->node != exec_list_get_head(&instr->srcs))
fprintf(fp, ", ");
print_parallel_copy_instr(nir_parallel_copy_instr *instr, print_state *state)
{
FILE *fp = state->fp;
- nir_foreach_parallel_copy_entry(instr, entry) {
+ nir_foreach_parallel_copy_entry(entry, instr) {
if (&entry->node != exec_list_get_head(&instr->entries))
fprintf(fp, "; ");
print_alu_instr(nir_instr_as_alu(instr), state);
break;
+ case nir_instr_type_deref:
+ print_deref_instr(nir_instr_as_deref(instr), state);
+ break;
+
case nir_instr_type_call:
print_call_instr(nir_instr_as_call(instr), state);
break;
nir_block **preds =
malloc(block->predecessors->entries * sizeof(nir_block *));
- struct set_entry *entry;
unsigned i = 0;
set_foreach(block->predecessors, entry) {
preds[i++] = (nir_block *) entry->key;
free(preds);
- nir_foreach_instr(block, instr) {
+ nir_foreach_instr(instr, block) {
print_instr(instr, state, tabs);
fprintf(fp, "\n");
+ print_annotation(state, instr);
}
print_tabs(tabs, fp);
fprintf(fp, "\nimpl %s ", impl->function->name);
- for (unsigned i = 0; i < impl->num_params; i++) {
- if (i != 0)
- fprintf(fp, ", ");
-
- print_var(impl->params[i], state);
- }
-
- if (impl->return_var != NULL) {
- if (impl->num_params != 0)
- fprintf(fp, ", ");
- fprintf(fp, "returning ");
- print_var(impl->return_var, state);
- }
-
fprintf(fp, "{\n");
- for (unsigned i = 0; i < impl->num_params; i++) {
- fprintf(fp, "\t");
- print_var_decl(impl->params[i], state);
- }
-
- if (impl->return_var) {
- fprintf(fp, "\t");
- print_var_decl(impl->return_var, state);
- }
-
nir_foreach_variable(var, &impl->locals) {
fprintf(fp, "\t");
print_var_decl(var, state);
{
FILE *fp = state->fp;
- fprintf(fp, "decl_function %s ", function->name);
-
- for (unsigned i = 0; i < function->num_params; i++) {
- if (i != 0)
- fprintf(fp, ", ");
-
- switch (function->params[i].param_type) {
- case nir_parameter_in:
- fprintf(fp, "in ");
- break;
- case nir_parameter_out:
- fprintf(fp, "out ");
- break;
- case nir_parameter_inout:
- fprintf(fp, "inout ");
- break;
- default:
- unreachable("Invalid parameter type");
- }
-
- glsl_print_type(function->params[i].type, fp);
- }
-
- if (function->return_type != NULL) {
- if (function->num_params != 0)
- fprintf(fp, ", ");
- fprintf(fp, "returning ");
- glsl_print_type(function->return_type, fp);
- }
+ fprintf(fp, "decl_function %s (%d params)", function->name,
+ function->num_params);
fprintf(fp, "\n");
{
state->fp = fp;
state->shader = shader;
- state->ht = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
+ state->ht = _mesa_pointer_hash_table_create(NULL);
state->syms = _mesa_set_create(NULL, _mesa_key_hash_string,
_mesa_key_string_equal);
state->index = 0;
}
void
-nir_print_shader(nir_shader *shader, FILE *fp)
+nir_print_shader_annotated(nir_shader *shader, FILE *fp,
+ struct hash_table *annotations)
{
print_state state;
init_print_state(&state, shader, fp);
- fprintf(fp, "shader: %s\n", gl_shader_stage_name(shader->stage));
+ state.annotations = annotations;
+
+ fprintf(fp, "shader: %s\n", gl_shader_stage_name(shader->info.stage));
if (shader->info.name)
fprintf(fp, "name: %s\n", shader->info.name);
if (shader->info.label)
fprintf(fp, "label: %s\n", shader->info.label);
+ if (gl_shader_stage_is_compute(shader->info.stage)) {
+ fprintf(fp, "local-size: %u, %u, %u%s\n",
+ shader->info.cs.local_size[0],
+ shader->info.cs.local_size[1],
+ shader->info.cs.local_size[2],
+ shader->info.cs.local_size_variable ? " (variable)" : "");
+ fprintf(fp, "shared-size: %u\n", shader->info.cs.shared_size);
+ }
+
fprintf(fp, "inputs: %u\n", shader->num_inputs);
fprintf(fp, "outputs: %u\n", shader->num_outputs);
fprintf(fp, "uniforms: %u\n", shader->num_uniforms);
destroy_print_state(&state);
}
+void
+nir_print_shader(nir_shader *shader, FILE *fp)
+{
+ nir_print_shader_annotated(shader, fp, NULL);
+ fflush(fp);
+}
+
void
nir_print_instr(const nir_instr *instr, FILE *fp)
{
print_instr(instr, &state, 0);
}
+
+void
+nir_print_deref(const nir_deref_instr *deref, FILE *fp)
+{
+ print_state state = {
+ .fp = fp,
+ };
+ print_deref_link(deref, true, &state);
+}
projects / mesa.git / blobdiff