File beignet-Add-LLVM-6.0-support.patch of Package beignet

Overview Repositories Revisions Requests Users Attributes Meta

File beignet-Add-LLVM-6.0-support.patch of Package beignet (Revision e7d4aa8acc98e4653e12c86a6fbe9eaf)

Currently displaying revision e7d4aa8acc98e4653e12c86a6fbe9eaf , Show latest

From 6e60548adee04040d5ccd53f38997476df154e5c Mon Sep 17 00:00:00 2001
From: "Rebecca N. Palmer" <rebecca_palmer@zoho.com>
Date: Sat, 21 Jul 2018 20:04:00 +0100
Subject: [PATCH] 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>
---
 backend/src/llvm/llvm_to_gen.cpp | 4 ++++
 backend/src/llvm/llvm_unroll.cpp | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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);
-- 
2.16.4

Places

File beignet-Add-LLVM-6.0-support.patch of Package beignet (Revision e7d4aa8acc98e4653e12c86a6fbe9eaf)

Places