From 08d98290feb67ec71e0944c1ce3f6deffa53a156 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 5 Feb 2021 16:25:25 -0500 Subject: [PATCH] pan/bi: Cleanup terminal block check Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/bifrost/bi_pack.c | 2 +- src/panfrost/bifrost/compiler.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c index c7b8d96..2b1739e 100644 --- a/src/panfrost/bifrost/bi_pack.c +++ b/src/panfrost/bifrost/bi_pack.c @@ -567,7 +567,7 @@ bi_pack_constants(bi_context *ctx, bi_clause *clause, bi_instr *br = clause->tuples[clause->tuple_count - 1].add; assert(br && br->branch_target); - if (!bi_is_terminal_block(ctx, br->branch_target)) { + if (!bi_is_terminal_block(br->branch_target)) { /* Put it in the high place */ int32_t qwords = bi_block_offset(ctx, clause, br->branch_target); int32_t bytes = qwords * 16; diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index 69104f1..260b8d3 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -751,9 +751,8 @@ unsigned bi_clause_quadwords(bi_clause *clause); signed bi_block_offset(bi_context *ctx, bi_clause *start, bi_block *target); static inline bool -bi_is_terminal_block(bi_context *ctx, bi_block *block) +bi_is_terminal_block(bi_block *block) { - return block->base.successors[0] == NULL && block->base.successors[1] == NULL && list_is_empty(&block->clauses); -- 2.7.4