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

gallivm: fix [IU]MUL_HI regression harder

Browse source 
The fix in commit 88f791db75 was insufficient
for radeonsi because the vector case was not handled properly. It seems
piglit only covers the scalar case, unfortunately.

Fixes GL45-CTS.shader_bitfield_operation.[iu]mulExtended.*

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Nicolai Hähnle 2016-11-09 12:44:47 +01:00
parent 9ca6711faa
commit b46a9c570f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/auxiliary/gallivm/lp_bld_arit.c
View file

@ -1237,16 +1237,15 @@ lp_build_mul_32_lohi(struct lp_build_context *bld,
{
struct gallivm_state *gallivm = bld->gallivm;
LLVMBuilderRef builder = gallivm->builder;
LLVMValueRef tmp;
LLVMValueRef tmp, shift, res_lo;
struct lp_type type_tmp;
LLVMTypeRef wide_type, cast_type;
LLVMTypeRef wide_type, narrow_type;
type_tmp = bld->type;
narrow_type = lp_build_vec_type(gallivm, type_tmp);
type_tmp.width *= 2;
wide_type = lp_build_vec_type(gallivm, type_tmp);
type_tmp = bld->type;
type_tmp.length *= 2;
cast_type = lp_build_vec_type(gallivm, type_tmp);
shift = lp_build_const_vec(gallivm, type_tmp, 32);
if (bld->type.sign) {
a = LLVMBuildSExt(builder, a, wide_type, "");
@ -1256,9 +1255,14 @@ lp_build_mul_32_lohi(struct lp_build_context *bld,
b = LLVMBuildZExt(builder, b, wide_type, "");
}
tmp = LLVMBuildMul(builder, a, b, "");
tmp = LLVMBuildBitCast(builder, tmp, cast_type, "");
*res_hi = lp_build_uninterleave1(gallivm, bld->type.length * 2, tmp, 1);
return lp_build_uninterleave1(gallivm, bld->type.length * 2, tmp, 0);
res_lo = LLVMBuildTrunc(builder, tmp, narrow_type, "");
/* Since we truncate anyway, LShr and AShr are equivalent. */
tmp = LLVMBuildLShr(builder, tmp, shift, "");
*res_hi = LLVMBuildTrunc(builder, tmp, narrow_type, "");
return res_lo;
}