[arch-commits] Commit in intel-graphics-compiler/trunk (2 files)

[Bruno Pagani via arch-commits]

    Date: Monday, November 2, 2020 @ 18:57:56
  Author: archange
Revision: 740077

Add better fix for LLVM11 compat

Added:
  intel-graphics-compiler/trunk/intel-graphics-compiler-llvm11.patch
Modified:
  intel-graphics-compiler/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |    6 ++++--
 intel-graphics-compiler-llvm11.patch |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-11-02 18:55:12 UTC (rev 740076)
+++ PKGBUILD    2020-11-02 18:57:56 UTC (rev 740077)
@@ -4,7 +4,7 @@
 pkgname=intel-graphics-compiler
 epoch=1
 pkgver=1.0.5353
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel Graphics Compiler for OpenCL"
 arch=(x86_64)
 url="https://github.com/intel/intel-graphics-compiler";
@@ -13,15 +13,17 @@
 makedepends=(git cmake clang llvm python)
 options=(!emptydirs)
 source=(${url}/archive/igc-${pkgver}.tar.gz
+        ${pkgname}-llvm11.patch
         
git+https://github.com/intel/vc-intrinsics.git#commit=eabcd2022cf868a658b257b8ea6ad62acbbe7dc5
         
git+https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git#commit=d6dc999eee381158a26f048a333467c9ce7e77f2)
 sha256sums=('8a7ebe4498b4777c55837ffbea75d2cff367fb31e1eeb44fbbe307fdb7cf26d6'
+            '5bdfb2a71b388e1b24387e07aa7e1906e9dbdcb52e5e4d8a1a417f7360b6a0bb'
             'SKIP'
             'SKIP')
 
 prepare() {
     cd ${pkgname}-igc-${pkgver}
-    sed -i 's|-Werror||g' IGC/CMakeLists.txt
+    patch -Np1 -i ../${pkgname}-llvm11.patch
 }
 
 build() {

Added: intel-graphics-compiler-llvm11.patch
===================================================================
--- intel-graphics-compiler-llvm11.patch                                (rev 0)
+++ intel-graphics-compiler-llvm11.patch        2020-11-02 18:57:56 UTC (rev 
740077)
@@ -0,0 +1,21 @@
+diff --git a/IGC/Compiler/CustomSafeOptPass.cpp 
b/IGC/Compiler/CustomSafeOptPass.cpp
+--- a/IGC/Compiler/CustomSafeOptPass.cpp
++++ b/IGC/Compiler/CustomSafeOptPass.cpp
+@@ -2320,7 +2320,7 @@ void 
GenSpecificPattern::visitBinaryOperator(BinaryOperator& I)
+                 }
+ 
+                 llvm::IRBuilder<> builder(&I);
+-                VectorType* vec4 = VectorType::get(builder.getInt8Ty(), 4);
++                VectorType* vec4 = 
IGCLLVM::FixedVectorType::get(builder.getInt8Ty(), 4);
+                 Value* BC = builder.CreateBitCast(AndSrc, vec4);
+                 Value* EE = builder.CreateExtractElement(BC, 
builder.getInt32(newIndex));
+                 Value* Zext = builder.CreateZExt(EE, builder.getInt32Ty());
+@@ -2372,7 +2372,7 @@ void 
GenSpecificPattern::visitBinaryOperator(BinaryOperator& I)
+             }
+ 
+             llvm::IRBuilder<> builder(&I);
+-            VectorType* vec2 = VectorType::get(builder.getInt16Ty(), 2);
++            VectorType* vec2 = 
IGCLLVM::FixedVectorType::get(builder.getInt16Ty(), 2);
+             Value* BC = builder.CreateBitCast(AShrSrc, vec2);
+             Value* EE = builder.CreateExtractElement(BC, 
builder.getInt32(newIndex));
+             Value* Sext = builder.CreateSExt(EE, builder.getInt32Ty());