cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r562197 

devel/intel-graphics-compiler: improve llvm11 support after r556179
This commit is contained in:
Jan Beich 2021-01-21 11:58:31 +00:00
parent f5b17bbe9e
commit 978c425f8a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=562198
3 changed files with 62 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/intel-graphics-compiler/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= intel-graphics-compiler
DISTVERSIONPREFIX= igc-
DISTVERSION= 1.0.5884
PORTREVISION= 1
CATEGORIES= devel
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

61
devel/intel-graphics-compiler/files/patch-llvm11
View File

@ -1,3 +1,40 @@
https://github.com/intel/intel-graphics-compiler/issues/155
In file included from IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp:38:
In file included from IGC/VectorCompiler/lib/GenXOpts/CMPacketize/PacketBuilder.h:40:
IGC/WrapperLLVM/include/llvmWrapper/Support/Alignment.h:99:16: error: no viable conversion from returned value of type 'llvm::MaybeAlign' to function return type 'IGCLLVM::Align' (aka 'llvm::Align')
return Val.getAlign();
^~~~~~~~~~~~~~
IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp:279:37: note: in instantiation of function template specialization 'IGCLLVM::getAlign<llvm::Function, 0>' requested here
ClonedFunc->setAlignment(IGCLLVM::getAlign(*F));
^
/usr/local/llvm11/include/llvm/Support/Alignment.h:71:13: note: candidate constructor not viable: no known conversion from 'llvm::MaybeAlign' to 'const llvm::Align &' for 1st argument
constexpr Align(const Align &Other) = default;
^
/usr/local/llvm11/include/llvm/Support/Alignment.h:72:13: note: candidate constructor not viable: no known conversion from 'llvm::MaybeAlign' to 'llvm::Align &&' for 1st argument
constexpr Align(Align &&Other) = default;
^
/usr/local/llvm11/include/llvm/Support/Alignment.h:109:13: note: candidate constructor not viable: no known conversion from 'llvm::MaybeAlign' to 'llvm::Align::LogValue' for 1st argument
constexpr Align(LogValue CA) : ShiftValue(CA.Log) {}
^
/usr/local/llvm11/include/llvm/Support/Alignment.h:76:12: note: explicit constructor is not a candidate
explicit Align(uint64_t Value) {
^
IGC/Compiler/CISACodeGen/ResolveGAS.cpp:83:28: error: use of undeclared identifier 'AAResultsWrapperPass'
AU.addRequired<AAResultsWrapperPass>();
^
IGC/Compiler/CISACodeGen/ResolveGAS.cpp:735:5: error: unknown type name 'AliasAnalysis'
AliasAnalysis* AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
^
IGC/Compiler/CISACodeGen/ResolveGAS.cpp:735:38: error: use of undeclared identifier 'AAResultsWrapperPass'
AliasAnalysis* AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
^
IGC/Compiler/CISACodeGen/ResolveGAS.cpp:810:27: error: use of undeclared identifier 'MemoryLocation'; did you mean 'TempDILocation'?
if (AA->alias(MemoryLocation::get(SI), MemoryLocation::get(LI))) {
^~~~~~~~~~~~~~
IGC/Compiler/CISACodeGen/ResolveGAS.cpp:810:52: error: use of undeclared identifier 'MemoryLocation'; did you mean 'TempDILocation'?
if (AA->alias(MemoryLocation::get(SI), MemoryLocation::get(LI))) {
^~~~~~~~~~~~~~
IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp:2148:16: error: call to 'invertCondition' is ambiguous
Mask = invertCondition(Mask);
^~~~~~~~~~~~~~~
@ -17,6 +54,16 @@ IGC/VectorCompiler/lib/GenXCodeGen/GenXThreadPrivateMemory.cpp:462:37: error: no
NewVec1, NewVec2, ShuffleVec->getMask(), ShuffleVec->getName() + ".tpm");
~~~~~~~~~~ ^
--- IGC/Compiler/CISACodeGen/ResolveGAS.cpp.orig 2020-12-12 06:01:51 UTC
+++ IGC/Compiler/CISACodeGen/ResolveGAS.cpp
@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <llvm/ADT/DenseSet.h>
#include <llvm/ADT/SmallVector.h>
#include <llvm/ADT/PostOrderIterator.h>
+#include <llvm/Analysis/AliasAnalysis.h>
#include <llvm/Analysis/LoopInfo.h>
#include <llvm/IR/IRBuilder.h>
#include <llvm/IR/NoFolder.h>
--- IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp.orig 2020-12-12 06:01:51 UTC
+++ IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp
@@ -2145,7 +2145,7 @@ static bool mergeToWrRegion(SelectInst *SI) {
@ -51,3 +98,17 @@ IGC/VectorCompiler/lib/GenXCodeGen/GenXThreadPrivateMemory.cpp:462:37: error: no
NewShuffleVec->insertAfter(ShuffleVec);
auto CastToOldTy =
--- IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp.orig 2020-12-12 06:01:51 UTC
+++ IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp
@@ -276,7 +276,11 @@ Function *GenXPacketize::vectorizeSIMTFunction(Functio
VecFName + Suffix[Width / 8], F->getParent());
ClonedFunc->setCallingConv(F->getCallingConv());
ClonedFunc->setAttributes(F->getAttributes());
+#if LLVM_VERSION_MAJOR < 11
ClonedFunc->setAlignment(IGCLLVM::getAlign(*F));
+#else
+ ClonedFunc->setAlignment(F->getAlign());
+#endif
// then use CloneFunctionInto
ValueToValueMapTy ArgMap;

362
devel/intel-graphics-compiler/files/patch-revert
View File

@ -1,362 +0,0 @@
https://github.com/intel/intel-graphics-compiler/issues/155
--- IGC/Compiler/CISACodeGen/ResolveGAS.cpp.orig 2020-12-01 09:02:30 UTC
+++ IGC/Compiler/CISACodeGen/ResolveGAS.cpp
@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "llvm/Support/Debug.h"
#include "llvmWrapper/IR/Constant.h"
#include <llvm/ADT/DenseSet.h>
-#include <llvm/ADT/SmallVector.h>
#include <llvm/ADT/PostOrderIterator.h>
#include <llvm/Analysis/LoopInfo.h>
#include <llvm/IR/IRBuilder.h>
@@ -80,8 +79,6 @@ namespace {
void getAnalysisUsage(AnalysisUsage& AU) const override {
AU.setPreservesCFG();
AU.addRequired<LoopInfoWrapperPass>();
- AU.addRequired<AAResultsWrapperPass>();
- AU.addRequired<MetaDataUtilsWrapper>();
}
bool isResolvableLoopPHI(PHINode* PN) const {
@@ -92,17 +89,11 @@ namespace {
bool resolveOnFunction(Function*) const;
bool resolveOnBasicBlock(BasicBlock*) const;
- bool resolveMemoryFromHost(Function&) const;
-
void populateResolvableLoopPHIs();
void populateResolvableLoopPHIsForLoop(const Loop*);
bool isAddrSpaceResolvable(PHINode* PN, const Loop* L,
BasicBlock* BackEdge) const;
-
- bool checkGenericArguments(Function& F) const;
- void convertLoadToGlobal(LoadInst* LI) const;
- bool isLoadGlobalCandidate(LoadInst* LI) const;
};
class GASPropagator : public InstVisitor<GASPropagator, bool> {
@@ -157,8 +148,6 @@ namespace IGC {
IGC_INITIALIZE_PASS_BEGIN(GASResolving, PASS_FLAG, PASS_DESC, PASS_CFG_ONLY,
PASS_ANALYSIS)
IGC_INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapperPass)
- IGC_INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
- IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
IGC_INITIALIZE_PASS_END(GASResolving, PASS_FLAG, PASS_DESC, PASS_CFG_ONLY,
PASS_ANALYSIS)
}
@@ -169,8 +158,6 @@ bool GASResolving::runOnFunction(Function& F) {
IRB = &TheBuilder;
Propagator = &ThePropagator;
- resolveMemoryFromHost(F);
-
populateResolvableLoopPHIs();
bool Changed = false;
@@ -716,177 +703,5 @@ bool GASPropagator::visitCallInst(CallInst& I) {
return true;
}
- return false;
-}
-
-bool GASResolving::resolveMemoryFromHost(Function& F) const {
- MetaDataUtils* pMdUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
-
- // skip all non-entry functions
- if (!isEntryFunc(pMdUtils, &F))
- return false;
-
- // early check in order not to iterate whole function
- if (!checkGenericArguments(F))
- return false;
-
- SmallVector<StoreInst*, 32> Stores;
- SmallVector<LoadInst*, 32> Loads;
- AliasAnalysis* AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
-
- // collect load candidates and in parallel check for unsafe instructions
- // visitor may be a more beautiful way to do this
- bool HasASCast = false; // if there exists addrspace cast from non global/generic space
- bool HasPtoi = false; // if there exists ptrtoint with global/generic space
- for (BasicBlock& B : F) {
- for (Instruction& I : B) {
- if (auto LI = dyn_cast<LoadInst>(&I)) {
- if (isLoadGlobalCandidate(LI)) {
- Loads.push_back(LI);
- }
- }
- else if (auto CI = dyn_cast<CallInst>(&I)) {
- if (CI->onlyReadsMemory())
- continue;
-
- // currently recognize only these ones
- // in fact intrinsics should be marked as read-only
- if (auto II = dyn_cast<IntrinsicInst>(CI)) {
- if (II->getIntrinsicID() == Intrinsic::lifetime_start ||
- II->getIntrinsicID() == Intrinsic::lifetime_end)
- continue;
- }
-
- // if we have an unsafe call in the kernel, abort
- // to improve we can collect arguments of writing calls as memlocations for alias analysis
- return false;
- }
- else if (auto PI = dyn_cast<PtrToIntInst>(&I)) {
- // if we have a ptrtoint we need to check data flow which we don't want to
- if (PI->getPointerAddressSpace() != ADDRESS_SPACE_GLOBAL &&
- PI->getPointerAddressSpace() != ADDRESS_SPACE_GENERIC)
- return false;
- else {
- HasPtoi = true;
- }
-
- return false;
- }
- else if (auto AI = dyn_cast<AddrSpaceCastInst>(&I)) {
- if (AI->getSrcAddressSpace() != ADDRESS_SPACE_GLOBAL &&
- AI->getSrcAddressSpace() != ADDRESS_SPACE_GENERIC) {
- HasASCast = true;
- }
- }
- else if (auto SI = dyn_cast<StoreInst>(&I)) {
- Value* V = SI->getValueOperand();
- if (isa<PointerType>(V->getType())) {
- // this store can potentially write non-global pointer to memory
- Stores.push_back(SI);
- }
- }
- else if (I.mayWriteToMemory()) {
- // unsupported instruction poisoning memory
- return false;
- }
- }
- }
- if (HasASCast && HasPtoi)
- return false;
-
- if (Loads.empty())
- return false;
-
- bool Changed = false;
- while (!Loads.empty())
- {
- LoadInst* LI = Loads.pop_back_val();
-
- // check that we don't have aliasing stores for this load
- // we expect to have basic and addrspace AA available at the moment
- // on optimization phase
- bool aliases = false;
- for (auto SI : Stores) {
- if (AA->alias(MemoryLocation::get(SI), MemoryLocation::get(LI))) {
- aliases = true;
- break;
- }
- }
- if (aliases)
- continue;
-
- convertLoadToGlobal(LI);
- Changed = true;
- }
- return Changed;
-}
-
-bool GASResolving::isLoadGlobalCandidate(LoadInst* LI) const {
- // first check that loaded address has generic address space
- // otherwise it is not our candidate
- PointerType* PtrTy = dyn_cast<PointerType>(LI->getType());
- if (!PtrTy || PtrTy->getAddressSpace() != ADDRESS_SPACE_GENERIC)
- return false;
-
- // next check that it is a load from function argument + offset
- // which is necessary to prove that this address has global addrspace
- Value* LoadBase = LI->getPointerOperand()->stripInBoundsOffsets();
- // WA for gep not_inbounds base, 0, 0 that is not handled in stripoffsets
- LoadBase = LoadBase->stripPointerCasts();
- if (!isa<Argument>(LoadBase))
- return false;
-
- // don't want to process cases when argument is from local address space
- auto LoadTy = cast<PointerType>(LoadBase->getType());
- if (LoadTy->getAddressSpace() != ADDRESS_SPACE_GLOBAL)
- return false;
-
- // TODO: skip cases that have been fixed on previous traversals
-
- return true;
-}
-
-void GASResolving::convertLoadToGlobal(LoadInst* LI) const {
- // create two addressspace casts: generic -> global -> generic
- // the next scalar phase of this pass will propagate global to all uses of the load
-
- PointerType* PtrTy = cast<PointerType>(LI->getType());
- IRB->SetInsertPoint(LI->getNextNode());
- PointerType* GlobalPtrTy = PointerType::get(PtrTy->getElementType(), ADDRESS_SPACE_GLOBAL);
- Value* GlobalAddr = IRB->CreateAddrSpaceCast(LI, GlobalPtrTy);
- Value* GenericCopyAddr = IRB->CreateAddrSpaceCast(GlobalAddr, PtrTy);
-
- for (auto UI = LI->use_begin(), UE = LI->use_end(); UI != UE; /*EMPTY*/) {
- Use& U = *UI++;
- if (U.getUser() == GlobalAddr)
- continue;
- U.set(GenericCopyAddr);
- }
-}
-
-bool GASResolving::checkGenericArguments(Function& F) const {
- // check that we have a pointer to pointer or pointer to struct that has pointer elements
- // and main pointer type is global while underlying pointer type is generic
-
- auto* FT = F.getFunctionType();
- for (unsigned p = 0; p < FT->getNumParams(); ++p) {
- if (auto Ty = dyn_cast<PointerType>(FT->getParamType(p))) {
- if (Ty->getAddressSpace() != ADDRESS_SPACE_GLOBAL)
- continue;
- auto PteeTy = Ty->getElementType();
- if (auto PTy = dyn_cast<PointerType>(PteeTy)) {
- if (PTy->getAddressSpace() == ADDRESS_SPACE_GENERIC)
- return true;
- }
- if (auto STy = dyn_cast<StructType>(PteeTy)) {
- for (unsigned e = 0; e < STy->getNumElements(); ++e) {
- if (auto ETy = dyn_cast<PointerType>(STy->getElementType(e))) {
- if (ETy->getAddressSpace() == ADDRESS_SPACE_GENERIC)
- return true;
- }
- }
- }
- }
- }
return false;
}
\ No newline at end of file
--- IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp.orig 2020-11-13 09:31:31 UTC
+++ IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp
@@ -276,7 +276,7 @@ Function *GenXPacketize::vectorizeSIMTFunction(Functio
VecFName + Suffix[Width / 8], F->getParent());
ClonedFunc->setCallingConv(F->getCallingConv());
ClonedFunc->setAttributes(F->getAttributes());
- ClonedFunc->setAlignment(IGCLLVM::getAlign(*F));
+ ClonedFunc->setAlignment(IGCLLVM::getAlign(F->getAlignment()));
// then use CloneFunctionInto
ValueToValueMapTy ArgMap;
@@ -888,8 +888,10 @@ Value *GenXPacketize::packetizeLLVMInstruction(Instruc
->isPointerTy());
auto Align = LI->getAlignment();
pReplacedInst = B->MASKED_GATHER(pVecSrc, Align);
- } else
- pReplacedInst = B->ALIGNED_LOAD(pVecSrc, IGCLLVM::getAlign(*LI));
+ } else {
+ auto Align = LI->getAlignment();
+ pReplacedInst = B->ALIGNED_LOAD(pVecSrc, Align);
+ }
break;
}
--- IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp.orig 2020-11-13 09:31:31 UTC
+++ IGC/VectorCompiler/lib/GenXOpts/CMPacketize/gen_builder.hpp
@@ -573,24 +573,24 @@ StoreInst* STORE(Value *Val, Value *Ptr, bool isVolati
return IRB()->CreateStore(Val, Ptr, isVolatile);
}
-inline LoadInst* ALIGNED_LOAD(Value *Ptr, IGCLLVM::Align Align, const char *Name)
+LoadInst* ALIGNED_LOAD(Value *Ptr, unsigned Align, const char *Name)
{
- return IRB()->CreateAlignedLoad(Ptr, Align, Name);
+ return IRB()->CreateAlignedLoad(Ptr, IGCLLVM::getAlign(Align), Name);
}
-inline LoadInst* ALIGNED_LOAD(Value *Ptr, IGCLLVM::Align Align, const Twine &Name = "")
+LoadInst* ALIGNED_LOAD(Value *Ptr, unsigned Align, const Twine &Name = "")
{
- return IRB()->CreateAlignedLoad(Ptr, Align, Name);
+ return IRB()->CreateAlignedLoad(Ptr, IGCLLVM::getAlign(Align), Name);
}
-inline LoadInst* ALIGNED_LOAD(Value *Ptr, IGCLLVM::Align Align, bool isVolatile, const Twine &Name = "")
+LoadInst* ALIGNED_LOAD(Value *Ptr, unsigned Align, bool isVolatile, const Twine &Name = "")
{
- return IRB()->CreateAlignedLoad(Ptr, Align, isVolatile, Name);
+ return IRB()->CreateAlignedLoad(Ptr, IGCLLVM::getAlign(Align), isVolatile, Name);
}
-inline StoreInst* ALIGNED_STORE(Value *Val, Value *Ptr, IGCLLVM::Align Align, bool isVolatile = false)
+StoreInst* ALIGNED_STORE(Value *Val, Value *Ptr, unsigned Align, bool isVolatile = false)
{
- return IRB()->CreateAlignedStore(Val, Ptr, Align, isVolatile);
+ return IRB()->CreateAlignedStore(Val, Ptr, IGCLLVM::getAlign(Align), isVolatile);
}
FenceInst* FENCE(AtomicOrdering Ordering, SyncScope::ID SSID = SyncScope::System, const Twine &Name = "")
--- IGC/WrapperLLVM/include/llvmWrapper/Support/Alignment.h.orig 2020-12-01 09:02:30 UTC
+++ IGC/WrapperLLVM/include/llvmWrapper/Support/Alignment.h
@@ -63,16 +63,16 @@ namespace IGCLLVM {
inline llvm::Align getAlignmentValueIfNeeded(llvm::Align A) { return A; }
#endif
- using Align =
+ template<typename T =
#if LLVM_VERSION_MAJOR < 10
- unsigned;
+ uint32_t
#elif LLVM_VERSION_MAJOR == 10
- llvm::MaybeAlign;
+ llvm::MaybeAlign
#elif LLVM_VERSION_MAJOR >= 11
- llvm::Align;
+ llvm::Align
#endif
-
- inline Align getCorrectAlign(uint32_t Val)
+ >
+ inline T getCorrectAlign(uint32_t Val)
{
if (Val == 0)
{
@@ -80,25 +80,37 @@ namespace IGCLLVM {
// Instead assume byte-align.
Val = 1;
}
- return Align{ Val };
+ return T{ Val };
}
// It is meant for copying alignement.
// getAlign returns different type for different LLVM versions but
// it can be overcome by using auto or direct usage in another LLVM
// interface.
+#if LLVM_VERSION_MAJOR <= 9
template <typename TValue,
std::enable_if_t<std::is_base_of<llvm::Value, TValue>::value, int> = 0>
- Align getAlign(const TValue &Val)
+ unsigned getAlign(const TValue &Val)
{
-#if LLVM_VERSION_MAJOR <= 9
return Val.getAlignment();
+ }
#elif LLVM_VERSION_MAJOR <= 10
+ template <typename TValue,
+ std::enable_if_t<std::is_base_of<llvm::Value, TValue>::value, int> = 0>
+ llvm::MaybeAlign getAlign(const TValue &Val)
+ {
+ // LLVM 10 instructions accept MaybeAlign but do not provide
+ // getMaybeAlignMethod
return llvm::MaybeAlign(Val.getAlignment());
+ }
#else
+ template <typename TValue,
+ std::enable_if_t<std::is_base_of<llvm::Value, TValue>::value, int> = 0>
+ llvm::Align getAlign(const TValue &Val)
+ {
return Val.getAlign();
-#endif
}
+#endif
} // namespace IGCLLVM