Date: Thursday, March 28, 2019 @ 15:10:43
Author: foutrelis
Revision: 445461
archrelease: copy trunk to community-staging-x86_64
Added:
beignet/repos/community-staging-x86_64/
beignet/repos/community-staging-x86_64/PKGBUILD
(from rev 445460, beignet/trunk/PKGBUILD)
beignet/repos/community-staging-x86_64/llvm8.patch
(from rev 445460, beignet/trunk/llvm8.patch)
-------------+
PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
llvm8.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+)
Copied: beignet/repos/community-staging-x86_64/PKGBUILD (from rev 445460,
beignet/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2019-03-28 15:10:43 UTC (rev 445461)
@@ -0,0 +1,49 @@
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <[email protected]>
+# Contributor: Antoine Lubineau <[email protected]>
+# Contributor: Leopold Bloom <[email protected]>
+# Contributor: Michal Krenek (a.k.a. Mikos) <[email protected]>
+
+pkgname=beignet
+pkgver=1.3.2+12+gfc5f430c
+pkgrel=2
+pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell
iGPUs"
+arch=('x86_64')
+url="https://01.org/${pkgname}";
+license=('LGPL')
+depends=('glu' 'llvm-libs' 'clang' 'mesa' 'opencl-headers')
+makedepends=('git' 'llvm' 'cmake' 'python' 'ocl-icd')
+provides=('opencl-intel' 'opencl-driver')
+conflicts=('opencl-intel')
+_commit=fc5f430cb7b7a8f694d86acbb038bd5b38ec389c # master as of 2018-08-20
+source=("git+https://anongit.freedesktop.org/git/beignet.git#commit=$_commit";
+ 'llvm8.patch')
+sha256sums=('SKIP'
+ 'f16b13a3263b5042081094cd20c9e09c20a3a6d6e1dd796f460e4f447cfbb598')
+
+prepare() {
+ mkdir -p build
+ cd ${pkgname}
+
+ # Remove implementation of cl_intel_device_side_avc_motion_estimation
+ # (conflicts with the implemention in Clang 8)
+ git revert -n 9b7ca443cf7b 9cb7ff4c285d
+
+ patch -Np0 -i ../llvm8.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_BUILD_TYPE=RELEASE
+ make
+}
+
+package() {
+ cd 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/llvm8.patch (from rev 445460,
beignet/trunk/llvm8.patch)
===================================================================
--- community-staging-x86_64/llvm8.patch (rev 0)
+++ community-staging-x86_64/llvm8.patch 2019-03-28 15:10:43 UTC (rev
445461)
@@ -0,0 +1,56 @@
+From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001
+From: Jan Beich <[email protected]>
+Date: Wed, 30 Jan 2019 12:42:34 +0000
+Subject: [PATCH] lang/beignet: unbreak with llvm80
+
+Regressed by https://github.com/llvm/llvm-project/commit/721d95713a9e
+
+unable to load /usr/local/lib/beignet//libgbeinterp.so which is part of the
driver, please check!
+ld-elf.so.1: /usr/local/lib/beignet//libgbeinterp.so: Undefined symbol
"_ZN4llvm24DisableABIBreakingChecksE"
+
+Regressed by https://github.com/llvm/llvm-project/commit/4a2d58e16acc
+
+backend/src/llvm/llvm_gen_backend.cpp:3076:5: error:
+ unknown type name 'TerminatorInst'
+ TerminatorInst *term = bb->getTerminator();
+ ^
+backend/src/llvm/llvm_gen_backend.cpp:3083:5: error:
+ unknown type name 'TerminatorInst'
+ TerminatorInst *term = bb->getTerminator();
+ ^
+
+--- backend/src/CMakeLists.txt.orig 2017-09-22 08:05:22 UTC
++++ backend/src/CMakeLists.txt
+@@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode)
+ endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
+
+ add_library(gbeinterp SHARED gbe_bin_interpreter.cpp)
++target_link_libraries(gbeinterp ${LLVM_MODULE_LIBS})
+
+ if (LLVM_VERSION_NODOT VERSION_EQUAL 34)
+ find_library(TERMINFO NAMES tinfo ncurses)
+--- backend/src/llvm/llvm_gen_backend.cpp.orig 2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_gen_backend.cpp
+@@ -3073,14 +3073,22 @@ namespace gbe
+
+
+ static unsigned getChildNo(BasicBlock *bb) {
++#if LLVM_VERSION_MAJOR < 8
+ TerminatorInst *term = bb->getTerminator();
++#else
++ Instruction *term = bb->getTerminator();
++#endif
+ return term->getNumSuccessors();
+ }
+
+ // return NULL if index out-range of children number
+ static BasicBlock *getChildPossible(BasicBlock *bb, unsigned index) {
+
++#if LLVM_VERSION_MAJOR < 8
+ TerminatorInst *term = bb->getTerminator();
++#else
++ Instruction *term = bb->getTerminator();
++#endif
+ unsigned childNo = term->getNumSuccessors();
+ BasicBlock *child = NULL;
+ if(index < childNo) {
