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

Merge pull request #969 from ncos/ispc_build_fails

Browse Source 
Fix buildfail after LLVM trunk commit 229094
This commit is contained in:
Dmitry Babokin
2015-02-19 13:08:52 +03:00
parent 372b4583c2 4dff88d4c5
commit ca866c6d54
4 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cbackend.cpp
View File

@@ -51,7 +51,11 @@
#include "llvm/IR/InlineAsm.h" #include "llvm/IR/InlineAsm.h"
#endif #endif
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/PassManager.h" #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#include "llvm/PassManager.h"
#else // LLVM 3.7+
#include "llvm/IR/LegacyPassManager.h"
#endif
#if defined(LLVM_3_2) #if defined(LLVM_3_2)
#include "llvm/TypeFinder.h" #include "llvm/TypeFinder.h"
#else // LLVM_3_3 + #else // LLVM_3_3 +
@@ -5055,7 +5059,12 @@ MaskOpsCleanupPass::runOnBasicBlock(llvm::BasicBlock &bb) {
bool bool
WriteCXXFile(llvm::Module *module, const char *fn, int vectorWidth, WriteCXXFile(llvm::Module *module, const char *fn, int vectorWidth,
const char *includeName) { const char *includeName) {
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
llvm::PassManager pm; llvm::PassManager pm;
#else // LLVM 3.7+
llvm::legacy::PassManager pm;
#endif
#if 0 #if 0
if (const llvm::TargetData *td = targetMachine->getTargetData()) if (const llvm::TargetData *td = targetMachine->getTargetData())
pm.add(new llvm::TargetData(*td)); pm.add(new llvm::TargetData(*td));

7
func.cpp
View File

@@ -67,14 +67,17 @@
#include <llvm/IR/Intrinsics.h> #include <llvm/IR/Intrinsics.h>
#include <llvm/IR/DerivedTypes.h> #include <llvm/IR/DerivedTypes.h>
#endif #endif
#include <llvm/PassManager.h> #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#include "llvm/PassManager.h"
#else // LLVM 3.7+
#include "llvm/IR/LegacyPassManager.h"
#endif
#include <llvm/PassRegistry.h> #include <llvm/PassRegistry.h>
#include <llvm/Transforms/IPO.h> #include <llvm/Transforms/IPO.h>
#include <llvm/Support/FormattedStream.h> #include <llvm/Support/FormattedStream.h>
#include <llvm/Support/FileUtilities.h> #include <llvm/Support/FileUtilities.h>
#include <llvm/Target/TargetMachine.h> #include <llvm/Target/TargetMachine.h>
#include <llvm/Target/TargetOptions.h> #include <llvm/Target/TargetOptions.h>
#include <llvm/PassManager.h>
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+ #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+
#include <llvm/IR/Verifier.h> #include <llvm/IR/Verifier.h>
#include <llvm/IR/IRPrintingPasses.h> #include <llvm/IR/IRPrintingPasses.h>

15
module.cpp
View File

@@ -92,7 +92,11 @@
#endif #endif
#endif /* ISPC_NVPTX_ENABLED */ #endif /* ISPC_NVPTX_ENABLED */
#endif #endif
#include <llvm/PassManager.h> #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#include "llvm/PassManager.h"
#else // LLVM 3.7+
#include "llvm/IR/LegacyPassManager.h"
#endif
#include <llvm/PassRegistry.h> #include <llvm/PassRegistry.h>
#include <llvm/Transforms/IPO.h> #include <llvm/Transforms/IPO.h>
#include <llvm/Support/FormattedStream.h> #include <llvm/Support/FormattedStream.h>
@@ -1393,7 +1397,11 @@ Module::writeObjectFileOrAssembly(llvm::TargetMachine *targetMachine,
return false; return false;
} }
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
llvm::PassManager pm; llvm::PassManager pm;
#else // LLVM 3.7+
llvm::legacy::PassManager pm;
#endif
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4)
pm.add(new llvm::DataLayout(*g->target->getDataLayout())); pm.add(new llvm::DataLayout(*g->target->getDataLayout()));
#elif defined(LLVM_3_5) #elif defined(LLVM_3_5)
@@ -2895,7 +2903,12 @@ lCreateDispatchModule(std::map<std::string, FunctionTargetVariants> &functions)
// Do some rudimentary cleanup of the final result and make sure that // Do some rudimentary cleanup of the final result and make sure that
// the module is all ok. // the module is all ok.
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
llvm::PassManager optPM; llvm::PassManager optPM;
#else // LLVM 3.7+
llvm::legacy::PassManager optPM;
#endif
optPM.add(llvm::createGlobalDCEPass()); optPM.add(llvm::createGlobalDCEPass());
optPM.add(llvm::createVerifierPass()); optPM.add(llvm::createVerifierPass());
optPM.run(*module); optPM.run(*module);

15
opt.cpp
View File

@@ -72,7 +72,11 @@
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) // LLVM 3.4+ #if !defined(LLVM_3_2) && !defined(LLVM_3_3) // LLVM 3.4+
#include <llvm/Transforms/Instrumentation.h> #include <llvm/Transforms/Instrumentation.h>
#endif #endif
#include <llvm/PassManager.h> #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#include "llvm/PassManager.h"
#else // LLVM 3.7+
#include "llvm/IR/LegacyPassManager.h"
#endif
#include <llvm/PassRegistry.h> #include <llvm/PassRegistry.h>
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+ #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+
#include <llvm/IR/Verifier.h> #include <llvm/IR/Verifier.h>
@@ -457,10 +461,17 @@ public:
DebugPassManager():number(0){} DebugPassManager():number(0){}
void add(llvm::Pass * P, int stage); void add(llvm::Pass * P, int stage);
bool run(llvm::Module& M) {return PM.run(M);} bool run(llvm::Module& M) {return PM.run(M);}
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
llvm::PassManager& getPM() {return PM;} llvm::PassManager& getPM() {return PM;}
#else // LLVM 3.7+
llvm::legacy::PassManager& getPM() {return PM;}
#endif
private: private:
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
llvm::PassManager PM; llvm::PassManager PM;
#else // LLVM 3.7+
llvm::legacy::PassManager PM;
#endif
int number; int number;
}; };