From dcbd3d470cb0cf27c6aa42a8060a2ad5e42d7816 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 27 Sep 2017 12:53:41 +0200 Subject: [PATCH] radeonsi: use i32_0 and i32_1 more MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- .../drivers/radeonsi/si_shader_tgsi_alu.c | 17 ++++++++++------- .../drivers/radeonsi/si_shader_tgsi_setup.c | 7 +++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c index 3dcbb239e61..eeb6eb2b006 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c @@ -134,7 +134,7 @@ static void emit_ucmp(const struct lp_build_tgsi_action *action, LLVMValueRef arg0 = ac_to_integer(&ctx->ac, emit_data->args[0]); LLVMValueRef v = LLVMBuildICmp(builder, LLVMIntNE, arg0, - bld_base->uint_bld.zero, ""); + ctx->i32_0, ""); emit_data->output[emit_data->chan] = LLVMBuildSelect(builder, v, emit_data->args[1], emit_data->args[2], ""); @@ -360,6 +360,7 @@ static void emit_ssg(const struct lp_build_tgsi_action *action, struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) { + struct si_shader_context *ctx = si_shader_context(bld_base); LLVMBuilderRef builder = bld_base->base.gallivm->builder; LLVMValueRef cmp, val; @@ -370,9 +371,9 @@ static void emit_ssg(const struct lp_build_tgsi_action *action, cmp = LLVMBuildICmp(builder, LLVMIntSGE, val, bld_base->int64_bld.zero, ""); val = LLVMBuildSelect(builder, cmp, val, LLVMConstInt(bld_base->int64_bld.elem_type, -1, true), ""); } else if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_ISSG) { - cmp = LLVMBuildICmp(builder, LLVMIntSGT, emit_data->args[0], bld_base->int_bld.zero, ""); - val = LLVMBuildSelect(builder, cmp, bld_base->int_bld.one, emit_data->args[0], ""); - cmp = LLVMBuildICmp(builder, LLVMIntSGE, val, bld_base->int_bld.zero, ""); + cmp = LLVMBuildICmp(builder, LLVMIntSGT, emit_data->args[0], ctx->i32_0, ""); + val = LLVMBuildSelect(builder, cmp, ctx->i32_1, emit_data->args[0], ""); + cmp = LLVMBuildICmp(builder, LLVMIntSGE, val, ctx->i32_0, ""); val = LLVMBuildSelect(builder, cmp, val, LLVMConstInt(bld_base->int_bld.elem_type, -1, true), ""); } else if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_DSSG) { cmp = LLVMBuildFCmp(builder, LLVMRealOGT, emit_data->args[0], bld_base->dbl_bld.zero, ""); @@ -482,6 +483,7 @@ static void emit_bfi(const struct lp_build_tgsi_action *action, struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) { + struct si_shader_context *ctx = si_shader_context(bld_base); struct gallivm_state *gallivm = bld_base->base.gallivm; LLVMBuilderRef builder = gallivm->builder; LLVMValueRef bfi_args[3]; @@ -492,9 +494,9 @@ static void emit_bfi(const struct lp_build_tgsi_action *action, bfi_args[0] = LLVMBuildShl(builder, LLVMBuildSub(builder, LLVMBuildShl(builder, - bld_base->int_bld.one, + ctx->i32_1, emit_data->args[3], ""), - bld_base->int_bld.one, ""), + ctx->i32_1, ""), emit_data->args[2], ""); bfi_args[1] = LLVMBuildShl(builder, emit_data->args[1], @@ -548,6 +550,7 @@ static void emit_lsb(const struct lp_build_tgsi_action *action, struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) { + struct si_shader_context *ctx = si_shader_context(bld_base); struct gallivm_state *gallivm = bld_base->base.gallivm; LLVMBuilderRef builder = gallivm->builder; LLVMValueRef args[2] = { @@ -573,7 +576,7 @@ static void emit_lsb(const struct lp_build_tgsi_action *action, emit_data->output[emit_data->chan] = LLVMBuildSelect(builder, LLVMBuildICmp(builder, LLVMIntEQ, args[0], - bld_base->uint_bld.zero, ""), + ctx->i32_0, ""), lp_build_const_int32(gallivm, -1), lsb, ""); } diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c index 5b20ff3026c..aee8cddd27b 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c @@ -415,11 +415,11 @@ si_llvm_emit_fetch_64bit(struct lp_build_tgsi_context *bld_base, result = LLVMBuildInsertElement(builder, result, ac_to_integer(&ctx->ac, ptr), - bld_base->int_bld.zero, ""); + ctx->i32_0, ""); result = LLVMBuildInsertElement(builder, result, ac_to_integer(&ctx->ac, ptr2), - bld_base->int_bld.one, ""); + ctx->i32_1, ""); return bitcast(bld_base, type, result); } @@ -1131,8 +1131,7 @@ static void uif_emit(const struct lp_build_tgsi_action *action, LLVMValueRef cond; cond = LLVMBuildICmp(gallivm->builder, LLVMIntNE, - ac_to_integer(&ctx->ac, emit_data->args[0]), - bld_base->int_bld.zero, ""); + ac_to_integer(&ctx->ac, emit_data->args[0]), ctx->i32_0, ""); if_cond_emit(action, bld_base, emit_data, cond); } -- 2.30.2