[Mesa-dev] [PATCH 15/17] radeonsi: move the guts of ARB_shader_group_vote emission to ac

[Connor Abbott]

From: Connor Abbott <cwabbo...@gmail.com>

Signed-off-by: Connor Abbott <cwabbo...@gmail.com>
---
 src/amd/common/ac_llvm_build.c           | 30 ++++++++++++++++++++++++++++++
 src/amd/common/ac_llvm_build.h           |  6 ++++++
 src/gallium/drivers/radeonsi/si_shader.c | 24 +++---------------------
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index efbeb65..795a62f 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -265,6 +265,36 @@ ac_build_ballot(struct ac_llvm_context *ctx,
 }
 
 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,
                                unsigned value_count,
diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index 8258b21..df5743f 100644
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -76,6 +76,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,
diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 0c6c318..4c32c18 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3579,13 +3579,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, "");
 }
@@ -3597,13 +3592,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, "");
 }
@@ -3615,16 +3605,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, "");
 }
-- 
2.9.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev