diff --git a/testing/intel-compute-runtime/APKBUILD b/testing/intel-compute-runtime/APKBUILD index f84550ffc76893c4c83fb5846c9e2bdb2aac8bbf..2145a925413a9e40f8d4fadcf548bf41b96836da 100644 --- a/testing/intel-compute-runtime/APKBUILD +++ b/testing/intel-compute-runtime/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Dennis Krupenik <dennis@krupenik.com> # Maintainer: Dennis Krupenik <dennis@krupenik.com> pkgname=intel-compute-runtime -pkgver=21.09.19150 +pkgver=22.15.22905 pkgrel=0 pkgdesc="Intel® Graphics Compute Runtime for oneAPI Level Zero and OpenCL™ Driver" url="https://github.com/intel/compute-runtime" arch="x86_64" license="MIT" depends_dev="intel-gmmlib-dev intel-graphics-compiler-dev libexecinfo-dev libva-dev" -makedepends="$depends_dev cmake" +makedepends="$depends_dev cmake samurai" subpackages="$pkgname-dev" source="https://github.com/intel/compute-runtime/archive/$pkgver/compute-runtime-$pkgver.tar.gz link-execinfo.patch @@ -22,22 +22,24 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - cmake -B build \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DSKIP_UNIT_TESTS=1 \ $CMAKE_CROSSOPTS . - nice make -C build -j"$(nproc)" + cmake --build build } package() { - make -C build DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } -sha512sums="e512e577a835dfe384b6187e687cadf663f7a4f5d720ed8df36c20e735083b99c5467f9ee2f0ceb12db6b4b0522e761f2dbeee2832ce7ccc03f5a520f72d790e compute-runtime-21.09.19150.tar.gz +sha512sums=" +9976d762e4851a48bb72e4c59ec4c557a02b34c959bd5c602eb31232d473501e6ea6fe925385a579df6a120537b1efde2c0bdc409c94b2b2072a14761b293973 compute-runtime-22.15.22905.tar.gz 5cf4bb4114ffc9940e20f3d3f21edb5b1e6f9157b38c4232cb16ff7fb52e36eedb26b008ed5801c257233375315a950e4e6e47756be01ca9787a1b6f42fbe369 link-execinfo.patch 855284aad45809046266e0def176f16f28dcd08154d39ffd2e34c92127f52da0f24a5679ec1d5005369f878a9947e69c21fd34cda31b636d04d055956b3cf06b pthread-yield.patch 5b63d5a480fa72353cf6229d77391163631cdb00e1ce444d75d3681128468726df9f74eb3b44eebd47d62fb2779a61d12d983ebe38902d063a7e54ea3347a52a remove-rtld-deepbind.patch -8ee0f776f06858cedaed0194618030eb7d0e27e27b7488daf975e3f6eb6df378461b93a300ecd68366ded2ec28d7c53ee35711e2c9cbe2c8634423bb03e9cf57 remove-select.patch" +8ee0f776f06858cedaed0194618030eb7d0e27e27b7488daf975e3f6eb6df378461b93a300ecd68366ded2ec28d7c53ee35711e2c9cbe2c8634423bb03e9cf57 remove-select.patch +" diff --git a/testing/intel-graphics-compiler/APKBUILD b/testing/intel-graphics-compiler/APKBUILD index 3da42be3129f2f53ab5fad8cef7aac75a51a7148..d759a0c8259dd8917ac790ee9fd78f204c63103d 100644 --- a/testing/intel-graphics-compiler/APKBUILD +++ b/testing/intel-graphics-compiler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dennis Krupenik <dennis@krupenik.com> # Maintainer: Dennis Krupenik <dennis@krupenik.com> pkgname=intel-graphics-compiler -pkgver=1.0.8744 +pkgver=1.0.10840 pkgrel=0 pkgdesc="Intel® Graphics Compiler for OpenCL™" url="https://github.com/intel/intel-graphics-compiler" @@ -9,12 +9,10 @@ arch="x86_64" license="MIT" _llvm_ver="11.1.0" depends_dev="opencl-clang-dev lld-dev~$_llvm_ver" -makedepends="$depends_dev bison cmake flex linux-headers lld-static~$_llvm_ver llvm-static~$_llvm_ver python3" +makedepends="$depends_dev bison cmake flex linux-headers lld-static~$_llvm_ver llvm-static~$_llvm_ver python3 samurai" subpackages="$pkgname-dev" source="https://github.com/intel/intel-graphics-compiler/archive/igc-$pkgver.tar.gz https://github.com/intel/vc-intrinsics/archive/9aafb518a05be160beffd7812a0f169c10786d04.zip - xsi_strerror_r.patch - remove-rtld-deepbind.patch " builddir="$srcdir/$pkgname-igc-$pkgver" options="!check" # no test suite upstream @@ -28,7 +26,7 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - cmake -B build \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -37,16 +35,14 @@ build() { -DINSTALL_SPIRVDLL=0 \ -Wno-dev \ $CMAKE_CROSSOPTS . - nice make -C build + cmake --build build } package() { - make -C build DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } sha512sums=" -dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539 igc-1.0.8744.tar.gz +268b118732a6e5828a13eddc396b38aef5e7b746f8db0786dce76323fadcfe2a64b0bac87b6557c5bb7ddb000ec31e08f7b2557acfa612d960516e93cec78c81 igc-1.0.10840.tar.gz 19b9c2926ab1c76f8ccc0bd406f1302df9250ce57dec9f5610adba15a5a1e736da6aaa51328df0c2a012db0c1b66ef9f4ee3a19ab9f54b0ecc9dfbef0d5d97ec 9aafb518a05be160beffd7812a0f169c10786d04.zip -6b1578b028140bd82c888c96e8b1d3d33b924b85657780c6214e24145d42c6965127b5faaea7a25bb0c919484ece9b9f40e714dab362ad5cf0cc064947aec694 xsi_strerror_r.patch -28c6ce539b81b5c9bf5dbe0d6ee7da31de144da4f320473bf9a190d6ba2e672001f15553248afa194414310ea5cefdf68c344bee74accdcc38ee96accf99822e remove-rtld-deepbind.patch " diff --git a/testing/intel-graphics-compiler/remove-rtld-deepbind.patch b/testing/intel-graphics-compiler/remove-rtld-deepbind.patch deleted file mode 100644 index 475f0a074ff9858ed65347a2bab8d60aa7a0484c..0000000000000000000000000000000000000000 --- a/testing/intel-graphics-compiler/remove-rtld-deepbind.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- intel-graphics-compiler-igc-1.0.8744/IGC/VectorCompiler/lib/Driver/SPIRVWrapper.cpp 2021-09-16 11:50:38.000000000 +0300 -+++ intel-graphics-compiler-igc-1.0.8744/IGC/VectorCompiler/lib/Driver/SPIRVWrapper.cpp 2021-10-03 15:30:08.879638251 +0300 -@@ -157,8 +157,7 @@ - const std::string SpirvLibPath = findSpirvDLL(); - #if defined(__linux__) - // Hack to workaround cmoc crashes during loading of SPIRV library -- static auto DeepBindHack = -- dlopen(SpirvLibPath.c_str(), RTLD_NOW | RTLD_DEEPBIND); -+ static auto DeepBindHack = dlopen(SpirvLibPath.c_str(), RTLD_NOW); - #endif // __linux__ - - std::string ErrMsg; diff --git a/testing/intel-graphics-compiler/xsi_strerror_r.patch b/testing/intel-graphics-compiler/xsi_strerror_r.patch deleted file mode 100644 index 6b32764e5b5a1ff7179b7775f8c7934d37014ded..0000000000000000000000000000000000000000 --- a/testing/intel-graphics-compiler/xsi_strerror_r.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- intel-graphics-compiler-igc-1.0.8744/visa/iga/IGALibrary/system.cpp 2021-09-16 11:50:38.000000000 +0300 -+++ intel-graphics-compiler-igc-1.0.8744/visa/iga/IGALibrary/system.cpp 2021-10-03 14:59:08.779865094 +0300 -@@ -246,9 +246,8 @@ - { - std::string msg; - char buf[256] {0}; -- char *errMsg = nullptr; -+ char *errMsg = &buf[0]; - #ifdef _WIN32 -- errMsg = &buf[0]; - FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, -@@ -260,9 +259,9 @@ - if (errMsg) - msg = errMsg; - #else -- errMsg = strerror_r(errCode, buf, sizeof(buf)); -+ strerror_r(errCode, buf, sizeof(buf)); - #endif // _WIN32 -- if (errMsg == nullptr || errMsg[0] == 0) -+ if (errMsg[0] == 0) - return "???"; - return std::string(errMsg); - }