[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Thursday, April 16, 2020 @ 01:18:35 Author: archange Revision: 615111 Some PKGBUILD linting Modified: beignet/trunk/PKGBUILD --+ PKGBUILD | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-16 01:17:50 UTC (rev 615110) +++ PKGBUILD2020-04-16 01:18:35 UTC (rev 615111) @@ -15,17 +15,20 @@ 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' -'llvm9.patch' -'llvm10.patch') -sha256sums=('SKIP' -'d24e4d8a1a791dc02c91117f900143789dd6f01eaa89292ad67c4fb4eaf84328' -'5913a93fe6ef77b91480bb6d27c7875673294c0a8a924b2ac66756d0d3577908' -'2eb9b0801e24f4e537033b41a6bc462e4082f6216d62933240ca3010020ea779') +source=( +"git+https://anongit.freedesktop.org/git/beignet.git#commit=$_commit"; +llvm8.patch +llvm9.patch +llvm10.patch +) +sha256sums=( +SKIP +d24e4d8a1a791dc02c91117f900143789dd6f01eaa89292ad67c4fb4eaf84328 +5913a93fe6ef77b91480bb6d27c7875673294c0a8a924b2ac66756d0d3577908 +2eb9b0801e24f4e537033b41a6bc462e4082f6216d62933240ca3010020ea779 +) prepare() { -mkdir -p build cd ${pkgname} # Remove implementation of cl_intel_device_side_avc_motion_estimation @@ -42,18 +45,16 @@ } build() { -cd build -cmake ../${pkgname} \ +cmake -B build -S ${pkgname} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_BUILD_TYPE=RELEASE -make +make -C build } package() { -cd build -make DESTDIR="${pkgdir}" install +make -C build DESTDIR="${pkgdir}" install # Remove headers already provided by 'opencl-headers' -cd "${pkgdir}/usr/include/CL" +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 }
[arch-commits] Commit in beignet/trunk (PKGBUILD llvm10.patch llvm8.patch llvm9.patch)
Date: Thursday, April 16, 2020 @ 01:02:53 Author: foutrelis Revision: 615085 upgpkg: beignet 1.3.2+12+gfc5f430c-4: LLVM 10 rebuild Also replace LLVM 8/9 patches with ones from Debian which include a fix. Added: beignet/trunk/llvm10.patch Modified: beignet/trunk/PKGBUILD beignet/trunk/llvm8.patch beignet/trunk/llvm9.patch --+ PKGBUILD | 20 ++- llvm10.patch | 358 + llvm8.patch | 63 ++ llvm9.patch | 115 +++--- 4 files changed, 433 insertions(+), 123 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-16 00:54:41 UTC (rev 615084) +++ PKGBUILD2020-04-16 01:02:53 UTC (rev 615085) @@ -5,7 +5,7 @@ pkgname=beignet pkgver=1.3.2+12+gfc5f430c -pkgrel=3 +pkgrel=4 pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs" arch=(x86_64) url="https://01.org/${pkgname}"; @@ -17,10 +17,12 @@ _commit=fc5f430cb7b7a8f694d86acbb038bd5b38ec389c # master as of 2018-08-20 source=("git+https://anongit.freedesktop.org/git/beignet.git#commit=$_commit"; 'llvm8.patch' -'llvm9.patch') +'llvm9.patch' +'llvm10.patch') sha256sums=('SKIP' -'f16b13a3263b5042081094cd20c9e09c20a3a6d6e1dd796f460e4f447cfbb598' -'2a0229629ad228b54fdb930d18a94c6879024a41b43ed5265c758bf508cd4bc6') +'d24e4d8a1a791dc02c91117f900143789dd6f01eaa89292ad67c4fb4eaf84328' +'5913a93fe6ef77b91480bb6d27c7875673294c0a8a924b2ac66756d0d3577908' +'2eb9b0801e24f4e537033b41a6bc462e4082f6216d62933240ca3010020ea779') prepare() { mkdir -p build @@ -30,9 +32,13 @@ # (conflicts with the implemention in Clang 8) git revert -n 9b7ca443cf7b 9cb7ff4c285d -# Patches from FreeBSD to build with newer LLVM -patch -Np0 -i ../llvm8.patch -patch -Np0 -i ../llvm9.patch +# Patches from FreeBSD + Debian to build with newer LLVM +patch -Np1 -i ../llvm8.patch +patch -Np1 -i ../llvm9.patch + +# https://lists.freedesktop.org/archives/beignet/2020-January/009251.html +# https://github.com/intel/opencl-clang/commit/77ae1114c7bf79d724f5129461 +patch -Np1 -i ../llvm10.patch } build() { Added: llvm10.patch === --- llvm10.patch(rev 0) +++ llvm10.patch2020-04-16 01:02:53 UTC (rev 615085) @@ -0,0 +1,358 @@ +diff -upr beignet.orig/backend/src/backend/program.cpp beignet/backend/src/backend/program.cpp +--- beignet.orig/backend/src/backend/program.cpp 2020-04-16 03:44:21.153955099 +0300 beignet/backend/src/backend/program.cpp2020-04-16 03:47:50.369205839 +0300 +@@ -694,9 +694,14 @@ namespace gbe { + #endif + ); + ++llvm::cl::ResetAllOptionOccurrences(); + clang::CompilerInvocation::CreateFromArgs(*CI, ++#if LLVM_VERSION_MAJOR < 10 + &args[0], + &args[0] + args.size(), ++#else ++ clang::ArrayRef(args), ++#endif + Diags); + // Create the compiler instance + clang::CompilerInstance Clang; +@@ -1242,8 +1247,12 @@ EXTEND_QUOTE: + // Create the compiler invocation + std::unique_ptr CI(new clang::CompilerInvocation); + return clang::CompilerInvocation::CreateFromArgs(*CI, ++#if LLVM_VERSION_MAJOR < 10 +&args[0], +&args[0] + args.size(), ++#else ++ clang::ArrayRef(args), ++#endif +Diags); + } + #endif +Only in beignet/backend/src/backend: program.cpp.orig +Only in beignet.orig/backend/src: CMakeLists.txt.orig +diff -upr beignet.orig/backend/src/llvm/llvm_gen_backend.cpp beignet/backend/src/llvm/llvm_gen_backend.cpp +--- beignet.orig/backend/src/llvm/llvm_gen_backend.cpp 2020-04-16 03:44:21.783970632 +0300 beignet/backend/src/llvm/llvm_gen_backend.cpp 2020-04-16 03:45:04.141685867 +0300 +@@ -575,11 +575,13 @@ namespace gbe + has_errors(false), + legacyMode(true) + { ++#if LLVM_VERSION_MAJOR < 10 + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 + initializeLoopInfoWrapperPassPass(*PassRegistry::getPassRegistry()); + #else + initializeLoopInfoPass(*PassRegistry::getPassRegistry()); + #endif ++#endif + pass = PASS_EMIT_REGISTERS; + } + +diff -upr beignet.orig/backend/src/llvm/llvm_gen_backend.hpp beignet/backend/src/llvm/llvm_gen_backend.hpp +--- beignet.orig/backend/src/llvm/llvm_gen_backend.hpp 2020-04-16 03:44:21.177289008 +0300 beignet/backend/src/llvm/llvm_gen_backend.hpp 2020-04-16 03:45:04
[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Sunday, October 20, 2019 @ 21:19:19 Author: archange Revision: 517988 PKGBUILD cleaning Modified: beignet/trunk/PKGBUILD --+ PKGBUILD | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-20 21:02:21 UTC (rev 517987) +++ PKGBUILD2019-10-20 21:19:19 UTC (rev 517988) @@ -1,4 +1,4 @@ -# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) +# Maintainer: Bruno Pagani # Contributor: Antoine Lubineau # Contributor: Leopold Bloom # Contributor: Michal Krenek (a.k.a. Mikos) @@ -7,13 +7,13 @@ pkgver=1.3.2+12+gfc5f430c pkgrel=3 pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs" -arch=('x86_64') +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') +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'
[arch-commits] Commit in beignet/trunk (PKGBUILD llvm9.patch)
Date: Saturday, October 5, 2019 @ 21:48:05 Author: foutrelis Revision: 513016 upgpkg: beignet 1.3.2+12+gfc5f430c-3 LLVM 9 rebuild. Added: beignet/trunk/llvm9.patch Modified: beignet/trunk/PKGBUILD -+ PKGBUILD| 10 ++- llvm9.patch | 182 ++ 2 files changed, 189 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-05 21:09:31 UTC (rev 513015) +++ PKGBUILD2019-10-05 21:48:05 UTC (rev 513016) @@ -5,7 +5,7 @@ pkgname=beignet pkgver=1.3.2+12+gfc5f430c -pkgrel=2 +pkgrel=3 pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs" arch=('x86_64') url="https://01.org/${pkgname}"; @@ -16,9 +16,11 @@ conflicts=('opencl-intel') _commit=fc5f430cb7b7a8f694d86acbb038bd5b38ec389c # master as of 2018-08-20 source=("git+https://anongit.freedesktop.org/git/beignet.git#commit=$_commit"; -'llvm8.patch') +'llvm8.patch' +'llvm9.patch') sha256sums=('SKIP' -'f16b13a3263b5042081094cd20c9e09c20a3a6d6e1dd796f460e4f447cfbb598') +'f16b13a3263b5042081094cd20c9e09c20a3a6d6e1dd796f460e4f447cfbb598' +'2a0229629ad228b54fdb930d18a94c6879024a41b43ed5265c758bf508cd4bc6') prepare() { mkdir -p build @@ -28,7 +30,9 @@ # (conflicts with the implemention in Clang 8) git revert -n 9b7ca443cf7b 9cb7ff4c285d +# Patches from FreeBSD to build with newer LLVM patch -Np0 -i ../llvm8.patch +patch -Np0 -i ../llvm9.patch } build() { Added: llvm9.patch === --- llvm9.patch (rev 0) +++ llvm9.patch 2019-10-05 21:48:05 UTC (rev 513016) @@ -0,0 +1,182 @@ +Regressed by https://github.com/llvm/llvm-project/commit/2e97d2aa1bd3 + +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::MatchFinder::addMatcher(clang::ast_matchers::internal::Matcher const&, clang::ast_matchers::MatchFinder::MatchCallback*) +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::MatchFinder::MatchCallback::~MatchCallback() +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::MatchFinder::match(clang::ast_type_traits::DynTypedNode const&, clang::ASTContext&) +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::MatchFinder::MatchFinder(clang::ast_matchers::MatchFinder::MatchFinderOptions) +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::MatchFinder::~MatchFinder() +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::cxxMethodDecl +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::cxxRecordDecl +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::unaryOperator +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::cxxConstructExpr +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::cxxConstructorDecl +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::cxxOperatorCallExpr +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::expr +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::allOf +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::anyOf +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::eachOf +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::unless +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::varDecl +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::callExpr +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::castExpr +ld: error: backend/src/libgbe.so: undefined reference to clang::ast_matchers::internal::hasAnyNameFunc(llvm::ArrayRef) +ld: error: too many errors emitted, stopping now (use -error-limit=0 to see all errors) +c++: error: linker command failed with exit code 1 (use -v to see invocation) + +Regressed by https://github.com/llvm/llvm-project/commit/13680223b9d8 + +backend/src/llvm/llvm_intrinsic_lowering.cpp:80:19: error: + no viable conversion from 'llvm::FunctionCallee' to 'llvm::Constant *' +Constant* FCache = M->getOrInsertFunction(NewFn, + ^~ +backend/src/llvm/llvm_sampler_fix.cpp:85:18: error: + no viable conversion from 'llvm::FunctionCallee' to 'llvm::Value *' + ...Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType()); +^ ~~ +backend/src/llvm/llvm_sampler_fix.cpp:127:18: error: + no viable conversion from 'll
[arch-commits] Commit in beignet/trunk (PKGBUILD llvm8.patch)
Date: Thursday, March 28, 2019 @ 15:10:38 Author: foutrelis Revision: 445460 upgpkg: beignet 1.3.2+12+gfc5f430c-2 LLVM 8 rebuild. Added: beignet/trunk/llvm8.patch Modified: beignet/trunk/PKGBUILD -+ PKGBUILD| 15 --- llvm8.patch | 56 2 files changed, 68 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-28 15:10:33 UTC (rev 445459) +++ PKGBUILD2019-03-28 15:10:38 UTC (rev 445460) @@ -5,7 +5,7 @@ pkgname=beignet pkgver=1.3.2+12+gfc5f430c -pkgrel=1 +pkgrel=2 pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs" arch=('x86_64') url="https://01.org/${pkgname}"; @@ -15,11 +15,20 @@ 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";) -sha256sums=('SKIP') +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() { Added: llvm8.patch === --- llvm8.patch (rev 0) +++ llvm8.patch 2019-03-28 15:10:38 UTC (rev 445460) @@ -0,0 +1,56 @@ +From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Wed, 30 Jan 2019 12:42:34 + +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.orig2017-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) {
[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Saturday, September 22, 2018 @ 12:17:33 Author: archange Revision: 384126 LLVM 7.0 rebuild + target master The beignet project is now in maintenance mode only (it has been superseeded by Neo/compute-runtime), and even new releases are unlikely. However, this project might still be usefull for those with IvyBridge & Haswell GPUs as those will not be supported by Neo/compute-runtime. Most of the commits in the master branches are fixes toward LLVM 6 & 7 compatibility, everything else is bug fixes pushed by Debian, so following master (but pinning the commit to know where we are) is a good idea now. Modified: beignet/trunk/PKGBUILD --+ PKGBUILD | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-22 11:34:59 UTC (rev 384125) +++ PKGBUILD2018-09-22 12:17:33 UTC (rev 384126) @@ -4,31 +4,27 @@ # Contributor: Michal Krenek (a.k.a. Mikos) pkgname=beignet -pkgver=1.3.2 -pkgrel=2 -pkgdesc="An open source OpenCL implementation for Intel IvyBridge+ iGPUs" +pkgver=1.3.2+12+gfc5f430c +pkgrel=1 +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=('llvm' 'cmake' 'python' 'ocl-icd') +makedepends=('git' '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') +_commit=fc5f430cb7b7a8f694d86acbb038bd5b38ec389c # master as of 2018-08-20 +source=("git+https://anongit.freedesktop.org/git/beignet.git#commit=$_commit";) +sha256sums=('SKIP') prepare() { -cd ${pkgname^}-${pkgver}-Source mkdir -p build -patch -Np1 -i ../llvm6.patch } build() { -cd ${pkgname^}-${pkgver}-Source/build - -cmake .. \ +cd build +cmake ../${pkgname} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_BUILD_TYPE=RELEASE @@ -36,10 +32,8 @@ } package() { -cd ${pkgname^}-${pkgver}-Source/build - +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
[arch-commits] Commit in beignet/trunk (PKGBUILD llvm6.patch)
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 === --- PKGBUILD2018-03-16 13:45:20 UTC (rev 308884) +++ PKGBUILD2018-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.0 +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.0 +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
[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Friday, October 27, 2017 @ 16:10:52 Author: archange Revision: 264597 upgpkg: beignet 1.3.2-1 Switch back to LLVM 5.0 (tentative) Modified: beignet/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-10-27 13:58:47 UTC (rev 264596) +++ PKGBUILD2017-10-27 16:10:52 UTC (rev 264597) @@ -4,18 +4,18 @@ # Contributor: Michal Krenek (a.k.a. Mikos) pkgname=beignet -pkgver=1.3.1 -pkgrel=4 +pkgver=1.3.2 +pkgrel=1 pkgdesc="An open source OpenCL implementation for Intel IvyBridge+ iGPUs" arch=('x86_64') url="https://01.org/${pkgname}"; license=('LGPL') -depends=('glu' 'llvm39-libs' 'mesa' 'opencl-headers') -makedepends=('llvm39' 'clang39' 'cmake' 'python' 'ocl-icd') +depends=('glu' 'llvm-libs' 'mesa' 'opencl-headers') +makedepends=('llvm' 'clang' '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=('399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f') +sha256sums=('c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43') prepare() { cd ${pkgname^}-${pkgver}-Source
[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Friday, May 19, 2017 @ 14:01:17 Author: lcarlier Revision: 228547 upgpkg: beignet 1.3.1-3 now beignet provides opencl-driver Modified: beignet/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-05-19 13:57:04 UTC (rev 228546) +++ PKGBUILD2017-05-19 14:01:17 UTC (rev 228547) @@ -5,14 +5,14 @@ pkgname=beignet pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="An open source OpenCL implementation for Intel IvyBridge+ iGPUs" arch=('x86_64') url="https://01.org/${pkgname}"; license=('LGPL') -depends=('glu' 'llvm' 'mesa' 'ocl-icd' 'opencl-headers') -makedepends=('clang' 'cmake' 'python') -provides=('opencl-intel') +depends=('glu' 'llvm' 'mesa' 'opencl-headers') +makedepends=('clang' 'cmake' 'python' 'ocl-icd') +provides=('opencl-intel' 'opencl-driver') conflicts=('opencl-intel') source=("https://01.org/sites/default/files/${pkgname}-${pkgver}-source.tar.gz"; '0001-Backend-Remove-old-llvm-support-code.patch'
[arch-commits] Commit in beignet/trunk (PKGBUILD)
Date: Friday, March 24, 2017 @ 23:55:58 Author: archange Revision: 218703 upgpkg: beignet 1.3.1-1 Try working around svn Modified: beignet/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-03-24 22:30:39 UTC (rev 218702) +++ PKGBUILD2017-03-24 23:55:58 UTC (rev 218703) @@ -1,4 +1,4 @@ -# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) +# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) # Contributor: Antoine Lubineau # Contributor: Leopold Bloom # Contributor: Michal Krenek (a.k.a. Mikos)