AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: move the guts of ARB_shader_group_vote emission to ac

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Connor Abbott
2017-06-06 16:40:26 -07:00
committed by Dave Airlie
parent bd73b89792
commit b8a51c8c4b
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/common/ac_llvm_build.c
+30
View File
@@ -269,6 +269,36 @@ ac_build_ballot(struct ac_llvm_context *ctx,
AC_FUNC_ATTR_CONVERGENT);
}
LLVMValueRef
ac_build_vote_all(struct ac_llvm_context *ctx, LLVMValueRef value)
{
LLVMValueRef active_set = ac_build_ballot(ctx, ctx->i32_1);
LLVMValueRef vote_set = ac_build_ballot(ctx, value);
return LLVMBuildICmp(ctx->builder, LLVMIntEQ, vote_set, active_set, "");
}
LLVMValueRef
ac_build_vote_any(struct ac_llvm_context *ctx, LLVMValueRef value)
{
LLVMValueRef vote_set = ac_build_ballot(ctx, value);
return LLVMBuildICmp(ctx->builder, LLVMIntNE, vote_set,
LLVMConstInt(ctx->i64, 0, 0), "");
}
LLVMValueRef
ac_build_vote_eq(struct ac_llvm_context *ctx, LLVMValueRef value)
{
LLVMValueRef active_set = ac_build_ballot(ctx, ctx->i32_1);
LLVMValueRef vote_set = ac_build_ballot(ctx, value);
LLVMValueRef all = LLVMBuildICmp(ctx->builder, LLVMIntEQ,
vote_set, active_set, "");
LLVMValueRef none = LLVMBuildICmp(ctx->builder, LLVMIntEQ,
vote_set,
LLVMConstInt(ctx->i64, 0, 0), "");
return LLVMBuildOr(ctx->builder, all, none, "");
}
LLVMValueRef
ac_build_gather_values_extended(struct ac_llvm_context *ctx,
LLVMValueRef *values,
src/amd/common/ac_llvm_build.h
+6
View File
@@ -80,6 +80,12 @@ void ac_build_optimization_barrier(struct ac_llvm_context *ctx,
LLVMValueRef ac_build_ballot(struct ac_llvm_context *ctx, LLVMValueRef value);
LLVMValueRef ac_build_vote_all(struct ac_llvm_context *ctx, LLVMValueRef value);
LLVMValueRef ac_build_vote_any(struct ac_llvm_context *ctx, LLVMValueRef value);
LLVMValueRef ac_build_vote_eq(struct ac_llvm_context *ctx, LLVMValueRef value);
LLVMValueRef
ac_build_gather_values_extended(struct ac_llvm_context *ctx,
LLVMValueRef *values,
src/gallium/drivers/radeonsi/si_shader.c
+3 -21
View File
@@ -3821,13 +3821,8 @@ static void vote_all_emit(
{
struct si_shader_context *ctx = si_shader_context(bld_base);
struct gallivm_state *gallivm = &ctx->gallivm;
LLVMValueRef active_set, vote_set;
LLVMValueRef tmp;
active_set = ac_build_ballot(&ctx->ac, ctx->i32_1);
vote_set = ac_build_ballot(&ctx->ac, emit_data->args[0]);
tmp = LLVMBuildICmp(gallivm->builder, LLVMIntEQ, vote_set, active_set, "");
LLVMValueRef tmp = ac_build_vote_all(&ctx->ac, emit_data->args[0]);
emit_data->output[emit_data->chan] =
LLVMBuildSExt(gallivm->builder, tmp, ctx->i32, "");
}
@@ -3839,13 +3834,8 @@ static void vote_any_emit(
{
struct si_shader_context *ctx = si_shader_context(bld_base);
struct gallivm_state *gallivm = &ctx->gallivm;
LLVMValueRef vote_set;
LLVMValueRef tmp;
vote_set = ac_build_ballot(&ctx->ac, emit_data->args[0]);
tmp = LLVMBuildICmp(gallivm->builder, LLVMIntNE,
vote_set, LLVMConstInt(ctx->i64, 0, 0), "");
LLVMValueRef tmp = ac_build_vote_any(&ctx->ac, emit_data->args[0]);
emit_data->output[emit_data->chan] =
LLVMBuildSExt(gallivm->builder, tmp, ctx->i32, "");
}
@@ -3857,16 +3847,8 @@ static void vote_eq_emit(
{
struct si_shader_context *ctx = si_shader_context(bld_base);
struct gallivm_state *gallivm = &ctx->gallivm;
LLVMValueRef active_set, vote_set;
LLVMValueRef all, none, tmp;
active_set = ac_build_ballot(&ctx->ac, ctx->i32_1);
vote_set = ac_build_ballot(&ctx->ac, emit_data->args[0]);
all = LLVMBuildICmp(gallivm->builder, LLVMIntEQ, vote_set, active_set, "");
none = LLVMBuildICmp(gallivm->builder, LLVMIntEQ,
vote_set, LLVMConstInt(ctx->i64, 0, 0), "");
tmp = LLVMBuildOr(gallivm->builder, all, none, "");
LLVMValueRef tmp = ac_build_vote_eq(&ctx->ac, emit_data->args[0]);
emit_data->output[emit_data->chan] =
LLVMBuildSExt(gallivm->builder, tmp, ctx->i32, "");
}