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

[Bruno Pagani]

    Date: Saturday, November 14, 2020 @ 22:35:12
  Author: archange
Revision: 754219

upgpkg: intel-graphics-compiler 1:1.0.5435-1

Also enable building VC against system spirv-llvm-translator.

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

--------------------------------------+
 PKGBUILD                             |   19 +++++--------------
 intel-graphics-compiler-llvm11.patch |   21 ---------------------
 2 files changed, 5 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 22:23:26 UTC (rev 754218)
+++ PKGBUILD	2020-11-14 22:35:12 UTC (rev 754219)
@@ -3,8 +3,8 @@
 
 pkgname=intel-graphics-compiler
 epoch=1
-pkgver=1.0.5353
-pkgrel=2
+pkgver=1.0.5435
+pkgrel=1
 pkgdesc="Intel Graphics Compiler for OpenCL"
 arch=(x86_64)
 url="https://github.com/intel/intel-graphics-compiler"
@@ -13,19 +13,10 @@
 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'
+        git+https://github.com/intel/vc-intrinsics.git#commit=eabcd2022cf868a658b257b8ea6ad62acbbe7dc5)
+sha256sums=('9dec70f57a7a65e8f8e041f72d4c50fe3f4bb3bef205e5173a3e1d8031176d55'
             'SKIP')
 
-prepare() {
-    cd ${pkgname}-igc-${pkgver}
-    patch -Np1 -i ../${pkgname}-llvm11.patch
-}
-
 build() {
     cmake -B build -S ${pkgname}-igc-${pkgver} \
         -DCMAKE_BUILD_TYPE=Release \
@@ -34,7 +25,7 @@
         -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
         -DIGC_PREFERRED_LLVM_VERSION='11.0.0' \
         -DVC_INTRINSICS_SRC="${srcdir}/vc-intrinsics" \
-        -DSPIRV_SRC="${srcdir}/SPIRV-LLVM-Translator" \
+        -DINSTALL_SPIRVDLL=0 \
         -DINSTALL_GENX_IR=ON \
         -Wno-dev
     make -C build

Deleted: intel-graphics-compiler-llvm11.patch
===================================================================
--- intel-graphics-compiler-llvm11.patch	2020-11-14 22:23:26 UTC (rev 754218)
+++ intel-graphics-compiler-llvm11.patch	2020-11-14 22:35:12 UTC (rev 754219)
@@ -1,21 +0,0 @@
-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());