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

ac/llvm: conditionally check wave id in gs sendmsg

Browse source 
nir lowering already call this with wave id check, no need to
check inside ac_build_sendmsg_gs_alloc_req again.

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/17130>
This commit is contained in:
Qiang Yu 2022-06-15 10:34:51 +08:00 • committed by Marge Bot
parent e75f11625d
commit 74e596a5f0
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amd/llvm/ac_llvm_build.c
View file

@ -4388,7 +4388,8 @@ void ac_build_sendmsg_gs_alloc_req(struct ac_llvm_context *ctx, LLVMValueRef wav
export_dummy_prim = true;
}
ac_build_ifcc(ctx, LLVMBuildICmp(builder, LLVMIntEQ, wave_id, ctx->i32_0, ""), 5020);
if (wave_id)
ac_build_ifcc(ctx, LLVMBuildICmp(builder, LLVMIntEQ, wave_id, ctx->i32_0, ""), 5020);
tmp = LLVMBuildShl(builder, prim_cnt, LLVMConstInt(ctx->i32, 12, false), "");
tmp = LLVMBuildOr(builder, tmp, vtx_cnt, "");
@ -4413,7 +4414,8 @@ void ac_build_sendmsg_gs_alloc_req(struct ac_llvm_context *ctx, LLVMValueRef wav
ac_build_endif(ctx, 5021);
}
ac_build_endif(ctx, 5020);
if (wave_id)
ac_build_endif(ctx, 5020);
}

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

@ -4260,10 +4260,10 @@ static void visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
break;
}
case nir_intrinsic_alloc_vertices_and_primitives_amd:
/* The caller should only call this conditionally for wave 0, so assume that the current
* wave is always wave 0.
/* The caller should only call this conditionally for wave 0, so pass NULL to disable
* the wave 0 check inside this function.
*/
ac_build_sendmsg_gs_alloc_req(&ctx->ac, ctx->ac.i32_0,
ac_build_sendmsg_gs_alloc_req(&ctx->ac, NULL,
get_src(ctx, instr->src[0]),
get_src(ctx, instr->src[1]));
break;