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

agx: Optimize out empty else blocks

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11023>
This commit is contained in:
Alyssa Rosenzweig
2021-05-23 22:51:21 -04:00
committed by Alyssa Rosenzweig
parent cf43206e76
commit 11705488ed
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/asahi/compiler/agx_compile.c
View File

@@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2021 Alyssa Rosenzweig <alyssa@rosenzweig.io> * Copyright (C) 2021 Alyssa Rosenzweig <alyssa@rosenzweig.io>
* Copyright (C) 2020 Collabora Ltd. * Copyright (C) 2020 Collabora Ltd.
* Copyright © 2016 Broadcom
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -754,12 +755,18 @@ emit_cf_list(agx_context *ctx, struct exec_list *list);
* ... * ...
* pop_exec * pop_exec
* *
* This is not usually optimal, but it's a start. * If the else is empty, we can omit the else_icmp. This is not usually
* optimal, but it's a start.
*/ */
static void static void
emit_if(agx_context *ctx, nir_if *nif) emit_if(agx_context *ctx, nir_if *nif)
{ {
nir_block *nir_else_block = nir_if_first_else_block(nif);
bool empty_else_block =
(nir_else_block == nir_if_last_else_block(nif) &&
exec_list_is_empty(&nir_else_block->instr_list));
agx_builder _b = agx_init_builder(ctx, agx_after_block(ctx->current_block)); agx_builder _b = agx_init_builder(ctx, agx_after_block(ctx->current_block));
agx_index cond = agx_src_index(&nif->condition); agx_index cond = agx_src_index(&nif->condition);
@@ -769,10 +776,13 @@ emit_if(agx_context *ctx, nir_if *nif)
/* Emit the two subblocks. */ /* Emit the two subblocks. */
emit_cf_list(ctx, &nif->then_list); emit_cf_list(ctx, &nif->then_list);
_b.cursor = agx_after_block(ctx->current_block); if (!empty_else_block) {
agx_else_icmp(&_b, cond, agx_zero(), 1, AGX_ICOND_UEQ, false); _b.cursor = agx_after_block(ctx->current_block);
agx_else_icmp(&_b, cond, agx_zero(), 1, AGX_ICOND_UEQ, false);
emit_cf_list(ctx, &nif->else_list);
}
emit_cf_list(ctx, &nif->else_list);
_b.cursor = agx_after_block(ctx->current_block); _b.cursor = agx_after_block(ctx->current_block);
agx_pop_exec(&_b, 1); agx_pop_exec(&_b, 1);
ctx->loop_nesting--; ctx->loop_nesting--;