Fix VC building for LLVM11

Part 4

Some unique fixes

1. Added TTI::TargetCostKind to getUserCost
2. Fixed invalid-use-of-incomplete-type-class-llvm-CallInst
3. Added work around for ShuffleVector getMask()
4. getSequentialElementType was changed to VectorType related code (logically it's OK)
5. getRoots.front() was changed to getRoot
6. Added more accurate work with iterators
7. Removed PassSupport.h from include list

Change-Id: If85a7c8b87e736d1a12bcafb2357a29c38659397

Author: Sidorenko, Anton

IGC/VectorCompiler/lib/GenXCodeGen/FunctionGroup.cpp

@@ -35,16 +35,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //===----------------------------------------------------------------------===//
 
 #include "FunctionGroup.h"
+#include "llvm/GenXIntrinsics/GenXMetadata.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/ValueMapper.h"
-#include "llvm/GenXIntrinsics/GenXMetadata.h"
 using namespace llvm;
 
 #include "llvmWrapper/IR/LegacyPassManagers.h"

IGC/VectorCompiler/lib/GenXCodeGen/GenXCategory.cpp

@@ -160,7 +160,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Metadata.h"
-#include "llvm/PassAnalysisSupport.h"
 #include "llvm/Support/Debug.h"
 #include "Probe/Assertion.h"
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp

@@ -1372,9 +1372,9 @@ bool MinMaxMatcher::valuesMatch(llvm::Value *Op1, llvm::Value *Op2) {
       return false;
     Type *C1Ty = C1->getType();
     Type *C2Ty = C2->getType();
-    if (C1Ty->isVectorTy()) {
-      C1Ty = C1Ty->getSequentialElementType();
-      C2Ty = C2Ty->getSequentialElementType();
+    if (auto C1VTy = dyn_cast<VectorType>(C1Ty)) {
+      C1Ty = C1VTy->getElementType();
+      C2Ty = cast<VectorType>(C2Ty)->getElementType();
     }
 
     return (C1Ty->isIntegerTy() && C2Ty->isIntegerTy()) ||

IGC/VectorCompiler/lib/GenXCodeGen/GenXReduceIntSize.cpp

@@ -1022,7 +1022,8 @@ GenXReduceIntSize::ValueNumBits GenXReduceIntSize::getValueNumBits(
 }
 
 Value *GenXReduceIntSize::getSplatValue(ShuffleVectorInst *SVI) const {
-  if (!SVI->getMask()->isNullValue())
+  auto ShuffleMask = SVI->getShuffleMask();
+  if (std::any_of(ShuffleMask.begin(), ShuffleMask.end(), [](int V) { return V != 0; }))
     return nullptr;
 
   Value *Src = SVI->getOperand(0);

IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.h

@@ -114,7 +114,12 @@ class GenXTTIImpl : public TargetTransformInfoImplCRTPBase<GenXTTIImpl>
   bool shouldBuildLookupTables() { return false; }
   unsigned getFlatAddressSpace() { return 4; }
 
-  int getUserCost(const User *U, ArrayRef<const Value *> Operands) {
+  int getUserCost(const User *U, ArrayRef<const Value *> Operands
+#if LLVM_VERSION_MAJOR >= 11
+                  ,
+                  TTI::TargetCostKind CostKind
+#endif
+  ) {
     if (auto EV = dyn_cast<ExtractValueInst>(U)) {
       switch(GenXIntrinsic::getGenXIntrinsicID(EV->getOperand(0))) {
         case GenXIntrinsic::genx_simdcf_goto:
@@ -126,7 +131,12 @@ class GenXTTIImpl : public TargetTransformInfoImplCRTPBase<GenXTTIImpl>
       }
     }
 
-    return BaseT::getUserCost(U, Operands);
+    return BaseT::getUserCost(U, Operands
+#if LLVM_VERSION_MAJOR >= 11
+                              ,
+                              CostKind
+#endif
+    );
   }
 
   bool isProfitableToHoist(Instruction *I) const {

IGC/VectorCompiler/lib/GenXCodeGen/GenXUtil.cpp

@@ -47,8 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "llvm/IR/Module.h"
 #include "llvmWrapper/IR/Instructions.h"
 
-#include <iterator>
 #include "Probe/Assertion.h"
+#include <iterator>
 
 using namespace llvm;
 using namespace genx;
@@ -591,10 +591,15 @@ ShuffleVectorAnalyzer::getMaskRegionPrefix(int StartIdx) {
   if (StartIdx == MaskVals.size() - 1)
     return Res;
 
-  makeSVIIndexesOperandIndexes(*SI, *Res.Op, StartIt, MaskVals.end(), StartIt);
+  std::vector<int>
+      SubMask;
+  makeSVIIndexesOperandIndexes(*SI, *Res.Op, StartIt, MaskVals.end(),
+                               std::back_inserter(SubMask));
 
-  Res.R = matchVectorRegionByIndexes(std::move(Res.R), StartIt, MaskVals.end());
-  Res.R = matchMatrixRegionByIndexes(std::move(Res.R), StartIt, MaskVals.end());
+  Res.R = matchVectorRegionByIndexes(std::move(Res.R), SubMask.begin(),
+                                     SubMask.end());
+  Res.R = matchMatrixRegionByIndexes(std::move(Res.R), SubMask.begin(),
+                                     SubMask.end());
   return Res;
 }
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXVectorDecomposer.cpp

@@ -120,7 +120,10 @@ int DiagnosticVectorDecomposition::KindID = 0;
 bool VectorDecomposer::run(DominatorTree *ArgDT)
 {
   DT = ArgDT;
-  DL = &DT->getRoots().front()->getModule()->getDataLayout();
+  DL = &DT->
+        getRoot()
+            ->getModule()
+            ->getDataLayout();
   bool Modified = false;
   // Process each start wrregion added with addStartWrRegion().
   for (auto swi = StartWrRegions.begin(), swe = StartWrRegions.end();

IGC/VectorCompiler/lib/GenXOpts/CMAnalysis/InstructionSimplifyGenX.cpp

@@ -47,7 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <llvm/IR/Instructions.h>
 #include <llvm/InitializePasses.h>
 #include <llvm/Pass.h>
-#include <llvm/PassSupport.h>
 #include <llvm/Support/Debug.h>
 #include <llvm/Support/CommandLine.h>
 #include "Probe/Assertion.h"