fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aco: use new disable_wqm for exp

Browse source 
No Foz-DB changes on GFX1201.

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 21:51:05 +02:00 • committed by Marge Bot
parent bd6647e21e
commit 8e53ba9a0a
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ struct exec_ctx {
bool
needs_exact(aco_ptr<Instruction>& instr)
{
return instr->isEXP() || instr->opcode == aco_opcode::p_dual_src_export_gfx11;
return instr->opcode == aco_opcode::p_dual_src_export_gfx11;
}
WQMState
@ -418,6 +418,8 @@ remove_disable_wqm(Instruction* instr)
instr->flatlike().disable_wqm = false;
} else if (instr->isMIMG()) {
instr->mimg().disable_wqm = false;
} else if (instr->isEXP()) {
instr->exp().disable_wqm = false;
}
/* Remove the two masks so that the assembler doesn't need to handle them. */
@ -843,6 +845,8 @@ instr_disables_wqm(Instruction* instr)
return instr->flatlike().disable_wqm;
} else if (instr->isMIMG()) {
return instr->mimg().disable_wqm;
} else if (instr->isEXP()) {
return instr->exp().disable_wqm;
}
return false;

3
src/amd/compiler/aco_ir.h
View file

@ -1737,7 +1737,8 @@ struct Export_instruction : public Instruction {
bool done : 1;
bool valid_mask : 1;
bool row_en : 1;
uint8_t padding0 : 4;
bool disable_wqm : 1;
uint8_t padding0 : 3;
uint8_t padding1;
};
static_assert(sizeof(Export_instruction) == sizeof(Instruction) + 4, "Unexpected padding");

3
src/amd/compiler/aco_opcodes.py
View file

@ -152,7 +152,8 @@ class Format(IntEnum):
('unsigned', 'dest', None),
('bool', 'compr', 'false', 'compressed'),
('bool', 'done', 'false'),
('bool', 'vm', 'false', 'valid_mask')]
('bool', 'vm', 'false', 'valid_mask'),
('bool', 'disable_wqm', 'false')]
elif self == Format.PSEUDO_BRANCH:
return [('uint32_t', 'target0', '0', 'target[0]'),
('uint32_t', 'target1', '0', 'target[1]')]

6
src/amd/compiler/instruction_selection/aco_select_nir_intrinsics.cpp
View file

@ -5040,7 +5040,7 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
const bool row_en = instr->intrinsic == nir_intrinsic_export_row_amd;
aco_ptr<Instruction> exp{create_instruction(aco_opcode::exp, Format::EXP, 4 + row_en, 0)};
aco_ptr<Instruction> exp{create_instruction(aco_opcode::exp, Format::EXP, 6 + row_en, 0)};
exp->exp().dest = target;
exp->exp().enabled_mask = write_mask;
@ -5085,6 +5085,10 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
exp->operands[4] = bld.m0(row);
}
exp->exp().disable_wqm = true;
instr_exact_mask(exp.get()) = Operand();
instr_wqm_mask(exp.get()) = Operand();
ctx->block->instructions.emplace_back(std::move(exp));
break;
}