fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 17:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/llvm: add better code for isign

Browse source 
There are 2 improvements:
- select v_med3_i32
- support vectors

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6284>
This commit is contained in:
Marek Olšák 2020-09-03 05:51:17 -04:00 • committed by Marge Bot
parent cecb6d1fbc
commit ca74603b4f
3 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/amd/llvm/ac_llvm_build.c
View file

@ -2751,19 +2751,29 @@ LLVMValueRef ac_build_fract(struct ac_llvm_context *ctx, LLVMValueRef src0,
AC_FUNC_ATTR_READNONE); AC_FUNC_ATTR_READNONE);
} }
LLVMValueRef ac_build_isign(struct ac_llvm_context *ctx, LLVMValueRef src0, static LLVMValueRef ac_const_uint_vec(struct ac_llvm_context *ctx, LLVMTypeRef type, uint64_t value)
unsigned bitsize)
{ {
LLVMTypeRef type = LLVMIntTypeInContext(ctx->context, bitsize);
LLVMValueRef zero = LLVMConstInt(type, 0, false);
LLVMValueRef one = LLVMConstInt(type, 1, false);
LLVMValueRef cmp, val; if (LLVMGetTypeKind(type) == LLVMVectorTypeKind) {
cmp = LLVMBuildICmp(ctx->builder, LLVMIntSGT, src0, zero, ""); LLVMValueRef scalar = LLVMConstInt(LLVMGetElementType(type), value, 0);
val = LLVMBuildSelect(ctx->builder, cmp, one, src0, ""); unsigned vec_size = LLVMGetVectorSize(type);
cmp = LLVMBuildICmp(ctx->builder, LLVMIntSGE, val, zero, ""); LLVMValueRef *scalars = alloca(vec_size * sizeof(LLVMValueRef*));
val = LLVMBuildSelect(ctx->builder, cmp, val, LLVMConstInt(type, -1, true), "");
return val; for (unsigned i = 0; i < vec_size; i++)
scalars[i] = scalar;
return LLVMConstVector(scalars, vec_size);
}
return LLVMConstInt(type, value, 0);
}
LLVMValueRef ac_build_isign(struct ac_llvm_context *ctx, LLVMValueRef src0)
{
LLVMTypeRef type = LLVMTypeOf(src0);
LLVMValueRef val;
/* v_med3 is selected only when max is first. (LLVM bug?) */
val = ac_build_imax(ctx, src0, ac_const_uint_vec(ctx, type, -1));
return ac_build_imin(ctx, val, ac_const_uint_vec(ctx, type, 1));
} }
LLVMValueRef ac_build_fsign(struct ac_llvm_context *ctx, LLVMValueRef src0, LLVMValueRef ac_build_fsign(struct ac_llvm_context *ctx, LLVMValueRef src0,

5
src/amd/llvm/ac_llvm_build.h
View file

@ -597,10 +597,7 @@ void ac_build_waitcnt(struct ac_llvm_context *ctx, unsigned wait_flags);
LLVMValueRef ac_build_fract(struct ac_llvm_context *ctx, LLVMValueRef src0, LLVMValueRef ac_build_fract(struct ac_llvm_context *ctx, LLVMValueRef src0,
unsigned bitsize); unsigned bitsize);
LLVMValueRef ac_build_isign(struct ac_llvm_context *ctx, LLVMValueRef src0);
LLVMValueRef ac_build_isign(struct ac_llvm_context *ctx, LLVMValueRef src0,
unsigned bitsize);
LLVMValueRef ac_build_fsign(struct ac_llvm_context *ctx, LLVMValueRef src0, LLVMValueRef ac_build_fsign(struct ac_llvm_context *ctx, LLVMValueRef src0,
unsigned bitsize); unsigned bitsize);

3
src/amd/llvm/ac_nir_to_llvm.c
View file

@ -822,8 +822,7 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
result = ac_build_umin(&ctx->ac, src[0], src[1]); result = ac_build_umin(&ctx->ac, src[0], src[1]);
break; break;
case nir_op_isign: case nir_op_isign:
result = ac_build_isign(&ctx->ac, src[0], result = ac_build_isign(&ctx->ac, src[0]);
instr->dest.dest.ssa.bit_size);
break; break;
case nir_op_fsign: case nir_op_fsign:
src[0] = ac_to_float(&ctx->ac, src[0]); src[0] = ac_to_float(&ctx->ac, src[0]);