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

amd: lower load_gs_wave_id_amd in NIR

Browse source 
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32782>
This commit is contained in:
Marek Olšák 2024-12-25 12:44:59 -05:00 • committed by Marge Bot
parent 923f59c971
commit 66dd70adc5
3 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/common/ac_nir.c
View file

@ -324,6 +324,14 @@ lower_intrinsic_to_arg(nir_builder *b, nir_instr *instr, void *state)
replacement = nir_vec2(b, offset_i, offset_j);
break;
}
case nir_intrinsic_load_gs_wave_id_amd:
if (s->args->merged_wave_info.used)
replacement = ac_nir_unpack_arg(b, s->args, s->args->merged_wave_info, 16, 8);
else if (s->args->gs_wave_id.used)
replacement = ac_nir_load_arg(b, s->args, s->args->gs_wave_id);
else
unreachable("Shader doesn't have GS wave ID.");
break;
default:
return false;
}

12
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -8896,18 +8896,6 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
bld.sopp(aco_opcode::s_sendmsg, bld.m0(m0_content), imm);
break;
}
case nir_intrinsic_load_gs_wave_id_amd: {
Temp dst = get_ssa_temp(ctx, &instr->def);
if (ctx->args->merged_wave_info.used)
bld.pseudo(aco_opcode::p_extract, Definition(dst), bld.def(s1, scc),
get_arg(ctx, ctx->args->merged_wave_info), Operand::c32(2u), Operand::c32(8u),
Operand::zero());
else if (ctx->args->gs_wave_id.used)
bld.copy(Definition(dst), get_arg(ctx, ctx->args->gs_wave_id));
else
unreachable("Shader doesn't have GS wave ID.");
break;
}
case nir_intrinsic_is_subgroup_invocation_lt_amd: {
Temp src = bld.as_uniform(get_ssa_temp(ctx, instr->src[0].ssa));
unsigned offset = nir_intrinsic_base(instr);

9
src/amd/llvm/ac_nir_to_llvm.c
View file

@ -2989,15 +2989,6 @@ static bool visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
ac_build_sendmsg(&ctx->ac, imm, m0_content);
break;
}
case nir_intrinsic_load_gs_wave_id_amd: {
if (ctx->args->merged_wave_info.used)
result = ac_unpack_param(&ctx->ac, ac_get_arg(&ctx->ac, ctx->args->merged_wave_info), 16, 8);
else if (ctx->args->gs_wave_id.used)
result = ac_get_arg(&ctx->ac, ctx->args->gs_wave_id);
else
unreachable("Shader doesn't have GS wave ID.");
break;
}
case nir_intrinsic_load_tess_coord: {
LLVMValueRef coord[] = {
ctx->abi->tes_u_replaced ? ctx->abi->tes_u_replaced : ac_get_arg(&ctx->ac, ctx->args->tes_u),