diff options
| author | Rebecca N. Palmer <rebecca_palmer@zoho.com> | 2018-07-21 20:04:00 +0100 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2018-08-20 15:31:39 +0800 |
| commit | 6e60548adee04040d5ccd53f38997476df154e5c (patch) | |
| tree | b8c63053355b759c53b8fbce48bc1da1aaea530f | |
| parent | 991f774f65ec8c7eb9687a554de9d8017e805c17 (diff) | |
| download | beignet-6e60548adee04040d5ccd53f38997476df154e5c.tar.gz | |
Add LLVM 6.0 support
LLVMContext::setDiagnosticHandler and LoopInfo::markAsRemoved
have been renamed.
Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Reviewed-by: Yang Rong <rong.r.yang@intel.com>
| -rw-r--r-- | backend/src/llvm/llvm_to_gen.cpp | 4 | ||||
| -rw-r--r-- | backend/src/llvm/llvm_unroll.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/backend/src/llvm/llvm_to_gen.cpp b/backend/src/llvm/llvm_to_gen.cpp index 7f7deffe..d4570bb4 100644 --- a/backend/src/llvm/llvm_to_gen.cpp +++ b/backend/src/llvm/llvm_to_gen.cpp @@ -322,7 +322,11 @@ namespace gbe DataLayout DL(&mod); gbeDiagnosticContext dc; +#if LLVM_VERSION_MAJOR >= 6 + mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc); +#else mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc); +#endif #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 mod.setDataLayout(DL); diff --git a/backend/src/llvm/llvm_unroll.cpp b/backend/src/llvm/llvm_unroll.cpp index 107d7937..813e116d 100644 --- a/backend/src/llvm/llvm_unroll.cpp +++ b/backend/src/llvm/llvm_unroll.cpp @@ -205,7 +205,9 @@ namespace gbe { if (parentTripCount != 0 && currTripCount * parentTripCount > 32) { //Don't change the unrollID if doesn't force unroll. //setUnrollID(parentL, false); -#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 +#if LLVM_VERSION_MAJOR >= 6 + loopInfo.erase(parentL); +#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 loopInfo.markAsRemoved(parentL); #else LPM.deleteLoopFromQueue(parentL); |