diff options
author | Marek Olšák <[email protected]> | 2017-02-24 22:44:18 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2017-03-03 15:29:30 +0100 |
commit | 9c09592086d8b8801d663756efcc997bc741868d (patch) | |
tree | 4755dc2a0a53472c846a385eb77d2b22f0210d04 /src/gallium/drivers | |
parent | e729dc7c46bc903f40c933d40ce507d6cd23bf83 (diff) |
radeonsi: move kill intrinsic building into amd/common
just a cleanup
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 12 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 14 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 48b4a94b3c9..4fa46d4ff17 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1940,11 +1940,9 @@ static void si_alpha_test(struct lp_build_tgsi_context *bld_base, lp_build_const_float(gallivm, 1.0f), lp_build_const_float(gallivm, -1.0f)); - lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill", - ctx->voidt, &arg, 1, LP_FUNC_ATTR_LEGACY); + ac_emit_kill(&ctx->ac, arg); } else { - lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kilp", - ctx->voidt, NULL, 0, LP_FUNC_ATTR_LEGACY); + ac_emit_kill(&ctx->ac, NULL); } } @@ -5033,8 +5031,7 @@ static void si_llvm_emit_vertex( lp_build_const_float(gallivm, 1.0f), lp_build_const_float(gallivm, -1.0f)); - lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill", - ctx->voidt, &kill, 1, LP_FUNC_ATTR_LEGACY); + ac_emit_kill(&ctx->ac, kill); } else { lp_build_if(&if_state, gallivm, can_emit); } @@ -5656,8 +5653,7 @@ static void si_llvm_emit_polygon_stipple(struct si_shader_context *ctx, /* The intrinsic kills the thread if arg < 0. */ bit = LLVMBuildSelect(builder, bit, LLVMConstReal(ctx->f32, 0), LLVMConstReal(ctx->f32, -1), ""); - lp_build_intrinsic(builder, "llvm.AMDGPU.kill", ctx->voidt, &bit, 1, - LP_FUNC_ATTR_LEGACY); + ac_emit_kill(&ctx->ac, bit); } void si_shader_binary_read_config(struct ac_shader_binary *binary, diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c index ee59fed607e..d80848ef843 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c @@ -26,6 +26,7 @@ #include "gallivm/lp_bld_intr.h" #include "gallivm/lp_bld_gather.h" #include "tgsi/tgsi_parse.h" +#include "amd/common/ac_llvm_build.h" static void kill_if_fetch_args(struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) @@ -58,9 +59,12 @@ static void kil_emit(const struct lp_build_tgsi_action *action, struct lp_build_tgsi_context *bld_base, struct lp_build_emit_data *emit_data) { - lp_build_intrinsic(bld_base->base.gallivm->builder, - action->intr_name, emit_data->dst_type, - &emit_data->args[0], 1, LP_FUNC_ATTR_LEGACY); + struct si_shader_context *ctx = si_shader_context(bld_base); + + if (emit_data->inst->Instruction.Opcode == TGSI_OPCODE_KILL_IF) + ac_emit_kill(&ctx->ac, emit_data->args[0]); + else + ac_emit_kill(&ctx->ac, NULL); } static void emit_icmp(const struct lp_build_tgsi_action *action, @@ -779,9 +783,7 @@ void si_shader_context_init_alu(struct lp_build_tgsi_context *bld_base) bld_base->op_actions[TGSI_OPCODE_I2F].emit = emit_i2f; bld_base->op_actions[TGSI_OPCODE_KILL_IF].fetch_args = kill_if_fetch_args; bld_base->op_actions[TGSI_OPCODE_KILL_IF].emit = kil_emit; - bld_base->op_actions[TGSI_OPCODE_KILL_IF].intr_name = "llvm.AMDGPU.kill"; - bld_base->op_actions[TGSI_OPCODE_KILL].emit = lp_build_tgsi_intrinsic; - bld_base->op_actions[TGSI_OPCODE_KILL].intr_name = "llvm.AMDGPU.kilp"; + bld_base->op_actions[TGSI_OPCODE_KILL].emit = kil_emit; bld_base->op_actions[TGSI_OPCODE_LSB].emit = emit_lsb; bld_base->op_actions[TGSI_OPCODE_LG2].emit = build_tgsi_intrinsic_nomem; bld_base->op_actions[TGSI_OPCODE_LG2].intr_name = "llvm.log2.f32"; |