From: Connor Abbott <cwabbo...@gmail.com>
Signed-off-by: Connor Abbott <cwabbo...@gmail.com>
---
src/amd/common/ac_llvm_build.c | 24 +++++++++++++++++++
src/amd/common/ac_llvm_build.h | 2 ++
src/gallium/drivers/radeonsi/si_shader.c | 41 +++++++-------------------------
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index c411880..99b9134 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -81,6 +81,30 @@ ac_llvm_context_init(struct ac_llvm_context *ctx,
LLVMContextRef context)
ctx->empty_md = LLVMMDNodeInContext(ctx->context, NULL, 0);
}
+unsigned
+ac_get_type_size(LLVMTypeRef type)
+{
+ LLVMTypeKind kind = LLVMGetTypeKind(type);
+
+ switch (kind) {
+ case LLVMIntegerTypeKind:
+ return LLVMGetIntTypeWidth(type) / 8;
+ case LLVMFloatTypeKind:
+ return 4;
+ case LLVMPointerTypeKind:
+ return 8;
+ case LLVMVectorTypeKind:
+ return LLVMGetVectorSize(type) *
+ ac_get_type_size(LLVMGetElementType(type));
+ case LLVMArrayTypeKind:
+ return LLVMGetArrayLength(type) *
+ ac_get_type_size(LLVMGetElementType(type));
+ default:
+ assert(0);
+ return 0;
+ }
+}
+
LLVMValueRef
ac_build_intrinsic(struct ac_llvm_context *ctx, const char *name,
LLVMTypeRef return_type, LLVMValueRef *params,
diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index bde0aa8..615f828 100644
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -59,6 +59,8 @@ struct ac_llvm_context {
void
ac_llvm_context_init(struct ac_llvm_context *ctx, LLVMContextRef context);
+unsigned ac_get_type_size(LLVMTypeRef type);
+
LLVMValueRef
ac_build_intrinsic(struct ac_llvm_context *ctx, const char *name,
LLVMTypeRef return_type, LLVMValueRef *params,
diff --git a/src/gallium/drivers/radeonsi/si_shader.c
b/src/gallium/drivers/radeonsi/si_shader.c
index ddfaa3b..a5720d4 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -72,8 +72,6 @@ static void si_llvm_emit_barrier(const struct
lp_build_tgsi_action *action,
static void si_dump_shader_key(unsigned processor, const struct si_shader
*shader,
FILE *f);
-static unsigned llvm_get_type_size(LLVMTypeRef type);
-
static void si_build_vs_prolog_function(struct si_shader_context *ctx,
union si_shader_part_key *key);
static void si_build_tcs_epilog_function(struct si_shader_context *ctx,
@@ -3980,29 +3978,6 @@ static void declare_streamout_params(struct
si_shader_context *ctx,
}
}
-static unsigned llvm_get_type_size(LLVMTypeRef type)
-{
- LLVMTypeKind kind = LLVMGetTypeKind(type);
-
- switch (kind) {
- case LLVMIntegerTypeKind:
- return LLVMGetIntTypeWidth(type) / 8;
- case LLVMFloatTypeKind:
- return 4;
- case LLVMPointerTypeKind:
- return 8;
- case LLVMVectorTypeKind:
- return LLVMGetVectorSize(type) *
- llvm_get_type_size(LLVMGetElementType(type));
- case LLVMArrayTypeKind:
- return LLVMGetArrayLength(type) *
- llvm_get_type_size(LLVMGetElementType(type));
- default:
- assert(0);
- return 0;
- }
-}
-
static void declare_lds_as_pointer(struct si_shader_context *ctx)
{
struct gallivm_state *gallivm = &ctx->gallivm;
@@ -4447,10 +4422,10 @@ static void create_function(struct si_shader_context
*ctx)
shader->info.num_input_vgprs = 0;
for (i = 0; i <= last_sgpr; ++i)
- shader->info.num_input_sgprs += llvm_get_type_size(params[i]) /
4;
+ shader->info.num_input_sgprs += ac_get_type_size(params[i]) / 4;
for (; i < num_params; ++i)
- shader->info.num_input_vgprs += llvm_get_type_size(params[i]) /
4;
+ shader->info.num_input_vgprs += ac_get_type_size(params[i]) / 4;
assert(shader->info.num_input_vgprs >= num_prolog_vgprs);
shader->info.num_input_vgprs -= num_prolog_vgprs;
@@ -5417,7 +5392,7 @@ static void si_count_scratch_private_memory(struct
si_shader_context *ctx)
LLVMTypeRef type = LLVMGetElementType(LLVMTypeOf(inst));
/* No idea why LLVM aligns allocas to 4 elements. */
unsigned alignment = LLVMGetAlignment(inst);
- unsigned dw_size = align(llvm_get_type_size(type) / 4,
alignment);
+ unsigned dw_size = align(ac_get_type_size(type) / 4,
alignment);
ctx->shader->config.private_mem_vgprs += dw_size;
}
bb = LLVMGetNextBasicBlock(bb);
@@ -5887,9 +5862,9 @@ static void si_build_wrapper_function(struct
si_shader_context *ctx,
if (ac_is_sgpr_param(param)) {
assert(num_vgprs == 0);
- num_sgprs += llvm_get_type_size(LLVMTypeOf(param)) / 4;
+ num_sgprs += ac_get_type_size(LLVMTypeOf(param)) / 4;
} else {
- num_vgprs += llvm_get_type_size(LLVMTypeOf(param)) / 4;
+ num_vgprs += ac_get_type_size(LLVMTypeOf(param)) / 4;
}
}
assert(num_vgprs + num_sgprs <= ARRAY_SIZE(param_types));
@@ -5904,7 +5879,7 @@ static void si_build_wrapper_function(struct
si_shader_context *ctx,
param_types[num_params] = LLVMTypeOf(param);
if (gprs < num_sgprs)
last_sgpr_param = num_params;
- size = llvm_get_type_size(param_types[num_params]) / 4;
+ size = ac_get_type_size(param_types[num_params]) / 4;
num_params++;
assert(ac_is_sgpr_param(param) == (gprs < num_sgprs));
@@ -5931,7 +5906,7 @@ static void si_build_wrapper_function(struct
si_shader_context *ctx,
LLVMValueRef param = LLVMGetParam(ctx->main_fn, i);
LLVMTypeRef param_type = LLVMTypeOf(param);
LLVMTypeRef out_type = i <= last_sgpr_param ? ctx->i32 :
ctx->f32;
- unsigned size = llvm_get_type_size(param_type) / 4;
+ unsigned size = ac_get_type_size(param_type) / 4;
if (size == 1) {
if (param_type != out_type)
@@ -6001,7 +5976,7 @@ static void si_build_wrapper_function(struct
si_shader_context *ctx,
param = LLVMGetParam(parts[part], param_idx);
param_type = LLVMTypeOf(param);
- param_size = llvm_get_type_size(param_type) / 4;
+ param_size = ac_get_type_size(param_type) / 4;
is_sgpr = ac_is_sgpr_param(param);
if (is_sgpr) {
--
2.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
