Mesa (master): freedreno/ir3 better cat6 encoding detection

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cc5ca9391ce90190f2c95e00db5ffd38db1490a6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc5ca9391ce90190f2c95e00db5ffd38db1490a6

Author: Rob Clark <robdclark at gmail.com>
Date:   Fri Mar 15 10:29:10 2019 -0400

freedreno/ir3 better cat6 encoding detection

These two bits seem to be a better way to detect which encoding we are
looking at.

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/freedreno/ir3/disasm-a3xx.c |  5 +----
 src/freedreno/ir3/instr-a3xx.h  | 27 +++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/freedreno/ir3/disasm-a3xx.c b/src/freedreno/ir3/disasm-a3xx.c
index b857b381212..7b2a773df46 100644
--- a/src/freedreno/ir3/disasm-a3xx.c
+++ b/src/freedreno/ir3/disasm-a3xx.c
@@ -827,10 +827,7 @@ static void print_instr_cat6_a6xx(struct disasm_ctx *ctx, instr_t *instr)
 
 static void print_instr_cat6(struct disasm_ctx *ctx, instr_t *instr)
 {
-	// TODO not sure if this is the best way to figure
-	// out if new vs old encoding, but it kinda seems
-	// to work:
-	if ((ctx->gpu_id >= 600) && (instr->cat6.opc == 0)) {
+	if (!is_cat6_legacy(instr, ctx->gpu_id)) {
 		print_instr_cat6_a6xx(ctx, instr);
 		if (debug & PRINT_VERBOSE)
 			fprintf(ctx->out, " NEW");
diff --git a/src/freedreno/ir3/instr-a3xx.h b/src/freedreno/ir3/instr-a3xx.h
index 92d7de44d9f..b0db28eb635 100644
--- a/src/freedreno/ir3/instr-a3xx.h
+++ b/src/freedreno/ir3/instr-a3xx.h
@@ -835,6 +835,28 @@ static inline bool instr_sat(instr_t *instr)
 	}
 }
 
+/* We can probably drop the gpu_id arg, but keeping it for now so we can
+ * assert if we see something we think should be new encoding on an older
+ * gpu.
+ */
+static inline bool is_cat6_legacy(instr_t *instr, unsigned gpu_id)
+{
+	instr_cat6_a6xx_t *cat6 = &instr->cat6_a6xx;
+
+	/* At least one of these two bits is pad in all the possible
+	 * "legacy" cat6 encodings, and a analysis of all the pre-a6xx
+	 * cmdstream traces I have indicates that the pad bit is zero
+	 * in all cases.  So we can use this to detect new encoding:
+	 */
+	if ((cat6->pad2 & 0x8) && (cat6->pad4 & 0x2)) {
+		assert(gpu_id >= 600);
+		assert(instr->cat6.opc == 0);
+		return false;
+	}
+
+	return true;
+}
+
 static inline uint32_t instr_opc(instr_t *instr, unsigned gpu_id)
 {
 	switch (instr->opc_cat) {
@@ -845,10 +867,7 @@ static inline uint32_t instr_opc(instr_t *instr, unsigned gpu_id)
 	case 4:  return instr->cat4.opc;
 	case 5:  return instr->cat5.opc;
 	case 6:
-		// TODO not sure if this is the best way to figure
-		// out if new vs old encoding, but it kinda seems
-		// to work:
-		if ((gpu_id >= 600) && (instr->cat6.opc == 0))
+		if (!is_cat6_legacy(instr, gpu_id))
 			return instr->cat6_a6xx.opc;
 		return instr->cat6.opc;
 	case 7:  return instr->cat7.opc;