Commit 1518233b authored by Dennis Krupenik's avatar Dennis Krupenik

testing/intel-graphics-compiler: upgrade to 1.0.6712

parent 6f05b3fe
Pipeline #76788 failed with stages
in 3 minutes and 32 seconds
# Contributor: Dennis Krupenik <dennis@krupenik.com>
# Maintainer: Dennis Krupenik <dennis@krupenik.com>
pkgname=intel-graphics-compiler
pkgver=1.0.6410
pkgver=1.0.6712
pkgrel=0
pkgdesc="Intel® Graphics Compiler for OpenCL™"
url="https://github.com/intel/intel-graphics-compiler"
arch="x86_64"
license="MIT"
depends_dev="opencl-clang-dev"
_llvm_ver="10.0.1"
_llvm_ver="11.1.0"
makedepends="$depends_dev bison cmake flex linux-headers llvm-static~$_llvm_ver python3"
subpackages="$pkgname-dev"
source="https://github.com/intel/intel-graphics-compiler/archive/igc-$pkgver.tar.gz
https://github.com/intel/vc-intrinsics/archive/77974f5a32e19475125531483bede9ee23935257.zip
portable-compiler-concat.patch
https://github.com/intel/vc-intrinsics/archive/6713229fd8947f4cf200f675d22fb7e9997fa261.zip
remove-rtld-deepbind.patch
build-with-llvm11.patch
"
builddir="$srcdir/$pkgname-igc-$pkgver"
options="!check" # no test suite upstream
......@@ -32,8 +32,8 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DIGC_OPTION__FORCE_SYSTEM_LLVM=1 \
-DIGC_PREFERRED_LLVM_VERSION=$_llvm_ver \
-DIGC_OPTION__LLVM_FROM_SYSTEM=1 \
-DIGC_OPTION__LLVM_PREFERRED_VERSION=$_llvm_ver \
-DINSTALL_SPIRVDLL=0 \
-Wno-dev \
$CMAKE_CROSSOPTS .
......@@ -44,7 +44,7 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
sha512sums="31f851849b8636d5ab41a3f451c6bd41a054507e27e4e993ddd37567638e6d3e964c4bcf5afeeccfb130743b1af95062c345638b2116b1ea3b16aa31d41531b6 igc-1.0.6410.tar.gz
b5f3bec768ba8f02cb577d7426f0f7a7e55daad095dbf74cd8b378562ef5f4c0cb1f40edf50fa31197907c0cd81696d70c6fbdd12e50562ef2587df973945dac 77974f5a32e19475125531483bede9ee23935257.zip
da8430649519f5f55e09175bacbb817321dfca9403dd49c93a14cbfd55b512a7d4da6659cd63a02787345104dbcad001cc5fea7c4c3a23f30539c1dbcce2f4b0 portable-compiler-concat.patch
dd91fcfad005d4db01dbda61a4954ecc3ab9b734e3434f9c62c252b5ed64eced85c7af051cb00b8085cdfd8a04b537052467a4c9239ed6a13911666ed8f886f8 remove-rtld-deepbind.patch"
sha512sums="096b8defed7eada0a1c3c3efa792cb6fcdfee47c20dba2852709b02c9d73591c00a6228908230fe398941a50417696c1295be3a7d7047be60294173cab6ea370 igc-1.0.6712.tar.gz
605694cbf4e88c71d51ccf16a82177e5fdfb3dcceb18720924f0d1ed7ac0896936d16c173402cafa5b478335ca120eb951825d0b1fcc539157808446d9301367 6713229fd8947f4cf200f675d22fb7e9997fa261.zip
eb469f871d360dc3cba3bc0e0e963c44920f26d973b3b7cf18b5d5addede2c9a306611b4eb5c4cf13425b5419f47ce134a441482b6554f6a08fddd8b3177886a remove-rtld-deepbind.patch
d3598b4d8e9a77702af9d61e4777535a29d1ae9c495e5c7bb6c7931d29f4eee731d59231415b32c8cb6504d4ebbdddb456b284cbe2e74326172330b46e662772 build-with-llvm11.patch"
--- a/IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp 2021-03-13 16:06:34.000000000 +0200
+++ b/IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp 2021-03-23 00:21:30.279680188 +0200
@@ -153,12 +153,12 @@
// In OGL there are uses of ldmcs other then ldms, using vec4float type.
// Fix them to use newly created 16bit ldmcs.
if (ldmcs->getType()->isVectorTy() &&
- ldmcs->getType()->getVectorElementType()->isFloatTy())
+ ldmcs->getType()->getElementType()->isFloatTy())
{
m_builder->SetInsertPoint(ldmcs);
- uint ldmcsNumOfElements = ldmcs->getType()->getVectorNumElements();
- uint new_mcs_callNumOfElements = new_mcs_call->getType()->getVectorNumElements();
+ ElementCount ldmcsNumOfElements = ldmcs->getType()->getElementCount();
+ ElementCount new_mcs_callNumOfElements = new_mcs_call->getType()->getElementCount();
// vec of 16bit ints to vec of 32bit ints
Type* new_mcs_callVecType = VectorType::get(m_builder->getInt32Ty(), new_mcs_callNumOfElements);
make __CONCAT portable
Upstream: Yes, https://github.com/intel/intel-graphics-compiler/pull/138
---
--- a/inc/common/UFO/portable_compiler.h
+++ b/inc/common/UFO/portable_compiler.h
@@ -125,9 +125,10 @@
/* compile-time ASSERT */
#ifndef C_ASSERT
- #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 )
- #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ )
+ #define __CONCATING( a1, a2 ) a1 ## a2
+ #define __UNIQUENAME( a1, a2 ) __CONCATING( a1, a2 )
+ #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ )
#define C_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1]
#endif
RTLD_DEEPBIND is a glibc thing
---
--- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXWrapper.cpp
+++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXWrapper.cpp
@@ -123,8 +123,7 @@
--- a/IGC/VectorCompiler/lib/GenXCodeGen/SPIRVWrapper.cpp 2021-03-08 08:23:56.000000000 +0200
+++ b/IGC/VectorCompiler/lib/GenXCodeGen/SPIRVWrapper.cpp 2021-03-22 12:05:17.833078922 +0200
@@ -174,8 +174,7 @@
const std::string SpirvLibPath = findSpirvDLL();
#if defined(__linux__)
// Hack to workaround cmoc crashes during loading of SPIRV library
......@@ -11,4 +9,4 @@ RTLD_DEEPBIND is a glibc thing
+ static auto DeepBindHack = dlopen(SpirvLibPath.c_str(), RTLD_NOW);
#endif // __linux__
using DL = sys::DynamicLibrary;
std::string ErrMsg;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment