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

pan/bi: Simplify bi_propagate_pass_flags

Browse Source 
Worklist-based dataflow analysis is overkill, we can just do DFS.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16045>
This commit is contained in:
Alyssa Rosenzweig
2022-04-19 13:02:30 -04:00
committed by Marge Bot
parent 46b099e392
commit 6bef59f56b
1 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/panfrost/bifrost/bi_helper_invocations.c
View File

@@ -133,6 +133,21 @@ bi_block_terminates_helpers(bi_block *block)
return true;
}
/*
* Propagate the pass flag up the control flow graph by performing depth-first
* search on the directed control flow graph.
*/
static void
bi_propagate_pass_flag(bi_block *block)
{
block->pass_flags = 1;
bi_foreach_predecessor(block, pred) {
if (pred->pass_flags == 0)
bi_propagate_pass_flag(pred);
}
}
void
bi_analyze_helper_terminate(bi_context *ctx)
{
@@ -142,51 +157,19 @@ bi_analyze_helper_terminate(bi_context *ctx)
if (ctx->stage != MESA_SHADER_FRAGMENT || ctx->inputs->is_blend)
return;
/* Set blocks as directly requiring helpers, and if they do add them to
* the worklist to propagate to their predecessors */
/* Clear flags */
bi_foreach_block(ctx, block)
block->pass_flags = 0;
struct set *worklist = _mesa_set_create(NULL,
_mesa_hash_pointer,
_mesa_key_pointer_equal);
struct set *visited = _mesa_set_create(NULL,
_mesa_hash_pointer,
_mesa_key_pointer_equal);
bi_foreach_block(ctx, block) {
block->pass_flags = bi_block_uses_helpers(block) ? 1 : 0;
if (block->pass_flags & 1)
_mesa_set_add(worklist, block);
/* For each block, check if it uses helpers and propagate that fact if
* so. We walk in reverse order to minimize the number of blocks tested:
* if the (unique) last block uses helpers, only that block is tested.
*/
bi_foreach_block_rev(ctx, block) {
if (block->pass_flags == 0 && bi_block_uses_helpers(block))
bi_propagate_pass_flag(block);
}
/* Next, propagate back. Since there are a finite number of blocks, the
* worklist (a subset of all the blocks) is finite. Since a block can
* only be added to the worklist if it is not on the visited list and
* the visited list - also a subset of the blocks - grows every
* iteration, the algorithm must terminate. */
struct set_entry *cur;
while((cur = _mesa_set_next_entry(worklist, NULL)) != NULL) {
/* Pop off a block requiring helpers */
bi_block *blk = (struct bi_block *) cur->key;
_mesa_set_remove(worklist, cur);
/* Its predecessors also require helpers */
bi_foreach_predecessor(blk, pred) {
if (!_mesa_set_search(visited, pred)) {
pred->pass_flags |= 1;
_mesa_set_add(worklist, pred);
}
}
_mesa_set_add(visited, blk);
}
_mesa_set_destroy(visited, NULL);
_mesa_set_destroy(worklist, NULL);
/* Finally, mark clauses requiring helpers */
bi_foreach_block(ctx, block) {
/* At the end, there are helpers iff we don't terminate */