aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1022 from aguskov/master

Browse Source 
Another version of multitarget return types fix
This commit is contained in:
Dmitry Babokin
2015-04-22 18:14:39 +03:00
parent 0b52022c13 0fd170f47a
commit a0cbd7e33a
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module.cpp
View File

@@ -2833,11 +2833,9 @@ lCreateDispatchFunction(llvm::Module *module, llvm::Function *setISAFunc,
for (int i = 0; i < Target::NUM_ISAS; ++i) { for (int i = 0; i < Target::NUM_ISAS; ++i) {
if (funcs.func[i] == NULL) { if (funcs.func[i] == NULL) {
targetFuncs[i] = NULL;
ftypes[i] = NULL; ftypes[i] = NULL;
continue; continue;
} }
// Grab the type of the function as well. Note that the various // Grab the type of the function as well. Note that the various
// functions will have different types if they have arguments that // functions will have different types if they have arguments that
// are pointers to structs, due to the fact that we mangle LLVM // are pointers to structs, due to the fact that we mangle LLVM
@@ -2852,16 +2850,27 @@ lCreateDispatchFunction(llvm::Module *module, llvm::Function *setISAFunc,
// by i8 *'s. // by i8 *'s.
// if (ftype == NULL) // if (ftype == NULL)
ftypes[i] = funcs.func[i]->getFunctionType(); ftypes[i] = funcs.func[i]->getFunctionType();
targetFuncs[i] =
llvm::Function::Create(ftypes[i], llvm::GlobalValue::ExternalLinkage,
funcs.func[i]->getName(), module);
} }
// New helper function checks to see if we need to rewrite the // New helper function checks to see if we need to rewrite the
// type for the dispatch function in case of pointers to varyings // type for the dispatch function in case of pointers to varyings
llvm::FunctionType *ftype = lGetVaryingDispatchType(funcs); llvm::FunctionType *ftype = lGetVaryingDispatchType(funcs);
// Now we insert type-punned declarations for dispatched functions.
// This is needed when compiling modules for a set of architectures
// with different vector lengths. Due to restrictions, the return
// type is the same across all architectures, however in different
// modules it may have dissimilar names. The loop below works this
// around.
for (int i = 0; i < Target::NUM_ISAS; ++i) {
if (funcs.func[i])
targetFuncs[i] =
llvm::Function::Create(ftype, llvm::GlobalValue::ExternalLinkage,
funcs.func[i]->getName(), module);
else
targetFuncs[i] = NULL;
}
bool voidReturn = ftype->getReturnType()->isVoidTy(); bool voidReturn = ftype->getReturnType()->isVoidTy();
// Now we can emit the definition of the dispatch function.. // Now we can emit the definition of the dispatch function..
@@ -2919,7 +2928,6 @@ lCreateDispatchFunction(llvm::Module *module, llvm::Function *setISAFunc,
"dpatch_arg_bitcast", callBBlock); "dpatch_arg_bitcast", callBBlock);
args.push_back(argCast); args.push_back(argCast);
} }
} }
if (voidReturn) { if (voidReturn) {
llvm::CallInst::Create(targetFuncs[i], args, "", callBBlock); llvm::CallInst::Create(targetFuncs[i], args, "", callBBlock);