fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallivm: use LLVM opaque pointers in lp_bld_intr.c

Browse source 
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15893>
This commit is contained in:
Mihai Preda 2022-05-02 15:56:33 +03:00 • committed by Mihai Preda
parent 3143f871ac
commit 84ba15ac06
2 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/gallium/auxiliary/gallivm/lp_bld_intr.c
View file

@ -103,19 +103,13 @@ lp_format_intrinsic(char *name,
LLVMValueRef
lp_declare_intrinsic(LLVMModuleRef module,
const char *name,
LLVMTypeRef ret_type,
LLVMTypeRef *arg_types,
unsigned num_args)
lp_declare_intrinsic_with_type(LLVMModuleRef module,
const char *name,
LLVMTypeRef function_type)
{
LLVMTypeRef function_type;
LLVMValueRef function;
assert(!LLVMGetNamedFunction(module, name));
function_type = LLVMFunctionType(ret_type, arg_types, num_args, 0);
function = LLVMAddFunction(module, name, function_type);
LLVMValueRef function = LLVMAddFunction(module, name, function_type);
LLVMSetFunctionCallConv(function, LLVMCCallConv);
LLVMSetLinkage(function, LLVMExternalLinkage);
@ -126,6 +120,18 @@ lp_declare_intrinsic(LLVMModuleRef module,
}
LLVMValueRef
lp_declare_intrinsic(LLVMModuleRef module,
const char *name,
LLVMTypeRef ret_type,
LLVMTypeRef *arg_types,
unsigned num_args)
{
LLVMTypeRef function_type = LLVMFunctionType(ret_type, arg_types, num_args, 0);
return lp_declare_intrinsic_with_type(module, name, function_type);
}
#if LLVM_VERSION_MAJOR < 4
static LLVMAttribute lp_attr_to_llvm_attr(enum lp_func_attr attr)
{
@ -232,19 +238,21 @@ lp_build_intrinsic(LLVMBuilderRef builder,
bool set_callsite_attrs = LLVM_VERSION_MAJOR >= 4 &&
!(attr_mask & LP_FUNC_ATTR_LEGACY);
LLVMTypeRef arg_types[LP_MAX_FUNC_ARGS];
assert(num_args <= LP_MAX_FUNC_ARGS);
for(unsigned i = 0; i < num_args; ++i) {
assert(args[i]);
arg_types[i] = LLVMTypeOf(args[i]);
}
LLVMTypeRef function_type = LLVMFunctionType(ret_type, arg_types, num_args, 0);
function = LLVMGetNamedFunction(module, name);
if(!function) {
LLVMTypeRef arg_types[LP_MAX_FUNC_ARGS];
unsigned i;
assert(num_args <= LP_MAX_FUNC_ARGS);
for(i = 0; i < num_args; ++i) {
assert(args[i]);
arg_types[i] = LLVMTypeOf(args[i]);
}
function = lp_declare_intrinsic(module, name, ret_type, arg_types, num_args);
function = lp_declare_intrinsic_with_type(module, name, function_type);
/*
* If llvm removes an intrinsic we use, we'll hit this abort (rather
@ -265,7 +273,7 @@ lp_build_intrinsic(LLVMBuilderRef builder,
}
}
call = LLVMBuildCall(builder, function, args, num_args, "");
call = LLVMBuildCall2(builder, function_type, function, args, num_args, "");
if (set_callsite_attrs)
lp_add_func_attributes(call, attr_mask);
return call;

5
src/gallium/auxiliary/gallivm/lp_bld_intr.h
View file

@ -78,6 +78,11 @@ lp_declare_intrinsic(LLVMModuleRef module,
LLVMTypeRef *arg_types,
unsigned num_args);
LLVMValueRef
lp_declare_intrinsic_with_type(LLVMModuleRef module,
const char *name,
LLVMTypeRef function_type);
void
lp_add_function_attr(LLVMValueRef function_or_call,
int attr_idx, enum lp_func_attr attr);