AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/insert_exec: avoid phis for masks in exec

Browse Source 
Exec always contains the same value as the top of stack, even if the
top of stack is a temporary/constant. So if the predecessors have different
top of stack operands, don't insert a phi and use exec as the new top of stack.

No Foz-DB changes.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31567>
This commit is contained in:
Georg Lehmann
2024-10-08 21:34:17 +02:00
committed by Marge Bot
parent 0338bb9ae8
commit 4f04e6f0c4
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_insert_exec_mask.cpp
+17 -11
View File
@@ -304,19 +304,12 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
ctx.info[idx].exec = ctx.info[preds[0]].exec;
} else {
assert(preds.size() == 2);
/* if one of the predecessors ends in exact mask, we pop it from stack */
unsigned num_exec_masks =
std::min(ctx.info[preds[0]].exec.size(), ctx.info[preds[1]].exec.size());
assert(ctx.info[preds[0]].exec.size() == ctx.info[preds[1]].exec.size());
if (block->kind & block_kind_merge) {
restore_exec = true;
num_exec_masks--;
}
if (block->kind & block_kind_top_level)
num_exec_masks = std::min(num_exec_masks, 2u);
unsigned last = ctx.info[preds[0]].exec.size() - 1;
/* create phis for diverged exec masks */
for (unsigned i = 0; i < num_exec_masks; i++) {
/* create phis for diverged temporary exec masks */
for (unsigned i = 0; i < last; i++) {
/* skip trivial phis */
if (ctx.info[preds[0]].exec[i].op == ctx.info[preds[1]].exec[i].op) {
Operand op = ctx.info[preds[0]].exec[i].op;
@@ -333,6 +326,19 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
uint8_t mask_type = ctx.info[preds[0]].exec[i].type & ctx.info[preds[1]].exec[i].type;
ctx.info[idx].exec.emplace_back(phi, mask_type);
}
if (block->kind & block_kind_merge) {
restore_exec = true;
} else {
/* The last mask is already in exec. */
Operand current_exec = Operand(exec, bld.lm);
if (ctx.info[preds[0]].exec[last].op == ctx.info[preds[1]].exec[last].op) {
current_exec = ctx.info[preds[0]].exec[last].op;
}
uint8_t mask_type =
ctx.info[preds[0]].exec[last].type & ctx.info[preds[1]].exec[last].type;
ctx.info[idx].exec.emplace_back(current_exec, mask_type);
}
}
unsigned i = 0;