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

radeonsi: fix tess regression with latest LLVM git

Browse source 
The problem was that SGPRs returned from LS were treated as VGPRs by LLVM
because LS executes conditionally. The workaround is to use input SGPRs
initialized by the hw (i.e. parameters of the wrapper function) instead of
the ones returned by LS.

Fixes: 80236f2367 - ac/nir/tess: add if/endif for HS threads in NIR instead of ACO/LLVM

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35620>
This commit is contained in:
Marek Olšák 2025-06-18 18:09:06 -04:00 • committed by Marge Bot
parent b3ed7f7b63
commit 23c3646164
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gallium/drivers/radeonsi/si_shader_llvm.c
View file

@ -407,27 +407,24 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
assert(num_params == LLVMCountParams(parts[1].value));
for (unsigned i = 0; i < num_params; i++) {
params[i] = LLVMBuildExtractValue(builder, ret, i, "");
/* Convert return value to same type as next shader's input param. */
LLVMTypeRef ret_type = LLVMTypeOf(params[i]);
LLVMValueRef ret_value = LLVMBuildExtractValue(builder, ret, i, "");;
LLVMTypeRef ret_type = LLVMTypeOf(ret_value);
LLVMTypeRef param_type = LLVMTypeOf(LLVMGetParam(parts[1].value, i));
assert(ac_get_type_size(ret_type) == 4);
assert(ac_get_type_size(param_type) == 4);
if (ret_type != param_type) {
if (LLVMGetTypeKind(param_type) == LLVMPointerTypeKind) {
assert(LLVMGetPointerAddressSpace(param_type) == AC_ADDR_SPACE_CONST_32BIT);
assert(ret_type == ctx->ac.i32);
params[i] = LLVMBuildIntToPtr(builder, params[i], param_type, "");
} else {
params[i] = LLVMBuildBitCast(builder, params[i], param_type, "");
}
if (ret_type == ctx->ac.f32) {
/* Returned VGPRs only: Pass the returned value to the next shader. */
params[i] = LLVMBuildBitCast(builder, ret_value, param_type, "");
} else {
/* Use input SGPRs from the wrapper function params instead of the return value of
* the previous shader.
*/
assert(ret_type == ctx->ac.i32);
}
}
} else {
/* The second half of the merged shader should use
* the inputs from the toplevel (wrapper) function,
* not the return value from the last call.