[arch-commits] Commit in intel-graphics-compiler/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun May 30 04:25:39 UTC 2021
Date: Sunday, May 30, 2021 @ 04:25:38
Author: foutrelis
Revision: 950338
upgpkg: intel-graphics-compiler 1:1.0.7423-2: tweak LLVM 12 patch
Mainly to substitute replaceAndRecursivelySimplify for
recursivelySimplifyInstruction instead of dropping it.
Modified:
intel-graphics-compiler/trunk/PKGBUILD
intel-graphics-compiler/trunk/more-build-fixes-for-LLVM-12.patch
------------------------------------+
PKGBUILD | 4 -
more-build-fixes-for-LLVM-12.patch | 84 +++++++++++++----------------------
2 files changed, 35 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-30 04:07:23 UTC (rev 950337)
+++ PKGBUILD 2021-05-30 04:25:38 UTC (rev 950338)
@@ -4,7 +4,7 @@
pkgname=intel-graphics-compiler
epoch=1
pkgver=1.0.7423
-pkgrel=1
+pkgrel=2
pkgdesc="Intel Graphics Compiler for OpenCL"
arch=(x86_64)
url="https://github.com/intel/intel-graphics-compiler"
@@ -19,7 +19,7 @@
sha256sums=('4213710fcb5a299a1fc4c7429375312f7875b9efab2323e6e180ba908ba4cb00'
'SKIP'
'c464562f2bc6a5434ab33a5799062c0459fa81b2d7e79df015d003266dc850d0'
- '0ab3dfa84c2f67aad99f086c3d0b2abba0be86a4a80a75883cf4e89282b166ce')
+ 'e569141114bdd38a74ea4913a68c1b9718b7c028f9ae11fbbe2754fef7060436')
prepare() {
cd ${pkgname}-igc-${pkgver}
Modified: more-build-fixes-for-LLVM-12.patch
===================================================================
--- more-build-fixes-for-LLVM-12.patch 2021-05-30 04:07:23 UTC (rev 950337)
+++ more-build-fixes-for-LLVM-12.patch 2021-05-30 04:25:38 UTC (rev 950338)
@@ -1,6 +1,6 @@
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp intel-graphics-compiler-igc-1.0.7423/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp 2021-05-29 19:46:18.959672182 +0000
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp 2021-05-30 03:58:49.407617885 +0000
@@ -7,6 +7,9 @@ SPDX-License-Identifier: MIT
============================= end_copyright_notice ===========================*/
@@ -12,8 +12,8 @@
#include "Compiler/CodeGenPublic.h"
#include "Compiler/IGCPassSupport.h"
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp 2021-05-29 19:47:25.133584902 +0000
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp 2021-05-30 03:58:49.410951420 +0000
@@ -78,7 +78,7 @@ static std::string legalizeName(std::str
bool VC_IGCShaderOverrider::override(void *&GenXBin, int &GenXBinSize,
llvm::StringRef ShaderName,
@@ -24,27 +24,22 @@
bool Status = false;
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp 2021-05-29 19:41:52.560572042 +0000
-@@ -287,6 +287,7 @@ BasicBlock *GenXCFSimplification::proces
- Value *V = Phi->getIncomingValueForBlock(BB);
- Phi->replaceAllUsesWith(V);
- Phi->eraseFromParent();
-+#if LLVM_VERSION_MAJOR < 12
- // Having got rid of the phi, it is worth running instruction
- // simplification on each use. Specifically, this turns the
- // P3 = (P1 & P2) | (P1 & ~P2) at the endif of an if that
-@@ -308,6 +309,7 @@ BasicBlock *GenXCFSimplification::proces
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp 2021-05-30 04:15:43.651839453 +0000
+@@ -301,8 +301,8 @@ BasicBlock *GenXCFSimplification::proces
+ while (Restart) {
+ Restart = false;
+ for (auto ui = I->use_begin(), ue = I->use_end(); ui != ue; ++ui)
+- if (recursivelySimplifyInstruction(
+- cast<Instruction>(ui->getUser()))) {
++ if (replaceAndRecursivelySimplify(
++ cast<Instruction>(ui->getUser()), nullptr)) {
+ Restart = true;
+ break;
}
- }
- }
-+#endif
- } else {
- unsigned PredIdx = Phi->getBasicBlockIndex(Pred);
- unsigned BBIdx = Phi->getBasicBlockIndex(BB);
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp 2021-05-29 19:45:43.667584219 +0000
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp 2021-05-30 03:58:49.410951420 +0000
@@ -94,12 +94,20 @@ void GenXSubtarget::resetSubtargetFeatur
if (CPUName.empty())
CPUName = "generic";
@@ -69,8 +64,8 @@
resetSubtargetFeatures(CPU, FS);
}
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h 2021-05-29 19:44:41.143882881 +0000
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h 2021-05-30 03:58:49.410951420 +0000
@@ -139,7 +139,11 @@ public:
// ParseSubtargetFeatures - Parses features string setting specified
@@ -85,8 +80,8 @@
// \brief Reset the features for the GenX target.
void resetSubtargetFeatures(StringRef CPU, StringRef FS);
diff -upr intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp
---- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp 2021-05-29 19:24:45.000000000 +0000
-+++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp 2021-05-29 19:29:33.047199164 +0000
+--- intel-graphics-compiler-igc-1.0.7423.orig/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp 2021-05-30 03:57:50.000000000 +0000
++++ intel-graphics-compiler-igc-1.0.7423/IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp 2021-05-30 04:12:27.043415543 +0000
@@ -136,16 +136,6 @@ CallInst* INT_MIN_REDUCE(Value *Src, boo
return IRB()->CreateIntMinReduce(Src, IsSigned);
}
@@ -104,40 +99,27 @@
CallInst* LIFETIME_START(Value *Ptr, ConstantInt *Size = nullptr)
{
return IRB()->CreateLifetimeStart(Ptr, Size);
-@@ -181,36 +171,6 @@ CallInst* ASSUMPTION(Value *Cond)
- return IRB()->CreateAssumption(Cond);
+@@ -186,11 +176,6 @@ CallInst* GC_STATEPOINT_CALL(uint64_t ID
+ return IRB()->CreateGCStatepointCall(ID, NumPatchBytes, ActualCallee, CallArgs, DeoptArgs, GCArgs, Name);
}
--CallInst* GC_STATEPOINT_CALL(uint64_t ID, uint32_t NumPatchBytes, Value *ActualCallee, ArrayRef<Value *> CallArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
--{
-- return IRB()->CreateGCStatepointCall(ID, NumPatchBytes, ActualCallee, CallArgs, DeoptArgs, GCArgs, Name);
--}
--
-CallInst* GC_STATEPOINT_CALL(uint64_t ID, uint32_t NumPatchBytes, Value *ActualCallee, uint32_t Flags, ArrayRef<Use> CallArgs, ArrayRef<Use> TransitionArgs, ArrayRef<Use> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
-{
- return IRB()->CreateGCStatepointCall(ID, NumPatchBytes, ActualCallee, Flags, CallArgs, TransitionArgs, DeoptArgs, GCArgs, Name);
-}
-
--CallInst* GC_STATEPOINT_CALL(uint64_t ID, uint32_t NumPatchBytes, Value *ActualCallee, ArrayRef<Use> CallArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
--{
-- return IRB()->CreateGCStatepointCall(ID, NumPatchBytes, ActualCallee, CallArgs, DeoptArgs, GCArgs, Name);
--}
--
--InvokeInst* GC_STATEPOINT_INVOKE(uint64_t ID, uint32_t NumPatchBytes, Value *ActualInvokee, BasicBlock *NormalDest, BasicBlock *UnwindDest, ArrayRef<Value *> InvokeArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
--{
-- return IRB()->CreateGCStatepointInvoke(ID, NumPatchBytes, ActualInvokee, NormalDest, UnwindDest, InvokeArgs, DeoptArgs, GCArgs, Name);
--}
--
+ CallInst* GC_STATEPOINT_CALL(uint64_t ID, uint32_t NumPatchBytes, Value *ActualCallee, ArrayRef<Use> CallArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
+ {
+ return IRB()->CreateGCStatepointCall(ID, NumPatchBytes, ActualCallee, CallArgs, DeoptArgs, GCArgs, Name);
+@@ -201,11 +186,6 @@ InvokeInst* GC_STATEPOINT_INVOKE(uint64_
+ return IRB()->CreateGCStatepointInvoke(ID, NumPatchBytes, ActualInvokee, NormalDest, UnwindDest, InvokeArgs, DeoptArgs, GCArgs, Name);
+ }
+
-InvokeInst* GC_STATEPOINT_INVOKE(uint64_t ID, uint32_t NumPatchBytes, Value *ActualInvokee, BasicBlock *NormalDest, BasicBlock *UnwindDest, uint32_t Flags, ArrayRef<Use> InvokeArgs, ArrayRef<Use> TransitionArgs, ArrayRef<Use> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
-{
- return IRB()->CreateGCStatepointInvoke(ID, NumPatchBytes, ActualInvokee, NormalDest, UnwindDest, Flags, InvokeArgs, TransitionArgs, DeoptArgs, GCArgs, Name);
-}
-
--InvokeInst* GC_STATEPOINT_INVOKE(uint64_t ID, uint32_t NumPatchBytes, Value *ActualInvokee, BasicBlock *NormalDest, BasicBlock *UnwindDest, ArrayRef<Use> InvokeArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
--{
-- return IRB()->CreateGCStatepointInvoke(ID, NumPatchBytes, ActualInvokee, NormalDest, UnwindDest, InvokeArgs, DeoptArgs, GCArgs, Name);
--}
--
- CallInst* GC_RESULT(Instruction *Statepoint, Type *ResultType, const Twine &Name = "")
+ InvokeInst* GC_STATEPOINT_INVOKE(uint64_t ID, uint32_t NumPatchBytes, Value *ActualInvokee, BasicBlock *NormalDest, BasicBlock *UnwindDest, ArrayRef<Use> InvokeArgs, ArrayRef<Value *> DeoptArgs, ArrayRef<Value *> GCArgs, const Twine &Name = "")
{
- return IRB()->CreateGCResult(Statepoint, ResultType, Name);
+ return IRB()->CreateGCStatepointInvoke(ID, NumPatchBytes, ActualInvokee, NormalDest, UnwindDest, InvokeArgs, DeoptArgs, GCArgs, Name);
More information about the arch-commits
mailing list