[arch-commits] Commit in beignet/repos (3 files)

[Evangelos Foutras]

    Date: Friday, March 16, 2018 @ 14:23:55
  Author: foutrelis
Revision: 308886

archrelease: copy trunk to community-staging-x86_64

Added:
  beignet/repos/community-staging-x86_64/
  beignet/repos/community-staging-x86_64/PKGBUILD
    (from rev 308885, beignet/trunk/PKGBUILD)
  beignet/repos/community-staging-x86_64/llvm6.patch
    (from rev 308885, beignet/trunk/llvm6.patch)

-------------+
 PKGBUILD    |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 llvm6.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

Copied: beignet/repos/community-staging-x86_64/PKGBUILD (from rev 308885, beignet/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-03-16 14:23:55 UTC (rev 308886)
@@ -0,0 +1,46 @@
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at archlinux.org>
+# Contributor: Antoine Lubineau <antoine at lubignon.info>
+# Contributor: Leopold Bloom <blinxwang at gmail.com>
+# Contributor: Michal Krenek (a.k.a. Mikos) <m.krenek at gmail.com>
+
+pkgname=beignet
+pkgver=1.3.2
+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' '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"
+        'llvm6.patch')
+sha256sums=('c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43'
+            '649558497ac09f9701569630259300f67566ccb2ab77163915877102e3e31e87')
+
+prepare() {
+    cd ${pkgname^}-${pkgver}-Source
+    mkdir -p build
+    patch -Np1 -i ../llvm6.patch
+}
+
+build() {
+    cd ${pkgname^}-${pkgver}-Source/build
+
+    cmake .. \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_BUILD_TYPE=RELEASE
+    make
+}
+
+package() {
+    cd ${pkgname^}-${pkgver}-Source/build
+
+    make DESTDIR="${pkgdir}" install
+
+    # Remove headers already provided by 'opencl-headers'
+    cd "${pkgdir}/usr/include/CL"
+    rm cl.h cl_egl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_platform.h opencl.h
+}

Copied: beignet/repos/community-staging-x86_64/llvm6.patch (from rev 308885, beignet/trunk/llvm6.patch)
===================================================================
--- community-staging-x86_64/llvm6.patch	                        (rev 0)
+++ community-staging-x86_64/llvm6.patch	2018-03-16 14:23:55 UTC (rev 308886)
@@ -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