Ignore:
Timestamp:
Mar 19, 2018, 9:10:23 AM (11 months ago)
Author:
cameron
Message:

CPU driver progress

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/toolchain/cpudriver.h

    r5915 r5917  
    1313#ifdef ORCJIT
    1414#include <llvm/ExecutionEngine/Orc/CompileUtils.h>
     15#if LLVM_VERSION_INTEGER <= LLVM_VERSION_CODE(5, 0, 0)
    1516#include <llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h>
     17#else
     18#include <llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h>
     19#endif
    1620#include <llvm/ExecutionEngine/Orc/IRCompileLayer.h>
    1721#include <llvm/ExecutionEngine/Orc/IRTransformLayer.h>
    18 typedef llvm::orc::IRCompileLayer<llvm::orc::ObjectLinkingLayer<>> CompileLayerT;
     22
     23#if LLVM_VERSION_INTEGER <= LLVM_VERSION_CODE(5, 0, 0)
     24typedef llvm::orc::ObjectLinkingLayer<> ObjectLayerT;
     25typedef llvm::orc::IRCompileLayer<ObjectLayerT> CompileLayerT;
     26#else
     27typedef llvm::orc::RTDyldObjectLinkingLayer ObjectLayerT;
     28typedef llvm::orc::IRCompileLayer<ObjectLayerT, llvm::orc::SimpleCompiler> CompileLayerT;
     29#endif
     30
    1931using OptimizeFnT = std::function<std::unique_ptr<llvm::Module>(std::unique_ptr<llvm::Module>)>;
    2032typedef llvm::orc::IRTransformLayer<CompileLayerT, OptimizeFnT> OptimizeLayerT;
     
    5264
    5365#ifdef ORCJIT
    54     llvm::orc::ObjectLinkingLayer<> mObjectLayer;
     66    ObjectLayerT mObjectLayer;
    5567    std::unique_ptr<CompileLayerT> mCompileLayer;
    5668   
Note: See TracChangeset for help on using the changeset viewer.