diff options
| author | Yang Rong <rong.r.yang@intel.com> | 2017-01-19 18:14:34 +0800 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2017-01-19 20:04:24 +0800 |
| commit | 27603927148b0ef26cfe86cbf0316ee74aca50db (patch) | |
| tree | 29e9a499a93953635896b753b96331c44ad59819 | |
| parent | e0d746fd7cf2a043e41143790f8c857bc87ad9b9 (diff) | |
| download | beignet-27603927148b0ef26cfe86cbf0316ee74aca50db.tar.gz | |
GBE: fix llvm3.5 version build error.
Signed-off-by: Yang Rong <rong.r.yang@intel.com>
Reviewed-by: Pan Xiuli <xiuli.pan@intel.com>
| -rw-r--r-- | backend/src/llvm/llvm_device_enqueue.cpp | 9 | ||||
| -rw-r--r-- | backend/src/llvm/llvm_passes.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/backend/src/llvm/llvm_device_enqueue.cpp b/backend/src/llvm/llvm_device_enqueue.cpp index ff6fbbbe..ee236def 100644 --- a/backend/src/llvm/llvm_device_enqueue.cpp +++ b/backend/src/llvm/llvm_device_enqueue.cpp @@ -15,7 +15,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ - +#include <list> #include "llvm_includes.hpp" #include "ir/unit.hpp" @@ -84,6 +84,7 @@ namespace gbe { Function* setFunctionAsKernel(Module *mod, Function *Fn) { +#if (LLVM_VERSION_MAJOR == 3) && (LLVM_VERSION_MINOR >= 9) LLVMContext &Context = mod->getContext(); Type *intTy = IntegerType::get(mod->getContext(), 32); SmallVector<llvm::Metadata *, 5> kernelMDArgs; @@ -148,7 +149,6 @@ namespace gbe { } //If run to here, llvm version always > 3.9, add the version check just for build. -#if (LLVM_VERSION_MAJOR == 3) && (LLVM_VERSION_MINOR >= 9) NewFn->setMetadata("kernel_arg_addr_space", llvm::MDNode::get(Context, addressQuals)); NewFn->setMetadata("kernel_arg_access_qual", @@ -161,8 +161,11 @@ namespace gbe { llvm::MDNode::get(Context, argTypeQuals)); NewFn->setMetadata("kernel_arg_name", llvm::MDNode::get(Context, argNames)); -#endif return NewFn; +#else + assert(0); //only opencl 2.0 could reach hear. + return Fn; +#endif } Instruction* replaceInst(Instruction *I, Value *v) diff --git a/backend/src/llvm/llvm_passes.cpp b/backend/src/llvm/llvm_passes.cpp index f5d90521..367a2c38 100644 --- a/backend/src/llvm/llvm_passes.cpp +++ b/backend/src/llvm/llvm_passes.cpp @@ -78,8 +78,8 @@ namespace gbe major = mdconst::extract<ConstantInt>(node->getOperand(0))->getZExtValue(); minor = mdconst::extract<ConstantInt>(node->getOperand(1))->getZExtValue(); #else - major = cast<ConstantInt>(MD->getOperand(0))->getZExtValue(); - minor = cast<ConstantInt>(MD->getOperand(1))->getZExtValue(); + major = cast<ConstantInt>(node->getOperand(0))->getZExtValue(); + minor = cast<ConstantInt>(node->getOperand(1))->getZExtValue(); #endif oclVersion = major * 100 + minor * 10; } |