OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/tools: check rnn parse status

Browse Source 
Don't silently ignore issues.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6107>
This commit is contained in:
Rob Clark
2020-07-28 07:55:49 -07:00
committed by Marge Bot
parent 6c8b921572
commit 751af16e1d
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedreno/afuc/asm.c
View File

@@ -21,6 +21,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include <err.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
@@ -416,6 +417,8 @@ int main(int argc, char **argv)
ctx = rnndec_newcontext(db); ctx = rnndec_newcontext(db);
rnn_parsefile(db, "adreno.xml"); rnn_parsefile(db, "adreno.xml");
if (db->estatus)
errx(db->estatus, "failed to parse register database");
dom[0] = rnn_finddomain(db, name); dom[0] = rnn_finddomain(db, name);
dom[1] = rnn_finddomain(db, "AXXX"); dom[1] = rnn_finddomain(db, "AXXX");
control_regs = rnn_finddomain(db, control_reg_name); control_regs = rnn_finddomain(db, control_reg_name);

3
src/freedreno/afuc/disasm.c
View File

@@ -21,6 +21,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include <err.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
@@ -815,6 +816,8 @@ int main(int argc, char **argv)
ctx->colors = colors ? &envy_def_colors : &envy_null_colors; ctx->colors = colors ? &envy_def_colors : &envy_null_colors;
rnn_parsefile(db, "adreno.xml"); rnn_parsefile(db, "adreno.xml");
if (db->estatus)
errx(db->estatus, "failed to parse register database");
dom[0] = rnn_finddomain(db, variant); dom[0] = rnn_finddomain(db, variant);
dom[1] = rnn_finddomain(db, "AXXX"); dom[1] = rnn_finddomain(db, "AXXX");
control_regs = rnn_finddomain(db, control_reg_name); control_regs = rnn_finddomain(db, control_reg_name);

3
src/freedreno/decode/rnnutil.c
View File

@@ -26,6 +26,7 @@
* Rob Clark <robclark@freedesktop.org> * Rob Clark <robclark@freedesktop.org>
*/ */
#include <err.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
@@ -87,6 +88,8 @@ static void init(struct rnn *rnn, char *file, char *domain)
rnndec_varadd(rnn->vc, "chip", domain); rnndec_varadd(rnn->vc, "chip", domain);
if (rnn->vc != rnn->vc_nocolor) if (rnn->vc != rnn->vc_nocolor)
rnndec_varadd(rnn->vc_nocolor, "chip", domain); rnndec_varadd(rnn->vc_nocolor, "chip", domain);
if (rnn->db->estatus)
errx(rnn->db->estatus, "failed to parse register database");
} }
void rnn_load_file(struct rnn *rnn, char *file, char *domain) void rnn_load_file(struct rnn *rnn, char *file, char *domain)