OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: support nir_export_amd with ps targets

Browse Source 
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22199>
This commit is contained in:
Qiang Yu
2023-03-29 18:05:47 +08:00
committed by Marge Bot
parent 471418077a
commit d3611af389
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -9140,19 +9140,21 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
unsigned write_mask = nir_intrinsic_write_mask(instr);
/* Mark vertex export block. */
if (target == V_008DFC_SQ_EXP_POS)
if (target == V_008DFC_SQ_EXP_POS || target <= V_008DFC_SQ_EXP_NULL)
ctx->block->kind |= block_kind_export_end;
if (target <= V_008DFC_SQ_EXP_NULL)
ctx->program->has_color_exports = true;
aco_ptr<Export_instruction> exp{
create_instruction<Export_instruction>(aco_opcode::exp, Format::EXP, 4, 0)};
exp->dest = target;
exp->enabled_mask = write_mask;
exp->compressed = flags & AC_EXP_FLAG_COMPRESSED;
exp->valid_mask = flags & AC_EXP_FLAG_VALID_MASK;
/* ACO may reorder position export instructions, then mark done for last
* export instruction. So don't respect the nir AC_EXP_FLAG_DONE for position
/* ACO may reorder position/mrt export instructions, then mark done for last
* export instruction. So don't respect the nir AC_EXP_FLAG_DONE for position/mrt
* exports here and leave it to ACO.
*/
if (target == V_008DFC_SQ_EXP_PRIM)
@@ -9160,9 +9162,23 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
else
exp->done = false;
/* ACO may reorder mrt export instructions, then mark valid mask for last
* export instruction. So don't respect the nir AC_EXP_FLAG_VALID_MASK for mrt
* exports here and leave it to ACO.
*/
if (target > V_008DFC_SQ_EXP_NULL)
exp->valid_mask = flags & AC_EXP_FLAG_VALID_MASK;
else
exp->valid_mask = false;
/* Compressed export uses two bits for a channel. */
uint32_t channel_mask = exp->compressed ?
(write_mask & 0x3 ? 1 : 0) | (write_mask & 0xc ? 2 : 0) :
write_mask;
Temp value = get_ssa_temp(ctx, instr->src[0].ssa);
for (unsigned i = 0; i < 4; i++) {
exp->operands[i] = write_mask & BITFIELD_BIT(i) ?
exp->operands[i] = channel_mask & BITFIELD_BIT(i) ?
Operand(emit_extract_vector(ctx, value, i, v1)) :
Operand(v1);
}