Mesa (master): freedreno/afuc: Add missing rnn_prepdb()

[GitLab Mirror]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Fri Jul 31 12:11:16 2020 +0200

freedreno/afuc: Add missing rnn_prepdb()

It's totally not obvious, but this runs extra error checking and is
necessary for correct variant handling, and variant handling will
silently not work if it's not enabled. Add it asm.c even though it's not
strictly necessary, to prevent anyone from missing this in the future.

Missing this really should be an error.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6140>

---

 src/freedreno/afuc/asm.c    | 1 +
 src/freedreno/afuc/disasm.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/freedreno/afuc/asm.c b/src/freedreno/afuc/asm.c
index 5b19c7fd9c0..56036be46f6 100644
--- a/src/freedreno/afuc/asm.c
+++ b/src/freedreno/afuc/asm.c
@@ -417,6 +417,7 @@ int main(int argc, char **argv)
 	ctx = rnndec_newcontext(db);
 
 	rnn_parsefile(db, "adreno.xml");
+	rnn_prepdb(db);
 	if (db->estatus)
 		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, name);
diff --git a/src/freedreno/afuc/disasm.c b/src/freedreno/afuc/disasm.c
index 66e40c1d188..2a2571074b9 100644
--- a/src/freedreno/afuc/disasm.c
+++ b/src/freedreno/afuc/disasm.c
@@ -816,6 +816,7 @@ int main(int argc, char **argv)
 	ctx->colors = colors ? &envy_def_colors : &envy_null_colors;
 
 	rnn_parsefile(db, "adreno.xml");
+	rnn_prepdb(db);
 	if (db->estatus)
 		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, variant);