OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac: move address space definitions to common code

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák
2018-01-01 21:03:29 +01:00
parent 0d62370bbb
commit e17eb8800f
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/amd/common/ac_llvm_build.h
View File

@@ -35,6 +35,7 @@ extern "C" {
#endif #endif
enum { enum {
AC_CONST_ADDR_SPACE = 2, /* CONST is the only address space that selects SMEM loads */
AC_LOCAL_ADDR_SPACE = 3, AC_LOCAL_ADDR_SPACE = 3,
}; };

9
src/amd/common/ac_nir_to_llvm.c
View File

@@ -43,9 +43,6 @@ enum radeon_llvm_calling_convention {
RADEON_LLVM_AMDGPU_HS = 93, RADEON_LLVM_AMDGPU_HS = 93,
}; };
#define CONST_ADDR_SPACE 2
#define LOCAL_ADDR_SPACE 3
#define RADEON_LLVM_MAX_INPUTS (VARYING_SLOT_VAR31 + 1) #define RADEON_LLVM_MAX_INPUTS (VARYING_SLOT_VAR31 + 1)
#define RADEON_LLVM_MAX_OUTPUTS (VARYING_SLOT_VAR31 + 1) #define RADEON_LLVM_MAX_OUTPUTS (VARYING_SLOT_VAR31 + 1)
@@ -361,7 +358,7 @@ create_llvm_function(LLVMContextRef ctx, LLVMModuleRef module,
static LLVMTypeRef const_array(LLVMTypeRef elem_type, int num_elements) static LLVMTypeRef const_array(LLVMTypeRef elem_type, int num_elements)
{ {
return LLVMPointerType(LLVMArrayType(elem_type, num_elements), return LLVMPointerType(LLVMArrayType(elem_type, num_elements),
CONST_ADDR_SPACE); AC_CONST_ADDR_SPACE);
} }
static int get_elem_bits(struct ac_llvm_context *ctx, LLVMTypeRef type) static int get_elem_bits(struct ac_llvm_context *ctx, LLVMTypeRef type)
@@ -1082,7 +1079,7 @@ static void create_function(struct nir_to_llvm_context *ctx,
&user_sgpr_idx, 2); &user_sgpr_idx, 2);
if (ctx->options->supports_spill) { if (ctx->options->supports_spill) {
ctx->ring_offsets = ac_build_intrinsic(&ctx->ac, "llvm.amdgcn.implicit.buffer.ptr", ctx->ring_offsets = ac_build_intrinsic(&ctx->ac, "llvm.amdgcn.implicit.buffer.ptr",
LLVMPointerType(ctx->ac.i8, CONST_ADDR_SPACE), LLVMPointerType(ctx->ac.i8, AC_CONST_ADDR_SPACE),
NULL, 0, AC_FUNC_ATTR_READNONE); NULL, 0, AC_FUNC_ATTR_READNONE);
ctx->ring_offsets = LLVMBuildBitCast(ctx->builder, ctx->ring_offsets, ctx->ring_offsets = LLVMBuildBitCast(ctx->builder, ctx->ring_offsets,
const_array(ctx->ac.v4i32, 16), ""); const_array(ctx->ac.v4i32, 16), "");
@@ -5762,7 +5759,7 @@ setup_shared(struct ac_nir_context *ctx,
LLVMAddGlobalInAddressSpace( LLVMAddGlobalInAddressSpace(
ctx->ac.module, glsl_to_llvm_type(ctx->nctx, variable->type), ctx->ac.module, glsl_to_llvm_type(ctx->nctx, variable->type),
variable->name ? variable->name : "", variable->name ? variable->name : "",
LOCAL_ADDR_SPACE); AC_LOCAL_ADDR_SPACE);
_mesa_hash_table_insert(ctx->vars, variable, shared); _mesa_hash_table_insert(ctx->vars, variable, shared);
} }
} }

11
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -99,11 +99,6 @@ static void si_build_ps_epilog_function(struct si_shader_context *ctx,
*/ */
#define PS_EPILOG_SAMPLEMASK_MIN_LOC 14 #define PS_EPILOG_SAMPLEMASK_MIN_LOC 14
enum {
CONST_ADDR_SPACE = 2,
LOCAL_ADDR_SPACE = 3,
};
static bool llvm_type_is_64bit(struct si_shader_context *ctx, static bool llvm_type_is_64bit(struct si_shader_context *ctx,
LLVMTypeRef type) LLVMTypeRef type)
{ {
@@ -2224,7 +2219,7 @@ void si_declare_compute_memory(struct si_shader_context *ctx,
{ {
struct si_shader_selector *sel = ctx->shader->selector; struct si_shader_selector *sel = ctx->shader->selector;
LLVMTypeRef i8p = LLVMPointerType(ctx->i8, LOCAL_ADDR_SPACE); LLVMTypeRef i8p = LLVMPointerType(ctx->i8, AC_LOCAL_ADDR_SPACE);
LLVMValueRef var; LLVMValueRef var;
assert(decl->Declaration.MemType == TGSI_MEMORY_TYPE_SHARED); assert(decl->Declaration.MemType == TGSI_MEMORY_TYPE_SHARED);
@@ -2234,7 +2229,7 @@ void si_declare_compute_memory(struct si_shader_context *ctx,
var = LLVMAddGlobalInAddressSpace(ctx->ac.module, var = LLVMAddGlobalInAddressSpace(ctx->ac.module,
LLVMArrayType(ctx->i8, sel->local_size), LLVMArrayType(ctx->i8, sel->local_size),
"compute_lds", "compute_lds",
LOCAL_ADDR_SPACE); AC_LOCAL_ADDR_SPACE);
LLVMSetAlignment(var, 4); LLVMSetAlignment(var, 4);
ctx->ac.lds = LLVMBuildBitCast(ctx->ac.builder, var, i8p, ""); ctx->ac.lds = LLVMBuildBitCast(ctx->ac.builder, var, i8p, "");
@@ -3953,7 +3948,7 @@ static void clock_emit(
LLVMTypeRef si_const_array(LLVMTypeRef elem_type, int num_elements) LLVMTypeRef si_const_array(LLVMTypeRef elem_type, int num_elements)
{ {
return LLVMPointerType(LLVMArrayType(elem_type, num_elements), return LLVMPointerType(LLVMArrayType(elem_type, num_elements),
CONST_ADDR_SPACE); AC_CONST_ADDR_SPACE);
} }
static void si_llvm_emit_ddxy( static void si_llvm_emit_ddxy(