fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 14:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

aco/optimizer: validate uses
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38724>
This commit is contained in:
Georg Lehmann 2024-08-09 16:32:01 +02:00 • committed by Marge Bot
parent ad3add311c
commit 8b1340a52c
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/compiler/aco_dead_code_analysis.cpp
View file

@ -23,6 +23,8 @@ void
process_loop_header_phis(std::vector<uint16_t>& uses, Block& block)
{
for (aco_ptr<Instruction>& instr : block.instructions) {
if (!instr.get())
continue;
if (!is_phi(instr))
return;
for (const Operand& op : instr->operands) {
@ -37,6 +39,8 @@ process_block(std::vector<uint16_t>& uses, Block& block)
{
for (auto it = block.instructions.rbegin(); it != block.instructions.rend(); it++) {
aco_ptr<Instruction>& instr = *it;
if (!instr.get())
continue;
if ((block.kind & block_kind_loop_header) && is_phi(instr))
break;

36
src/amd/compiler/aco_optimizer.cpp
View file

@ -5147,7 +5147,7 @@ apply_literals(opt_ctx& ctx, aco_ptr<Instruction>& instr)
}
void
validate_opt_ctx(opt_ctx& ctx)
validate_opt_ctx(opt_ctx& ctx, bool incorrect_uses_lits)
{
if (!(debug_flags & DEBUG_VALIDATE_OPT))
return;
@ -5166,7 +5166,8 @@ validate_opt_ctx(opt_ctx& ctx)
FILE* const memf = u_memstream_get(&mem);
fprintf(memf, "Optimizer: %s: ", msg);
aco_print_instr(program->gfx_level, instr, memf);
if (instr)
aco_print_instr(program->gfx_level, instr, memf);
u_memstream_close(&mem);
aco_err(program, "%s", out);
@ -5186,9 +5187,24 @@ validate_opt_ctx(opt_ctx& ctx)
}
}
}
if (!is_valid) {
std::vector<uint16_t> actual_uses = dead_code_analysis(program);
check(ctx.uses.size() == actual_uses.size(), "ctx.uses has wrong size", nullptr);
check(ctx.info.size() == actual_uses.size(), "ctx.info has wrong size", nullptr);
if (!is_valid)
abort();
for (unsigned i = 0; i < ctx.uses.size(); i++) {
if (incorrect_uses_lits && (ctx.info[i].label & label_constant))
check(ctx.uses[i] <= actual_uses[i], "ctx.uses[i] is too high for a literal",
ctx.info[i].parent_instr);
else
check(ctx.uses[i] == actual_uses[i], "ctx.uses[i] is incorrect", ctx.info[i].parent_instr);
}
if (!is_valid)
abort();
}
void rename_loop_header_phis(opt_ctx& ctx) {
@ -5230,18 +5246,16 @@ optimize(Program* program)
label_instruction(ctx, instr);
}
validate_opt_ctx(ctx);
rename_loop_header_phis(ctx);
validate_opt_ctx(ctx);
ctx.uses = dead_code_analysis(program);
validate_opt_ctx(ctx, false);
/* 2. Rematerialize constants in every block. */
rematerialize_constants(ctx);
validate_opt_ctx(ctx);
validate_opt_ctx(ctx, false);
/* 3. Combine v_mad, omod, clamp and propagate sgpr on VALU instructions */
for (Block& block : program->blocks) {
@ -5258,7 +5272,7 @@ optimize(Program* program)
}
}
validate_opt_ctx(ctx);
validate_opt_ctx(ctx, false);
/* 4. Top-Down DAG pass (backward) to select instructions (includes DCE) */
for (auto block_rit = program->blocks.rbegin(); block_rit != program->blocks.rend();
@ -5270,7 +5284,7 @@ optimize(Program* program)
select_instruction(ctx, *instr_rit);
}
validate_opt_ctx(ctx);
validate_opt_ctx(ctx, true);
/* 5. Add literals to instructions */
for (Block& block : program->blocks) {
@ -5281,7 +5295,7 @@ optimize(Program* program)
block.instructions = std::move(ctx.instructions);
}
validate_opt_ctx(ctx);
validate_opt_ctx(ctx, true);
}
} // namespace aco