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

aco/insert_exec_mask: allow for disconnected CFG

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20853>
This commit is contained in:
Daniel Schürmann
2023-01-19 17:36:06 +01:00
committed by Marge Bot
parent 7f7a70778f
commit caec48529b
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_insert_exec_mask.cpp
+7 -8
View File
@@ -249,7 +249,7 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
std::vector<unsigned>& preds = block->linear_preds;
/* start block */
if (idx == 0) {
if (preds.empty()) {
aco_ptr<Instruction>& startpgm = block->instructions[0];
assert(startpgm->opcode == aco_opcode::p_startpgm);
bld.insert(std::move(startpgm));
@@ -275,10 +275,10 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
start_exec = Operand::c32_or_c64(-1u, bld.lm == s2);
if (ctx.handle_wqm) {
ctx.info[0].exec.emplace_back(start_exec, mask_type_global | mask_type_exact);
ctx.info[idx].exec.emplace_back(start_exec, mask_type_global | mask_type_exact);
/* if this block needs WQM, initialize already */
if (ctx.info[0].block_needs & WQM)
transition_to_WQM(ctx, bld, 0);
if (ctx.info[idx].block_needs & WQM)
transition_to_WQM(ctx, bld, idx);
} else {
uint8_t mask = mask_type_global;
if (ctx.program->needs_wqm) {
@@ -288,7 +288,7 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
} else {
mask |= mask_type_exact;
}
ctx.info[0].exec.emplace_back(start_exec, mask);
ctx.info[idx].exec.emplace_back(start_exec, mask);
}
return count;
@@ -708,7 +708,7 @@ add_branch_code(exec_ctx& ctx, Block* block)
unsigned idx = block->index;
Builder bld(ctx.program, block);
if (idx == ctx.program->blocks.size() - 1)
if (block->linear_succs.empty())
return;
/* try to disable wqm handling */
@@ -909,8 +909,7 @@ process_block(exec_ctx& ctx, Block* block)
unsigned idx = add_coupling_code(ctx, block, instructions);
assert(block->index != ctx.program->blocks.size() - 1 ||
ctx.info[block->index].exec.size() <= 2);
assert(!block->linear_succs.empty() || ctx.info[block->index].exec.size() <= 2);
process_instructions(ctx, block, instructions, idx);