[arch-commits] Commit in beignet/trunk (PKGBUILD llvm6.patch)

[Evangelos Foutras]

    Date: Friday, March 16, 2018 @ 14:23:46
  Author: foutrelis
Revision: 308885

upgpkg: beignet 1.3.2-2

LLVM/Clang 6 rebuild.

Added:
  beignet/trunk/llvm6.patch
Modified:
  beignet/trunk/PKGBUILD

-------------+
 PKGBUILD    |   13 ++++++++-----
 llvm6.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-16 13:45:20 UTC (rev 308884)
+++ PKGBUILD	2018-03-16 14:23:46 UTC (rev 308885)
@@ -5,21 +5,24 @@
 
 pkgname=beignet
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source OpenCL implementation for Intel IvyBridge+ iGPUs"
 arch=('x86_64')
 url="https://01.org/${pkgname}"
 license=('LGPL')
-depends=('glu' 'llvm-libs' 'mesa' 'opencl-headers')
-makedepends=('llvm' 'clang' 'cmake' 'python' 'ocl-icd')
+depends=('glu' 'llvm-libs' 'clang' 'mesa' 'opencl-headers')
+makedepends=('llvm' 'cmake' 'python' 'ocl-icd')
 provides=('opencl-intel' 'opencl-driver')
 conflicts=('opencl-intel')
-source=("https://01.org/sites/default/files/${pkgname}-${pkgver}-source.tar.gz")
-sha256sums=('c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43')
+source=("https://01.org/sites/default/files/${pkgname}-${pkgver}-source.tar.gz"
+        'llvm6.patch')
+sha256sums=('c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43'
+            '649558497ac09f9701569630259300f67566ccb2ab77163915877102e3e31e87')
 
 prepare() {
     cd ${pkgname^}-${pkgver}-Source
     mkdir -p build
+    patch -Np1 -i ../llvm6.patch
 }
 
 build() {

Added: llvm6.patch
===================================================================
--- llvm6.patch	                        (rev 0)
+++ llvm6.patch	2018-03-16 14:23:46 UTC (rev 308885)
@@ -0,0 +1,30 @@
+diff -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp
+--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp	2017-10-24 09:04:48.000000000 +0300
++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp	2018-03-16 16:08:54.669963824 +0200
+@@ -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 -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp
+--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp	2017-10-24 09:04:48.000000000 +0300
++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp	2018-03-16 16:09:47.736403557 +0200
+@@ -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);
+Only in Beignet-1.3.2-Source: build