* Rob Clark <robclark@freedesktop.org>
*/
+#include "util/u_atomic.h"
#include "util/u_string.h"
#include "util/u_memory.h"
#include "util/u_format.h"
v->info.max_reg = MAX2(v->info.max_reg, regid >> 2);
}
}
+
+ for (i = 0; i < v->num_sampler_prefetch; i++) {
+ unsigned n = util_last_bit(v->sampler_prefetch[i].wrmask) - 1;
+ int32_t regid = v->sampler_prefetch[i].dst + n;
+ if (v->sampler_prefetch[i].half_precision) {
+ if (gpu_id < 500) {
+ v->info.max_half_reg = MAX2(v->info.max_half_reg, regid >> 2);
+ } else {
+ v->info.max_reg = MAX2(v->info.max_reg, regid >> 3);
+ }
+ } else {
+ v->info.max_reg = MAX2(v->info.max_reg, regid >> 2);
+ }
+ }
}
/* wrapper for ir3_assemble() which does some info fixup based on
v->bo = fd_bo_new(compiler->dev, sz,
DRM_FREEDRENO_GEM_CACHE_WCOMBINE |
DRM_FREEDRENO_GEM_TYPE_KMEM,
- "%s:%s", ir3_shader_stage(v->shader), info->name);
+ "%s:%s", ir3_shader_stage(v), info->name);
memcpy(fd_bo_map(v->bo), bin, sz);
- if (ir3_shader_debug & IR3_DBG_DISASM) {
- struct ir3_shader_key key = v->key;
- printf("disassemble: type=%d, k={bp=%u,cts=%u,hp=%u}", v->type,
- v->binning_pass, key.color_two_side, key.half_precision);
- ir3_shader_disasm(v, bin, stdout);
- }
-
if (shader_debug_enabled(v->shader->type)) {
- fprintf(stderr, "Native code for unnamed %s shader %s:\n",
- _mesa_shader_stage_to_string(v->shader->type),
- v->shader->nir->info.name);
+ fprintf(stdout, "Native code for unnamed %s shader %s:\n",
+ ir3_shader_stage(v), v->shader->nir->info.name);
if (v->shader->type == MESA_SHADER_FRAGMENT)
- fprintf(stderr, "SIMD0\n");
- ir3_shader_disasm(v, bin, stderr);
+ fprintf(stdout, "SIMD0\n");
+ ir3_shader_disasm(v, bin, stdout);
}
free(bin);
v->ir = NULL;
}
+/*
+ * For creating normal shader variants, 'nonbinning' is NULL. For
+ * creating binning pass shader, it is link to corresponding normal
+ * (non-binning) variant.
+ */
static struct ir3_shader_variant *
create_variant(struct ir3_shader *shader, struct ir3_shader_key *key,
- bool binning_pass)
+ struct ir3_shader_variant *nonbinning)
{
struct ir3_shader_variant *v = CALLOC_STRUCT(ir3_shader_variant);
int ret;
v->id = ++shader->variant_count;
v->shader = shader;
- v->binning_pass = binning_pass;
+ v->binning_pass = !!nonbinning;
+ v->nonbinning = nonbinning;
v->key = *key;
v->type = shader->type;
return v;
/* compile new variant if it doesn't exist already: */
- v = create_variant(shader, key, false);
+ v = create_variant(shader, key, NULL);
if (v) {
v->next = shader->variants;
shader->variants = v;
ir3_shader_get_variant(struct ir3_shader *shader, struct ir3_shader_key *key,
bool binning_pass, bool *created)
{
+ mtx_lock(&shader->variants_lock);
struct ir3_shader_variant *v =
shader_variant(shader, key, created);
if (v && binning_pass) {
- if (!v->binning)
- v->binning = create_variant(shader, key, true);
+ if (!v->binning) {
+ v->binning = create_variant(shader, key, v);
+ *created = true;
+ }
+ mtx_unlock(&shader->variants_lock);
return v->binning;
}
+ mtx_unlock(&shader->variants_lock);
return v;
}
}
free(shader->const_state.immediates);
ralloc_free(shader->nir);
+ mtx_destroy(&shader->variants_lock);
free(shader);
}
{
struct ir3_shader *shader = CALLOC_STRUCT(ir3_shader);
+ mtx_init(&shader->variants_lock, mtx_plain);
shader->compiler = compiler;
- shader->id = ++shader->compiler->shader_count;
+ shader->id = p_atomic_inc_return(&shader->compiler->shader_count);
shader->type = nir->info.stage;
NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size,
NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false);
+ NIR_PASS_V(nir, nir_lower_amul, ir3_glsl_type_size);
+
/* do first pass optimization, ignoring the key: */
- shader->nir = ir3_optimize_nir(shader, nir, NULL);
+ ir3_optimize_nir(shader, nir, NULL);
+
+ shader->nir = nir;
if (ir3_shader_debug & IR3_DBG_DISASM) {
printf("dump nir%d: type=%d", shader->id, shader->type);
nir_print_shader(shader->nir, stdout);
static void dump_reg(FILE *out, const char *name, uint32_t r)
{
- if (r != regid(63,0))
- fprintf(out, "; %s: r%d.%c\n", name, r >> 2, "xyzw"[r & 0x3]);
+ if (r != regid(63,0)) {
+ const char *reg_type = (r & HALF_REG_ID) ? "hr" : "r";
+ fprintf(out, "; %s: %s%d.%c\n", name, reg_type,
+ (r & ~HALF_REG_ID) >> 2, "xyzw"[r & 0x3]);
+ }
}
static void dump_output(FILE *out, struct ir3_shader_variant *so,
dump_reg(out, name, regid);
}
+static const char *
+input_name(struct ir3_shader_variant *so, int i)
+{
+ if (so->inputs[i].sysval) {
+ return gl_system_value_name(so->inputs[i].slot);
+ } else if (so->type == MESA_SHADER_VERTEX) {
+ return gl_vert_attrib_name(so->inputs[i].slot);
+ } else {
+ return gl_varying_slot_name(so->inputs[i].slot);
+ }
+}
+
+static const char *
+output_name(struct ir3_shader_variant *so, int i)
+{
+ if (so->type == MESA_SHADER_FRAGMENT) {
+ return gl_frag_result_name(so->outputs[i].slot);
+ } else {
+ switch (so->outputs[i].slot) {
+ case VARYING_SLOT_GS_HEADER_IR3:
+ return "GS_HEADER";
+ case VARYING_SLOT_GS_VERTEX_FLAGS_IR3:
+ return "GS_VERTEX_FLAGS";
+ case VARYING_SLOT_TCS_HEADER_IR3:
+ return "TCS_HEADER";
+ default:
+ return gl_varying_slot_name(so->outputs[i].slot);
+ }
+ }
+}
+
void
ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out)
{
struct ir3 *ir = so->ir;
struct ir3_register *reg;
- const char *type = ir3_shader_stage(so->shader);
+ const char *type = ir3_shader_stage(so);
uint8_t regid;
unsigned i;
- for (i = 0; i < ir->ninputs; i++) {
- if (!ir->inputs[i]) {
- fprintf(out, "; in%d unused\n", i);
- continue;
- }
- reg = ir->inputs[i]->regs[0];
+ struct ir3_instruction *instr;
+ foreach_input_n(instr, i, ir) {
+ reg = instr->regs[0];
regid = reg->num;
fprintf(out, "@in(%sr%d.%c)\tin%d\n",
(reg->flags & IR3_REG_HALF) ? "h" : "",
(regid >> 2), "xyzw"[regid & 0x3], i);
}
- for (i = 0; i < ir->noutputs; i++) {
- if (!ir->outputs[i]) {
- fprintf(out, "; out%d unused\n", i);
- continue;
- }
- /* kill shows up as a virtual output.. skip it! */
- if (is_kill(ir->outputs[i]))
- continue;
- reg = ir->outputs[i]->regs[0];
+ /* print pre-dispatch texture fetches: */
+ for (i = 0; i < so->num_sampler_prefetch; i++) {
+ const struct ir3_sampler_prefetch *fetch = &so->sampler_prefetch[i];
+ fprintf(out, "@tex(%sr%d.%c)\tsrc=%u, samp=%u, tex=%u, wrmask=%x, cmd=%u\n",
+ fetch->half_precision ? "h" : "",
+ fetch->dst >> 2, "xyzw"[fetch->dst & 0x3],
+ fetch->src, fetch->samp_id, fetch->tex_id,
+ fetch->wrmask, fetch->cmd);
+ }
+
+ foreach_output_n(instr, i, ir) {
+ reg = instr->regs[0];
regid = reg->num;
fprintf(out, "@out(%sr%d.%c)\tout%d\n",
(reg->flags & IR3_REG_HALF) ? "h" : "",
disasm_a3xx(bin, so->info.sizedwords, 0, out, ir->compiler->gpu_id);
- switch (so->type) {
- case MESA_SHADER_VERTEX:
- fprintf(out, "; %s: outputs:", type);
- for (i = 0; i < so->outputs_count; i++) {
- uint8_t regid = so->outputs[i].regid;
- fprintf(out, " r%d.%c (%s)",
- (regid >> 2), "xyzw"[regid & 0x3],
- gl_varying_slot_name(so->outputs[i].slot));
- }
- fprintf(out, "\n");
- fprintf(out, "; %s: inputs:", type);
- for (i = 0; i < so->inputs_count; i++) {
- uint8_t regid = so->inputs[i].regid;
- fprintf(out, " r%d.%c (cm=%x,il=%u,b=%u)",
- (regid >> 2), "xyzw"[regid & 0x3],
- so->inputs[i].compmask,
- so->inputs[i].inloc,
- so->inputs[i].bary);
- }
- fprintf(out, "\n");
- break;
- case MESA_SHADER_FRAGMENT:
- fprintf(out, "; %s: outputs:", type);
- for (i = 0; i < so->outputs_count; i++) {
- uint8_t regid = so->outputs[i].regid;
- fprintf(out, " r%d.%c (%s)",
- (regid >> 2), "xyzw"[regid & 0x3],
- gl_frag_result_name(so->outputs[i].slot));
- }
- fprintf(out, "\n");
- fprintf(out, "; %s: inputs:", type);
- for (i = 0; i < so->inputs_count; i++) {
- uint8_t regid = so->inputs[i].regid;
- fprintf(out, " r%d.%c (%s,cm=%x,il=%u,b=%u)",
- (regid >> 2), "xyzw"[regid & 0x3],
- gl_varying_slot_name(so->inputs[i].slot),
- so->inputs[i].compmask,
- so->inputs[i].inloc,
- so->inputs[i].bary);
- }
- fprintf(out, "\n");
- break;
- default:
- /* TODO */
- break;
+ fprintf(out, "; %s: outputs:", type);
+ for (i = 0; i < so->outputs_count; i++) {
+ uint8_t regid = so->outputs[i].regid;
+ fprintf(out, " r%d.%c (%s)",
+ (regid >> 2), "xyzw"[regid & 0x3],
+ output_name(so, i));
+ }
+ fprintf(out, "\n");
+
+ fprintf(out, "; %s: inputs:", type);
+ for (i = 0; i < so->inputs_count; i++) {
+ uint8_t regid = so->inputs[i].regid;
+ fprintf(out, " r%d.%c (%s slot=%d cm=%x,il=%u,b=%u)",
+ (regid >> 2), "xyzw"[regid & 0x3],
+ input_name(so, i),
+ so->inputs[i].slot,
+ so->inputs[i].compmask,
+ so->inputs[i].inloc,
+ so->inputs[i].bary);
}
+ fprintf(out, "\n");
/* print generic shader info: */
fprintf(out, "; %s prog %d/%d: %u instructions, %d half, %d full\n",
so->info.max_half_reg + 1,
so->info.max_reg + 1);
- fprintf(out, "; %d const, %u constlen\n",
- so->info.max_const + 1,
- so->constlen);
+ fprintf(out, "; %u constlen\n", so->constlen);
fprintf(out, "; %u (ss), %u (sy)\n", so->info.ss, so->info.sy);
projects / mesa.git / blobdiff