fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 09:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aco/insert_exec: new way to handle instructions that need wqm disabled

Browse source 
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35970>
This commit is contained in:
Georg Lehmann 2025-07-06 20:38:00 +02:00 • committed by Marge Bot
parent ca25553b92
commit 63af48ae2e
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/amd/compiler/aco_insert_exec_mask.cpp
View file

@ -55,6 +55,7 @@ struct exec_ctx {
std::vector<loop_info> loop;
bool handle_wqm = false;
bool had_demote_in_cf = false;
Temp local_exact_mask;
exec_ctx(Program* program_) : program(program_), info(program->blocks.size()) {}
};
@ -146,6 +147,8 @@ add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>
Block::edge_vec& preds = block->linear_preds;
bool restore_exec = false;
ctx.local_exact_mask = Temp();
/* start block */
if (preds.empty()) {
aco_ptr<Instruction>& startpgm = block->instructions[0];
@ -498,6 +501,7 @@ process_instructions(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instructio
info.exec.back().op = Operand(exec, bld.lm);
instr->opcode = aco_opcode::p_exit_early_if_not;
assert(!ctx.handle_wqm || (info.exec[0].type & mask_type_wqm) == 0);
ctx.local_exact_mask = Temp();
} else if (instr->opcode == aco_opcode::p_is_helper) {
Definition dst = instr->definitions[0];
assert(dst.size() == bld.lm.size());
@ -560,10 +564,8 @@ process_instructions(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instructio
/* End shader if global mask is zero. */
instr->opcode = aco_opcode::p_exit_early_if_not;
instr->operands[0] = exit_cond;
bld.insert(std::move(instr));
continue;
ctx.local_exact_mask = Temp();
} else if (instr->opcode == aco_opcode::p_elect) {
bool all_lanes_enabled = info.exec.back().op.constantEquals(-1u);
Definition dst = instr->definitions[0];
@ -585,6 +587,25 @@ process_instructions(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instructio
state = Exact;
ctx.handle_wqm = false;
continue;
} else if (instr_disables_wqm(instr.get())) {
if (!ctx.handle_wqm) {
remove_disable_wqm(instr.get());
} else {
if (!info.exec.back().op.isTemp())
info.exec.back().op = bld.copy(bld.def(bld.lm), Operand(exec, bld.lm));
instr_wqm_mask(instr.get()) = info.exec.back().op;
if (info.exec.size() > 2) {
if (!ctx.local_exact_mask.id()) {
ctx.local_exact_mask = bld.sop2(Builder::s_and, bld.def(bld.lm), bld.def(s1, scc),
ctx.info[block->index].exec[0].op, Operand(exec, bld.lm));
}
instr_exact_mask(instr.get()) = Operand(ctx.local_exact_mask);
} else {
instr_exact_mask(instr.get()) = info.exec[0].op;
}
}
}
bld.insert(std::move(instr));