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

raplce @llvm.trap into call void asm"trap;",""()

Browse Source
This commit is contained in:
Evghenii
2014-03-19 16:35:14 +01:00
parent 599624d962
commit 4c837d94a9
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
opt.cpp
View File

@@ -55,6 +55,7 @@
#include <llvm/Function.h> #include <llvm/Function.h>
#include <llvm/BasicBlock.h> #include <llvm/BasicBlock.h>
#include <llvm/Constants.h> #include <llvm/Constants.h>
#include <llvm/InlineAsm.h>
#else #else
#include <llvm/IR/Module.h> #include <llvm/IR/Module.h>
#include <llvm/IR/Instructions.h> #include <llvm/IR/Instructions.h>
@@ -62,6 +63,7 @@
#include <llvm/IR/Function.h> #include <llvm/IR/Function.h>
#include <llvm/IR/BasicBlock.h> #include <llvm/IR/BasicBlock.h>
#include <llvm/IR/Constants.h> #include <llvm/IR/Constants.h>
#include <llvm/IR/InlineAsm.h>
#endif #endif
#if defined (LLVM_3_4) || defined(LLVM_3_5) #if defined (LLVM_3_4) || defined(LLVM_3_5)
#include <llvm/Transforms/Instrumentation.h> #include <llvm/Transforms/Instrumentation.h>
@@ -520,8 +522,6 @@ Optimize(llvm::Module *module, int optLevel) {
llvm::initializeInstrumentation(*registry); llvm::initializeInstrumentation(*registry);
llvm::initializeTarget(*registry); llvm::initializeTarget(*registry);
if (g->target->getISA() == Target::NVPTX)
optPM.add(CreatePromoteLocalToPrivatePass());
optPM.add(llvm::createGlobalDCEPass(), 185); optPM.add(llvm::createGlobalDCEPass(), 185);
// Setup to use LLVM default AliasAnalysis // Setup to use LLVM default AliasAnalysis
@@ -698,6 +698,7 @@ Optimize(llvm::Module *module, int optLevel) {
if (g->target->getISA() == Target::NVPTX) if (g->target->getISA() == Target::NVPTX)
{ {
optPM.add(CreatePromoteLocalToPrivatePass());
optPM.add(llvm::createGlobalDCEPass()); optPM.add(llvm::createGlobalDCEPass());
optPM.add(llvm::createTypeBasedAliasAnalysisPass()); optPM.add(llvm::createTypeBasedAliasAnalysisPass());
@@ -5433,6 +5434,34 @@ PromoteLocalToPrivatePass::runOnBasicBlock(llvm::BasicBlock &BB)
bool modifiedAny = false; bool modifiedAny = false;
#if 1
restart:
for (llvm::BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I)
{
llvm::Instruction *inst = &*I;
if (llvm::CallInst *ci = llvm::dyn_cast<llvm::CallInst>(inst))
{
llvm::Function *func = ci->getCalledFunction();
if (func && func->getName() == "llvm.trap")
{
std::vector<llvm::Type*> funcTyArgs;
llvm::FunctionType *funcTy = llvm::FunctionType::get(
/*Result=*/llvm::Type::getVoidTy(*g->ctx),
/*Params=*/funcTyArgs,
/*isVarArg=*/false);
llvm::InlineAsm *trap_ptx = llvm::InlineAsm::get(funcTy, "trap;", "", false);
assert(trap_ptx != NULL);
llvm::Instruction *trap_call = llvm::CallInst::Create(trap_ptx);
assert(trap_call != NULL);
llvm::ReplaceInstWithInst(ci, trap_call);
modifiedAny = true;
goto restart;
}
}
}
#endif
#if 0
llvm::Function *cvtFunc = m->module->getFunction("__cvt_loc2gen_var"); llvm::Function *cvtFunc = m->module->getFunction("__cvt_loc2gen_var");
// Find allocas that are safe to promote, by looking at all instructions in // Find allocas that are safe to promote, by looking at all instructions in
@@ -5460,6 +5489,7 @@ PromoteLocalToPrivatePass::runOnBasicBlock(llvm::BasicBlock &BB)
} }
} }
} }
#endif
return modifiedAny; return modifiedAny;
} }