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

Merge pull request #713 from ifilippov/perf_correction

Browse Source 
Support of LLVM trunk after changes in 198438, 199041, 199082 revisions.
This commit is contained in:
Dmitry Babokin
2014-01-15 03:49:15 -08:00
parent 86331022eb 5fa8bd3c78
commit 6d59ef49f7
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cbackend.cpp
View File

@@ -63,7 +63,13 @@
#include "llvm/Analysis/ConstantsScanner.h" #include "llvm/Analysis/ConstantsScanner.h"
#include "llvm/Analysis/FindUsedTypes.h" #include "llvm/Analysis/FindUsedTypes.h"
#include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/LoopInfo.h"
#if defined(LLVM_3_5)
#include "llvm/IR/Verifier.h"
#include <llvm/IR/IRPrintingPasses.h>
#else
#include "llvm/Analysis/Verifier.h" #include "llvm/Analysis/Verifier.h"
#include <llvm/Assembly/PrintModulePass.h>
#endif
#include "llvm/Analysis/ValueTracking.h" #include "llvm/Analysis/ValueTracking.h"
#include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/Passes.h"
#include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/CodeGen/IntrinsicLowering.h"
@@ -102,7 +108,6 @@
#include <llvm/Transforms/IPO.h> #include <llvm/Transforms/IPO.h>
#include <llvm/Transforms/Utils/BasicBlockUtils.h> #include <llvm/Transforms/Utils/BasicBlockUtils.h>
#include <llvm/Support/ToolOutputFile.h> #include <llvm/Support/ToolOutputFile.h>
#include <llvm/Assembly/PrintModulePass.h>
#include <algorithm> #include <algorithm>
// Some ms header decided to define setjmp as _setjmp, undo this for this file. // Some ms header decided to define setjmp as _setjmp, undo this for this file.
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -241,9 +246,7 @@ namespace {
class CBEMCAsmInfo : public llvm::MCAsmInfo { class CBEMCAsmInfo : public llvm::MCAsmInfo {
public: public:
CBEMCAsmInfo() { CBEMCAsmInfo() {
#if defined(LLVM_3_5) #if !defined(LLVM_3_5)
GlobalPrefix = '\0';
#else
GlobalPrefix = ""; GlobalPrefix = "";
#endif #endif
PrivateGlobalPrefix = ""; PrivateGlobalPrefix = "";

7
func.cpp
View File

@@ -69,10 +69,15 @@
#include <llvm/Target/TargetMachine.h> #include <llvm/Target/TargetMachine.h>
#include <llvm/Target/TargetOptions.h> #include <llvm/Target/TargetOptions.h>
#include <llvm/PassManager.h> #include <llvm/PassManager.h>
#if defined(LLVM_3_5)
#include <llvm/IR/Verifier.h>
#include <llvm/IR/IRPrintingPasses.h>
#else
#include <llvm/Analysis/Verifier.h> #include <llvm/Analysis/Verifier.h>
#include <llvm/Assembly/PrintModulePass.h>
#endif
#include <llvm/Support/CFG.h> #include <llvm/Support/CFG.h>
#include <llvm/Support/ToolOutputFile.h> #include <llvm/Support/ToolOutputFile.h>
#include <llvm/Assembly/PrintModulePass.h>
Function::Function(Symbol *s, Stmt *c) { Function::Function(Symbol *s, Stmt *c) {
sym = s; sym = s;

7
module.cpp
View File

@@ -95,7 +95,13 @@
#include <llvm/IR/DataLayout.h> #include <llvm/IR/DataLayout.h>
#include <llvm/Analysis/TargetTransformInfo.h> #include <llvm/Analysis/TargetTransformInfo.h>
#endif #endif
#if defined(LLVM_3_5)
#include <llvm/IR/Verifier.h>
#include <llvm/IR/IRPrintingPasses.h>
#else
#include <llvm/Analysis/Verifier.h> #include <llvm/Analysis/Verifier.h>
#include <llvm/Assembly/PrintModulePass.h>
#endif
#include <llvm/Support/CFG.h> #include <llvm/Support/CFG.h>
#include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/CompilerInstance.h>
#include <clang/Frontend/TextDiagnosticPrinter.h> #include <clang/Frontend/TextDiagnosticPrinter.h>
@@ -103,7 +109,6 @@
#include <clang/Basic/TargetInfo.h> #include <clang/Basic/TargetInfo.h>
#include <llvm/Support/ToolOutputFile.h> #include <llvm/Support/ToolOutputFile.h>
#include <llvm/Support/Host.h> #include <llvm/Support/Host.h>
#include <llvm/Assembly/PrintModulePass.h>
#include <llvm/Support/raw_ostream.h> #include <llvm/Support/raw_ostream.h>
#include <llvm/Bitcode/ReaderWriter.h> #include <llvm/Bitcode/ReaderWriter.h>

7
opt.cpp
View File

@@ -68,7 +68,13 @@
#endif #endif
#include <llvm/PassManager.h> #include <llvm/PassManager.h>
#include <llvm/PassRegistry.h> #include <llvm/PassRegistry.h>
#if defined(LLVM_3_5)
#include <llvm/IR/Verifier.h>
#include <llvm/IR/IRPrintingPasses.h>
#else
#include <llvm/Analysis/Verifier.h>
#include <llvm/Assembly/PrintModulePass.h> #include <llvm/Assembly/PrintModulePass.h>
#endif
#include <llvm/Analysis/ConstantFolding.h> #include <llvm/Analysis/ConstantFolding.h>
#include <llvm/Target/TargetLibraryInfo.h> #include <llvm/Target/TargetLibraryInfo.h>
#include <llvm/ADT/Triple.h> #include <llvm/ADT/Triple.h>
@@ -86,7 +92,6 @@
#include <llvm/Analysis/TargetTransformInfo.h> #include <llvm/Analysis/TargetTransformInfo.h>
#endif #endif
#include <llvm/Target/TargetMachine.h> #include <llvm/Target/TargetMachine.h>
#include <llvm/Analysis/Verifier.h>
#include <llvm/Analysis/Passes.h> #include <llvm/Analysis/Passes.h>
#include <llvm/Support/raw_ostream.h> #include <llvm/Support/raw_ostream.h>
#include <llvm/Support/PatternMatch.h> #include <llvm/Support/PatternMatch.h>