From 653ac0b389eedb7f196d042c5889329669c3b6ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 24 Feb 2017 16:38:25 +0100 Subject: [PATCH] radeonsi: replace SI.packf16 with amdgcn.cvt.pkrtz --- src/amd/common/ac_llvm_build.c | 18 ++++++++++++++++++ src/amd/common/ac_llvm_build.h | 2 ++ src/gallium/drivers/radeonsi/si_shader.c | 6 +----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c index 187c2cb..42965b6 100644 --- a/src/amd/common/ac_llvm_build.c +++ b/src/amd/common/ac_llvm_build.c @@ -1080,3 +1080,21 @@ LLVMValueRef ac_emit_image_opcode(struct ac_llvm_context *ctx, AC_FUNC_ATTR_READNONE | AC_FUNC_ATTR_LEGACY); } + +LLVMValueRef ac_emit_cvt_pkrtz_f16(struct ac_llvm_context *ctx, + LLVMValueRef args[2]) +{ + if (HAVE_LLVM >= 0x0500) { + LLVMTypeRef v2f16 = + LLVMVectorType(LLVMHalfTypeInContext(ctx->context), 2); + LLVMValueRef res = + ac_emit_llvm_intrinsic(ctx, "llvm.amdgcn.cvt.pkrtz", + v2f16, args, 2, + AC_FUNC_ATTR_READNONE); + return LLVMBuildBitCast(ctx->builder, res, ctx->i32, ""); + } + + return ac_emit_llvm_intrinsic(ctx, "llvm.SI.packf16", ctx->i32, args, 2, + AC_FUNC_ATTR_READNONE | + AC_FUNC_ATTR_LEGACY); +} diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h index f57acc2..e6bb90f 100644 --- a/src/amd/common/ac_llvm_build.h +++ b/src/amd/common/ac_llvm_build.h @@ -233,6 +233,8 @@ struct ac_image_args { LLVMValueRef ac_emit_image_opcode(struct ac_llvm_context *ctx, struct ac_image_args *a); +LLVMValueRef ac_emit_cvt_pkrtz_f16(struct ac_llvm_context *ctx, + LLVMValueRef args[2]); #ifdef __cplusplus } diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 5dc53fc..efb39bf 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1822,11 +1822,7 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base, }; LLVMValueRef packed; - packed = lp_build_intrinsic(base->gallivm->builder, - "llvm.SI.packf16", - ctx->i32, pack_args, 2, - LP_FUNC_ATTR_READNONE | - LP_FUNC_ATTR_LEGACY); + packed = ac_emit_cvt_pkrtz_f16(&ctx->ac, pack_args); args->out[chan] = LLVMBuildBitCast(base->gallivm->builder, packed, ctx->f32, ""); -- 2.7.4