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

gallivm: pick integer builders for alu instructions.

Browse source 
This allows these to be used with non 32-bit types.

Acked-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Dave Airlie 2019-12-12 15:02:14 +10:00
parent df3e0fe9d8
commit 3adf74f2ef
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/gallium/auxiliary/gallivm/lp_bld_nir.c
View file

@ -578,7 +578,7 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base,
result = LLVMBuildSExt(builder, src[0], bld_base->int64_bld.vec_type, ""); result = LLVMBuildSExt(builder, src[0], bld_base->int64_bld.vec_type, "");
break; break;
case nir_op_iabs: case nir_op_iabs:
result = lp_build_abs(&bld_base->int_bld, src[0]); result = lp_build_abs(get_int_bld(bld_base, false, src_bit_size[0]), src[0]);
break; break;
case nir_op_iadd: case nir_op_iadd:
result = lp_build_add(get_int_bld(bld_base, false, src_bit_size[0]), result = lp_build_add(get_int_bld(bld_base, false, src_bit_size[0]),
@ -601,13 +601,14 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base,
result = icmp32(bld_base, PIPE_FUNC_LESS, false, src_bit_size[0], src); result = icmp32(bld_base, PIPE_FUNC_LESS, false, src_bit_size[0], src);
break; break;
case nir_op_imax: case nir_op_imax:
result = lp_build_max(&bld_base->int_bld, src[0], src[1]); result = lp_build_max(get_int_bld(bld_base, false, src_bit_size[0]), src[0], src[1]);
break; break;
case nir_op_imin: case nir_op_imin:
result = lp_build_min(&bld_base->int_bld, src[0], src[1]); result = lp_build_min(get_int_bld(bld_base, false, src_bit_size[0]), src[0], src[1]);
break; break;
case nir_op_imul: case nir_op_imul:
result = lp_build_mul(&bld_base->int_bld, case nir_op_imul24:
result = lp_build_mul(get_int_bld(bld_base, false, src_bit_size[0]),
src[0], src[1]); src[0], src[1]);
break; break;
case nir_op_imul_high: { case nir_op_imul_high: {
@ -629,17 +630,39 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base,
result = lp_build_or(get_int_bld(bld_base, false, src_bit_size[0]), result = lp_build_or(get_int_bld(bld_base, false, src_bit_size[0]),
src[0], src[1]); src[0], src[1]);
break; break;
case nir_op_ishl: case nir_op_irem:
src[1] = lp_build_and(&bld_base->uint_bld, src[1], lp_build_const_int_vec(gallivm, bld_base->uint_bld.type, (src_bit_size[0] - 1))); result = lp_build_mod(get_int_bld(bld_base, false, src_bit_size[0]),
result = lp_build_shl(&bld_base->int_bld, src[0], src[1]); src[0], src[1]);
break; break;
case nir_op_ishr: case nir_op_ishl: {
src[1] = lp_build_and(&bld_base->uint_bld, src[1], lp_build_const_int_vec(gallivm, bld_base->uint_bld.type, (src_bit_size[0] - 1))); struct lp_build_context *uint_bld = get_int_bld(bld_base, true, src_bit_size[0]);
result = lp_build_shr(&bld_base->int_bld, src[0], src[1]); struct lp_build_context *int_bld = get_int_bld(bld_base, false, src_bit_size[0]);
if (src_bit_size[0] == 64)
src[1] = LLVMBuildZExt(builder, src[1], uint_bld->vec_type, "");
if (src_bit_size[0] < 32)
src[1] = LLVMBuildTrunc(builder, src[1], uint_bld->vec_type, "");
src[1] = lp_build_and(uint_bld, src[1], lp_build_const_int_vec(gallivm, uint_bld->type, (src_bit_size[0] - 1)));
result = lp_build_shl(int_bld, src[0], src[1]);
break; break;
}
case nir_op_ishr: {
struct lp_build_context *uint_bld = get_int_bld(bld_base, true, src_bit_size[0]);
struct lp_build_context *int_bld = get_int_bld(bld_base, false, src_bit_size[0]);
if (src_bit_size[0] == 64)
src[1] = LLVMBuildZExt(builder, src[1], uint_bld->vec_type, "");
if (src_bit_size[0] < 32)
src[1] = LLVMBuildTrunc(builder, src[1], uint_bld->vec_type, "");
src[1] = lp_build_and(uint_bld, src[1], lp_build_const_int_vec(gallivm, uint_bld->type, (src_bit_size[0] - 1)));
result = lp_build_shr(int_bld, src[0], src[1]);
break;
}
case nir_op_isign: case nir_op_isign:
result = lp_build_sgn(&bld_base->int_bld, src[0]); result = lp_build_sgn(get_int_bld(bld_base, false, src_bit_size[0]), src[0]);
break; break;
case nir_op_isub:
result = lp_build_sub(get_int_bld(bld_base, false, src_bit_size[0]),
src[0], src[1]);
case nir_op_ixor: case nir_op_ixor:
result = lp_build_xor(get_int_bld(bld_base, false, src_bit_size[0]), result = lp_build_xor(get_int_bld(bld_base, false, src_bit_size[0]),
src[0], src[1]); src[0], src[1]);
@ -687,13 +710,13 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base,
result = icmp32(bld_base, PIPE_FUNC_LESS, true, src_bit_size[0], src); result = icmp32(bld_base, PIPE_FUNC_LESS, true, src_bit_size[0], src);
break; break;
case nir_op_umax: case nir_op_umax:
result = lp_build_max(&bld_base->uint_bld, src[0], src[1]); result = lp_build_max(get_int_bld(bld_base, true, src_bit_size[0]), src[0], src[1]);
break; break;
case nir_op_umin: case nir_op_umin:
result = lp_build_min(&bld_base->uint_bld, src[0], src[1]); result = lp_build_min(get_int_bld(bld_base, true, src_bit_size[0]), src[0], src[1]);
break; break;
case nir_op_umod: case nir_op_umod:
result = lp_build_mod(&bld_base->uint_bld, src[0], src[1]); result = lp_build_mod(get_int_bld(bld_base, true, src_bit_size[0]), src[0], src[1]);
break; break;
case nir_op_umul_high: { case nir_op_umul_high: {
LLVMValueRef hi_bits; LLVMValueRef hi_bits;
@ -701,10 +724,16 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base,
result = hi_bits; result = hi_bits;
break; break;
} }
case nir_op_ushr: case nir_op_ushr: {
src[1] = lp_build_and(&bld_base->uint_bld, src[1], lp_build_const_int_vec(gallivm, bld_base->uint_bld.type, (src_bit_size[0] - 1))); struct lp_build_context *uint_bld = get_int_bld(bld_base, true, src_bit_size[0]);
result = lp_build_shr(&bld_base->uint_bld, src[0], src[1]); if (src_bit_size[0] == 64)
src[1] = LLVMBuildZExt(builder, src[1], uint_bld->vec_type, "");
if (src_bit_size[0] < 32)
src[1] = LLVMBuildTrunc(builder, src[1], uint_bld->vec_type, "");
src[1] = lp_build_and(uint_bld, src[1], lp_build_const_int_vec(gallivm, uint_bld->type, (src_bit_size[0] - 1)));
result = lp_build_shr(uint_bld, src[0], src[1]);
break; break;
}
default: default:
assert(0); assert(0);
break; break;