From c8680f1f901f0970e023e129b21cc3b34e4e182c Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 28 Apr 2023 14:31:09 +0800 Subject: [PATCH] ac/llvm,radeonsi: lower nir_load_merged_wave_info_amd in abi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit aco does not implement it. Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- src/amd/llvm/ac_nir_to_llvm.c | 3 --- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index 6b95d163d6d..a0d463d72a7 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -3208,9 +3208,6 @@ static bool visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins case nir_intrinsic_load_lds_ngg_gs_out_vertex_base_amd: result = ctx->abi->intrinsic_load(ctx->abi, instr); break; - case nir_intrinsic_load_merged_wave_info_amd: - result = ac_get_arg(&ctx->ac, ctx->args->merged_wave_info); - break; case nir_intrinsic_load_ordered_id_amd: result = ac_unpack_param(&ctx->ac, ac_get_arg(&ctx->ac, ctx->args->gs_tg_info), 0, 12); break; diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index aa9916e3c03..b0b288a2b0d 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -510,6 +510,9 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s replacement = ac_nir_load_arg(b, &args->ac, args->ac.gs_vtx_offset[base]); break; } + case nir_intrinsic_load_merged_wave_info_amd: + replacement = ac_nir_load_arg(b, &args->ac, args->ac.merged_wave_info); + break; default: return false; }