diff options
author | Pan Xiuli <xiuli.pan@intel.com> | 2017-03-17 14:15:58 +0800 |
---|---|---|
committer | Yang Rong <rong.r.yang@intel.com> | 2017-04-13 19:39:17 +0800 |
commit | c6497b19e7b32bcb0d1f4aceb1988488dfec639d (patch) | |
tree | f6b58c988cd77c2acdfa9fc0f7342add32e00e7a | |
parent | 8570e517fdf10404c773274b7396876a760dc815 (diff) |
Backend: Remove old llvm support code.
LLVM 3.3 or older is not supportted by Beignet now, and we need delete
these codes.
Signed-off-by: Pan Xiuli <xiuli.pan@intel.com>
Reviewed-by: Yang Rong <rong.r.yang@intel.com>
-rw-r--r-- | backend/src/backend/gen_program.cpp | 6 | ||||
-rw-r--r-- | backend/src/backend/program.cpp | 30 | ||||
-rw-r--r-- | backend/src/llvm/llvm_gen_backend.cpp | 22 | ||||
-rw-r--r-- | backend/src/llvm/llvm_printf_parser.cpp | 6 | ||||
-rw-r--r-- | backend/src/llvm/llvm_profiling.cpp | 20 | ||||
-rw-r--r-- | backend/src/llvm/llvm_scalarize.cpp | 6 |
6 files changed, 0 insertions, 90 deletions
diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp index 073ede64..376342b8 100644 --- a/backend/src/backend/gen_program.cpp +++ b/backend/src/backend/gen_program.cpp @@ -24,15 +24,9 @@ #ifdef GBE_COMPILER_AVAILABLE #include "llvm/Config/llvm-config.h" -#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR <= 2 -#include "llvm/LLVMContext.h" -#include "llvm/Module.h" -#include "llvm/DataLayout.h" -#else #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/IR/DataLayout.h" -#endif /* LLVM_VERSION_MINOR <= 2 */ #include "llvm-c/Linker.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Bitcode/ReaderWriter.h" diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp index 8b8abc4d..6b5fce06 100644 --- a/backend/src/backend/program.cpp +++ b/backend/src/backend/program.cpp @@ -52,33 +52,16 @@ #include <mutex> #ifdef GBE_COMPILER_AVAILABLE -/* Not defined for LLVM 3.0 */ -#if !defined(LLVM_VERSION_MAJOR) -#define LLVM_VERSION_MAJOR 3 -#endif /* !defined(LLVM_VERSION_MAJOR) */ - -/* Not defined for LLVM 3.0 */ -#if !defined(LLVM_VERSION_MINOR) -#define LLVM_VERSION_MINOR 0 -#endif /* !defined(LLVM_VERSION_MINOR) */ #include <clang/CodeGen/CodeGenAction.h> #include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/CompilerInvocation.h> -#if LLVM_VERSION_MINOR <= 1 -#include <clang/Frontend/DiagnosticOptions.h> -#else #include <clang/Basic/DiagnosticOptions.h> -#endif /* LLVM_VERSION_MINOR <= 1 */ #include <clang/Frontend/TextDiagnosticPrinter.h> #include <clang/Basic/TargetInfo.h> #include <clang/Basic/TargetOptions.h> #include <llvm/ADT/IntrusiveRefCntPtr.h> -#if LLVM_VERSION_MINOR <= 2 -#include <llvm/Module.h> -#else #include <llvm/IR/Module.h> -#endif /* LLVM_VERSION_MINOR <= 2 */ #include <llvm/Bitcode/ReaderWriter.h> #include <llvm/Support/raw_ostream.h> #endif @@ -686,10 +669,6 @@ namespace gbe { args.push_back("-disable-llvm-optzns"); if(bFastMath) args.push_back("-D __FAST_RELAXED_MATH__=1"); -#if LLVM_VERSION_MINOR <= 2 - args.push_back("-triple"); - args.push_back("nvptx"); -#else args.push_back("-x"); args.push_back("cl"); args.push_back("-triple"); @@ -698,7 +677,6 @@ namespace gbe { args.push_back("-fblocks"); } else args.push_back("spir"); -#endif /* LLVM_VERSION_MINOR <= 2 */ args.push_back("stringInput.cl"); args.push_back("-ffp-contract=on"); if(OCL_DEBUGINFO) args.push_back("-g"); @@ -791,11 +769,7 @@ namespace gbe { std::string err; llvm::raw_fd_ostream ostream (dumpLLVMFileName.c_str(), err, - #if LLVM_VERSION_MINOR == 3 - 0 - #else llvm::sys::fs::F_None - #endif ); if (err.empty()) { @@ -807,11 +781,7 @@ namespace gbe { std::string err; llvm::raw_fd_ostream ostream (dumpSPIRBinaryName.c_str(), err, - #if LLVM_VERSION_MINOR == 3 - 0 - #else llvm::sys::fs::F_None - #endif ); if (err.empty()) llvm::WriteBitcodeToFile(*out_module, ostream); diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp index d7dabe3c..6fa1ae02 100644 --- a/backend/src/llvm/llvm_gen_backend.cpp +++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -746,9 +746,6 @@ namespace gbe void visitVAArgInst(VAArgInst &I) {NOT_SUPPORTED;} void visitSwitchInst(SwitchInst &I) {NOT_SUPPORTED;} void visitInvokeInst(InvokeInst &I) {NOT_SUPPORTED;} -#if LLVM_VERSION_MINOR == 0 - void visitUnwindInst(UnwindInst &I) {NOT_SUPPORTED;} -#endif /* __LLVM_30__ */ void visitResumeInst(ResumeInst &I) {NOT_SUPPORTED;} void visitInlineAsm(CallInst &I) {NOT_SUPPORTED;} void visitIndirectBrInst(IndirectBrInst &I) {NOT_SUPPORTED;} @@ -1750,7 +1747,6 @@ namespace gbe { GBE_ASSERT(dyn_cast<ConstantExpr>(CPV) == NULL); -#if LLVM_VERSION_MINOR > 0 ConstantDataSequential *seq = dyn_cast<ConstantDataSequential>(CPV); if (seq) { @@ -1773,7 +1769,6 @@ namespace gbe GBE_ASSERTM(0, "Const data array never be half float\n"); } } else -#endif /* LLVM_VERSION_MINOR > 0 */ if (dyn_cast<ConstantAggregateZero>(CPV)) { Type* Ty = CPV->getType(); @@ -2344,9 +2339,6 @@ namespace gbe Function::arg_iterator I = F.arg_begin(), E = F.arg_end(); // Insert a new register for each function argument -#if LLVM_VERSION_MINOR <= 1 - const AttrListPtr &PAL = F.getAttributes(); -#endif /* LLVM_VERSION_MINOR <= 1 */ for (; I != E; ++I, ++argID) { uint32_t opID = argID; #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 9 @@ -2436,11 +2428,7 @@ namespace gbe continue; Type *pointed = pointerType->getElementType(); // By value structure -#if LLVM_VERSION_MINOR <= 1 - if (PAL.paramHasAttr(argID+1, Attribute::ByVal)) { -#else if (I->hasByValAttr()) { -#endif /* LLVM_VERSION_MINOR <= 1 */ const size_t structSize = getTypeByteSize(unit, pointed); ctx.input(argName, ir::FunctionArgument::STRUCTURE, reg, llvmInfo, structSize, getAlignmentByte(unit, type), 0); } @@ -3164,15 +3152,9 @@ namespace gbe void GenWriter::emitFunction(Function &F) { switch (F.getCallingConv()) { -#if LLVM_VERSION_MINOR <= 2 - case CallingConv::PTX_Device: // we do not emit device function - return; - case CallingConv::PTX_Kernel: -#else case CallingConv::C: case CallingConv::Fast: case CallingConv::SPIR_KERNEL: -#endif break; default: GBE_ASSERTM(false, "Unsupported calling convention"); @@ -3789,14 +3771,12 @@ namespace gbe break; case Intrinsic::stackrestore: break; -#if LLVM_VERSION_MINOR >= 2 case Intrinsic::lifetime_start: case Intrinsic::lifetime_end: break; case Intrinsic::fmuladd: this->newRegister(&I); break; -#endif /* LLVM_VERSION_MINOR >= 2 */ case Intrinsic::debugtrap: case Intrinsic::trap: case Intrinsic::dbg_value: @@ -4644,11 +4624,9 @@ namespace gbe ctx.MOV(ir::getType(family), dst, src); } break; -#if LLVM_VERSION_MINOR >= 2 case Intrinsic::lifetime_start: case Intrinsic::lifetime_end: break; -#endif /* LLVM_VERSION_MINOR >= 2 */ case Intrinsic::debugtrap: case Intrinsic::trap: case Intrinsic::dbg_value: diff --git a/backend/src/llvm/llvm_printf_parser.cpp b/backend/src/llvm/llvm_printf_parser.cpp index 800f343f..d64fc60c 100644 --- a/backend/src/llvm/llvm_printf_parser.cpp +++ b/backend/src/llvm/llvm_printf_parser.cpp @@ -389,15 +389,9 @@ error: { bool hasPrintf = false; switch (F.getCallingConv()) { -#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR <= 2 - case CallingConv::PTX_Device: - return false; - case CallingConv::PTX_Kernel: -#else case CallingConv::C: case CallingConv::Fast: case CallingConv::SPIR_KERNEL: -#endif break; default: GBE_ASSERTM(false, "Unsupported calling convention"); diff --git a/backend/src/llvm/llvm_profiling.cpp b/backend/src/llvm/llvm_profiling.cpp index 96c95eeb..734c69d9 100644 --- a/backend/src/llvm/llvm_profiling.cpp +++ b/backend/src/llvm/llvm_profiling.cpp @@ -26,27 +26,13 @@ #include <stdlib.h> #include "llvm/Config/llvm-config.h" -#if LLVM_VERSION_MINOR <= 2 -#include "llvm/Function.h" -#include "llvm/InstrTypes.h" -#include "llvm/Instructions.h" -#include "llvm/IntrinsicInst.h" -#include "llvm/Module.h" -#else #include "llvm/IR/Function.h" #include "llvm/IR/InstrTypes.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" -#endif /* LLVM_VERSION_MINOR <= 2 */ #include "llvm/Pass.h" -#if LLVM_VERSION_MINOR <= 1 -#include "llvm/Support/IRBuilder.h" -#elif LLVM_VERSION_MINOR == 2 -#include "llvm/IRBuilder.h" -#else #include "llvm/IR/IRBuilder.h" -#endif /* LLVM_VERSION_MINOR <= 1 */ #if LLVM_VERSION_MINOR >= 5 #include "llvm/IR/CallSite.h" @@ -111,15 +97,9 @@ namespace gbe int pointNum = 0; switch (F.getCallingConv()) { -#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR <= 2 - case CallingConv::PTX_Device: - return false; - case CallingConv::PTX_Kernel: -#else case CallingConv::C: case CallingConv::Fast: case CallingConv::SPIR_KERNEL: -#endif break; default: GBE_ASSERTM(false, "Unsupported calling convention"); diff --git a/backend/src/llvm/llvm_scalarize.cpp b/backend/src/llvm/llvm_scalarize.cpp index 6f46c9da..329e3a91 100644 --- a/backend/src/llvm/llvm_scalarize.cpp +++ b/backend/src/llvm/llvm_scalarize.cpp @@ -884,15 +884,9 @@ namespace gbe { bool Scalarize::runOnFunction(Function& F) { switch (F.getCallingConv()) { -#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR <= 2 - case CallingConv::PTX_Device: - return false; - case CallingConv::PTX_Kernel: -#else case CallingConv::C: case CallingConv::Fast: case CallingConv::SPIR_KERNEL: -#endif break; default: GBE_ASSERTM(false, "Unsupported calling convention"); |