Mesa (master): v3d: Do uniform pretty-printing in the QPU dump.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Dec 15 03:29:16 UTC 2018
Module: Mesa
Branch: master
Commit: 248a7fb392ba9ed0f3d25b599e214b456cefa910
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=248a7fb392ba9ed0f3d25b599e214b456cefa910
Author: Eric Anholt <eric at anholt.net>
Date: Tue Dec 11 23:02:37 2018 -0800
v3d: Do uniform pretty-printing in the QPU dump.
If you're trying to trace what's going on in a QPU dump, this will
definitely help you find your way.
---
src/broadcom/compiler/vir_to_qpu.c | 48 +++++++++++++++++++++++++++++++++++++-
src/broadcom/qpu/qpu_instr.c | 14 +++++++++++
src/broadcom/qpu/qpu_instr.h | 1 +
3 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/broadcom/compiler/vir_to_qpu.c b/src/broadcom/compiler/vir_to_qpu.c
index 4baadce294..0ab0f26c95 100644
--- a/src/broadcom/compiler/vir_to_qpu.c
+++ b/src/broadcom/compiler/vir_to_qpu.c
@@ -353,6 +353,33 @@ v3d_generate_code_block(struct v3d_compile *c,
}
}
+static bool
+reads_uniform(const struct v3d_device_info *devinfo, uint64_t instruction)
+{
+ struct v3d_qpu_instr qpu;
+ MAYBE_UNUSED bool ok = v3d_qpu_instr_unpack(devinfo, instruction, &qpu);
+ assert(ok);
+
+ if (qpu.sig.ldunif ||
+ qpu.sig.ldunifarf ||
+ qpu.sig.wrtmuc) {
+ return true;
+ }
+
+ if (qpu.type == V3D_QPU_INSTR_TYPE_ALU) {
+ if (qpu.alu.add.magic_write &&
+ v3d_qpu_magic_waddr_loads_unif(qpu.alu.add.waddr)) {
+ return true;
+ }
+
+ if (qpu.alu.mul.magic_write &&
+ v3d_qpu_magic_waddr_loads_unif(qpu.alu.mul.waddr)) {
+ return true;
+ }
+ }
+
+ return false;
+}
static void
v3d_dump_qpu(struct v3d_compile *c)
@@ -361,11 +388,30 @@ v3d_dump_qpu(struct v3d_compile *c)
vir_get_stage_name(c),
c->program_id, c->variant_id);
+ int next_uniform = 0;
for (int i = 0; i < c->qpu_inst_count; i++) {
const char *str = v3d_qpu_disasm(c->devinfo, c->qpu_insts[i]);
- fprintf(stderr, "0x%016"PRIx64" %s\n", c->qpu_insts[i], str);
+ fprintf(stderr, "0x%016"PRIx64" %s", c->qpu_insts[i], str);
+
+ /* We can only do this on 4.x, because we're not tracking TMU
+ * implicit uniforms here on 3.x.
+ */
+ if (c->devinfo->ver >= 40 &&
+ reads_uniform(c->devinfo, c->qpu_insts[i])) {
+ fprintf(stderr, " (");
+ vir_dump_uniform(c->uniform_contents[next_uniform],
+ c->uniform_data[next_uniform]);
+ fprintf(stderr, ")");
+ next_uniform++;
+ }
+ fprintf(stderr, "\n");
ralloc_free((void *)str);
}
+
+ /* Make sure our dumping lined up. */
+ if (c->devinfo->ver >= 40)
+ assert(next_uniform == c->num_uniforms);
+
fprintf(stderr, "\n");
}
diff --git a/src/broadcom/qpu/qpu_instr.c b/src/broadcom/qpu/qpu_instr.c
index 147017a659..08f29a4093 100644
--- a/src/broadcom/qpu/qpu_instr.c
+++ b/src/broadcom/qpu/qpu_instr.c
@@ -555,6 +555,20 @@ v3d_qpu_magic_waddr_is_tsy(enum v3d_qpu_waddr waddr)
waddr == V3D_QPU_WADDR_SYNCU);
}
+bool
+v3d_qpu_magic_waddr_loads_unif(enum v3d_qpu_waddr waddr)
+{
+ switch (waddr) {
+ case V3D_QPU_WADDR_VPMU:
+ case V3D_QPU_WADDR_TLBU:
+ case V3D_QPU_WADDR_TMUAU:
+ case V3D_QPU_WADDR_SYNCU:
+ return true;
+ default:
+ return false;
+ }
+}
+
static bool
v3d_qpu_add_op_reads_vpm(enum v3d_qpu_add_op op)
{
diff --git a/src/broadcom/qpu/qpu_instr.h b/src/broadcom/qpu/qpu_instr.h
index c2b4ebd199..49d66ee888 100644
--- a/src/broadcom/qpu/qpu_instr.h
+++ b/src/broadcom/qpu/qpu_instr.h
@@ -443,6 +443,7 @@ bool v3d_qpu_magic_waddr_is_tmu(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST;
bool v3d_qpu_magic_waddr_is_tlb(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST;
bool v3d_qpu_magic_waddr_is_vpm(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST;
bool v3d_qpu_magic_waddr_is_tsy(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST;
+bool v3d_qpu_magic_waddr_loads_unif(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST;
bool v3d_qpu_uses_tlb(const struct v3d_qpu_instr *inst) ATTRIBUTE_CONST;
bool v3d_qpu_uses_sfu(const struct v3d_qpu_instr *inst) ATTRIBUTE_CONST;
bool v3d_qpu_writes_tmu(const struct v3d_qpu_instr *inst) ATTRIBUTE_CONST;
More information about the mesa-commit
mailing list