ac: fix 16-bit shifts
This fixes the following LLVM error when ckeckir is set: Type too small for ZExt Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl
This commit is contained in:
parent
2ac5c5c1b5
commit
20cac1f498
|
@ -671,22 +671,31 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
|
||||||
result = LLVMBuildXor(ctx->ac.builder, src[0], src[1], "");
|
result = LLVMBuildXor(ctx->ac.builder, src[0], src[1], "");
|
||||||
break;
|
break;
|
||||||
case nir_op_ishl:
|
case nir_op_ishl:
|
||||||
result = LLVMBuildShl(ctx->ac.builder, src[0],
|
if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
LLVMBuildZExt(ctx->ac.builder, src[1],
|
src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
|
||||||
LLVMTypeOf(src[0]), ""),
|
LLVMTypeOf(src[0]), "");
|
||||||
"");
|
else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
|
src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
|
||||||
|
LLVMTypeOf(src[0]), "");
|
||||||
|
result = LLVMBuildShl(ctx->ac.builder, src[0], src[1], "");
|
||||||
break;
|
break;
|
||||||
case nir_op_ishr:
|
case nir_op_ishr:
|
||||||
result = LLVMBuildAShr(ctx->ac.builder, src[0],
|
if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
LLVMBuildZExt(ctx->ac.builder, src[1],
|
src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
|
||||||
LLVMTypeOf(src[0]), ""),
|
LLVMTypeOf(src[0]), "");
|
||||||
"");
|
else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
|
src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
|
||||||
|
LLVMTypeOf(src[0]), "");
|
||||||
|
result = LLVMBuildAShr(ctx->ac.builder, src[0], src[1], "");
|
||||||
break;
|
break;
|
||||||
case nir_op_ushr:
|
case nir_op_ushr:
|
||||||
result = LLVMBuildLShr(ctx->ac.builder, src[0],
|
if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) < ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
LLVMBuildZExt(ctx->ac.builder, src[1],
|
src[1] = LLVMBuildZExt(ctx->ac.builder, src[1],
|
||||||
LLVMTypeOf(src[0]), ""),
|
LLVMTypeOf(src[0]), "");
|
||||||
"");
|
else if (ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[1])) > ac_get_elem_bits(&ctx->ac, LLVMTypeOf(src[0])))
|
||||||
|
src[1] = LLVMBuildTrunc(ctx->ac.builder, src[1],
|
||||||
|
LLVMTypeOf(src[0]), "");
|
||||||
|
result = LLVMBuildLShr(ctx->ac.builder, src[0], src[1], "");
|
||||||
break;
|
break;
|
||||||
case nir_op_ilt32:
|
case nir_op_ilt32:
|
||||||
result = emit_int_cmp(&ctx->ac, LLVMIntSLT, src[0], src[1]);
|
result = emit_int_cmp(&ctx->ac, LLVMIntSLT, src[0], src[1]);
|
||||||
|
|
Loading…
Reference in New Issue