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

ac: fold LLVMContext creation into ac_llvm_context_init

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Marek Olšák
2018-07-04 01:37:30 -04:00
parent f5cb4194c9
commit 4695984dbc
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/common/ac_llvm_build.c
View File

@@ -57,15 +57,15 @@ struct ac_llvm_flow {
* The caller is responsible for initializing ctx::module and ctx::builder. * The caller is responsible for initializing ctx::module and ctx::builder.
*/ */
void void
ac_llvm_context_init(struct ac_llvm_context *ctx, LLVMContextRef context, ac_llvm_context_init(struct ac_llvm_context *ctx,
enum chip_class chip_class, enum radeon_family family) enum chip_class chip_class, enum radeon_family family)
{ {
LLVMValueRef args[1]; LLVMValueRef args[1];
ctx->context = LLVMContextCreate();
ctx->chip_class = chip_class; ctx->chip_class = chip_class;
ctx->family = family; ctx->family = family;
ctx->context = context;
ctx->module = NULL; ctx->module = NULL;
ctx->builder = NULL; ctx->builder = NULL;

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

@@ -97,7 +97,7 @@ struct ac_llvm_context {
}; };
void void
ac_llvm_context_init(struct ac_llvm_context *ctx, LLVMContextRef context, ac_llvm_context_init(struct ac_llvm_context *ctx,
enum chip_class chip_class, enum radeon_family family); enum chip_class chip_class, enum radeon_family family);
void void

10
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -3137,10 +3137,9 @@ LLVMModuleRef ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm,
unsigned i; unsigned i;
ctx.options = options; ctx.options = options;
ctx.shader_info = shader_info; ctx.shader_info = shader_info;
ctx.context = LLVMContextCreate();
ac_llvm_context_init(&ctx.ac, ctx.context, options->chip_class, ac_llvm_context_init(&ctx.ac, options->chip_class, options->family);
options->family); ctx.context = ctx.ac.context;
ctx.ac.module = ac_create_module(ac_llvm->tm, ctx.context); ctx.ac.module = ac_create_module(ac_llvm->tm, ctx.context);
enum ac_float_mode float_mode = enum ac_float_mode float_mode =
@@ -3576,12 +3575,11 @@ radv_compile_gs_copy_shader(struct ac_llvm_compiler *ac_llvm,
const struct radv_nir_compiler_options *options) const struct radv_nir_compiler_options *options)
{ {
struct radv_shader_context ctx = {0}; struct radv_shader_context ctx = {0};
ctx.context = LLVMContextCreate();
ctx.options = options; ctx.options = options;
ctx.shader_info = shader_info; ctx.shader_info = shader_info;
ac_llvm_context_init(&ctx.ac, ctx.context, options->chip_class, ac_llvm_context_init(&ctx.ac, options->chip_class, options->family);
options->family); ctx.context = ctx.ac.context;
ctx.ac.module = ac_create_module(ac_llvm->tm, ctx.context); ctx.ac.module = ac_create_module(ac_llvm->tm, ctx.context);
ctx.is_gs_copy_shader = true; ctx.is_gs_copy_shader = true;

5
src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
View File

@@ -956,10 +956,7 @@ void si_llvm_context_init(struct si_shader_context *ctx,
ctx->screen = sscreen; ctx->screen = sscreen;
ctx->compiler = compiler; ctx->compiler = compiler;
ctx->ac.context = LLVMContextCreate(); ac_llvm_context_init(&ctx->ac, sscreen->info.chip_class, sscreen->info.family);
ac_llvm_context_init(&ctx->ac, ctx->ac.context,
sscreen->info.chip_class, sscreen->info.family);
ctx->ac.module = ac_create_module(compiler->tm, ctx->ac.context); ctx->ac.module = ac_create_module(compiler->tm, ctx->ac.context);
enum ac_float_mode float_mode = enum ac_float_mode float_mode =