Various changes for LLVM 11.

Change-Id: I1d758041a1f6cb440cda7a91de9afe9a48f46fe6

Author: pszymich

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -1809,9 +1809,11 @@ VISA_Type CShader::GetType(llvm::Type* type)
 uint32_t CShader::GetNumElts(llvm::Type* type, bool isUniform)
 {
     uint32_t numElts = isUniform ? 1 : numLanes(m_SIMDSize);
+
     if (type->isVectorTy())
     {
-        IGC_ASSERT(type->getVectorElementType()->isIntegerTy() || type->getVectorElementType()->isFloatingPointTy());
+        IGC_ASSERT(type->getContainedType(0)->isIntegerTy() || type->getContainedType(0)->isFloatingPointTy());
+
         auto VT = cast<VectorType>(type);
         numElts *= (uint16_t)VT->getNumElements();
     }

IGC/Compiler/CISACodeGen/VectorPreProcess.cpp

@@ -44,6 +44,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using namespace llvm;
 using namespace IGC;
+using IGCLLVM::FixedVectorType;
 
 //
 // Description of VectorPreProcess Pass
@@ -562,7 +563,7 @@ void VectorPreProcess::createSplitVectorTypes(
     uint32_t M = N / E;  // the number of subvectors for split size E
     if (M > 0)
     {
-        Type* Ty = (E == 1) ? ETy : VectorType::get(ETy, E);
+        Type* Ty = (E == 1) ? ETy : FixedVectorType::get(ETy, E);
         SplitInfo.push_back(std::make_pair(Ty, M));
     }
     N = N % E;
@@ -576,7 +577,7 @@ void VectorPreProcess::createSplitVectorTypes(
         M = N / E;  // the number of subvectors for split size E
         if (M > 0)
         {
-            SplitInfo.push_back(std::make_pair(VectorType::get(ETy, E), M));
+            SplitInfo.push_back(std::make_pair(FixedVectorType::get(ETy, E), M));
         }
         // The remaining elts are to be split for next iteration.
         N = N % E;
@@ -586,7 +587,7 @@ void VectorPreProcess::createSplitVectorTypes(
     // 3. A vector of 1|2|3|4 elements. No further splitting!
     if (N > 0)
     {
-        Type* Ty = (N == 1) ? ETy : VectorType::get(ETy, N);
+        Type* Ty = (N == 1) ? ETy : FixedVectorType::get(ETy, N);
         SplitInfo.push_back(std::make_pair(Ty, 1));
     }
 }
@@ -682,7 +683,7 @@ bool VectorPreProcess::splitStore(
                 std::vector<Value*> splitScalars;
                 IGC_ASSERT(Ty1->getScalarSizeInBits());
                 const uint32_t vectorSize = (unsigned int)ETy->getPrimitiveSizeInBits() / Ty1->getScalarSizeInBits();
-                Type* splitType = llvm::VectorType::get(Ty1, vectorSize);
+                Type* splitType = FixedVectorType::get(Ty1, vectorSize);
                 for (uint32_t i = 0; i < nelts; i++)
                 {
                     Value* splitInst = aBuilder.CreateBitCast(scalars[i], splitType);
@@ -883,7 +884,7 @@ bool VectorPreProcess::splitLoad(
             {
                 builder.SetInsertPoint(nextInst);
             }
-            Value* undef = UndefValue::get(VectorType::get(svals[0]->getType(), scalarsPerElement));
+            Value* undef = UndefValue::get(FixedVectorType::get(svals[0]->getType(), scalarsPerElement));
             for (uint32_t i = 0; i < svals.size() / scalarsPerElement; i++)
             {
                 Value* newElement = undef;
@@ -1000,7 +1001,7 @@ bool VectorPreProcess::splitVector3LoadStore(Instruction* Inst)
             if (ALI->getAlignment() >= 4 * etyBytes)
             {
                 // Make it 4-element load
-                Type* newVTy = VectorType::get(eTy, 4);
+                Type* newVTy = FixedVectorType::get(eTy, 4);
                 Value* V = ALI->Create(newVTy);
 
                 Elt0 = Builder.CreateExtractElement(V, Builder.getInt32(0), "elt0");
@@ -1010,7 +1011,7 @@ bool VectorPreProcess::splitVector3LoadStore(Instruction* Inst)
             else
             {
                 // One 2-element vector load + one scalar load
-                Type* newVTy = VectorType::get(eTy, 2);
+                Type* newVTy = FixedVectorType::get(eTy, 2);
                 Value* offsetAddr = ALI->CreateConstScalarGEP(eTy, ALI->getPointerOperand(), 2);
                 Value* V2 = ALI->Create(newVTy);
                 Elt0 = Builder.CreateExtractElement(V2, Builder.getInt32(0), "elt0");
@@ -1058,7 +1059,7 @@ bool VectorPreProcess::splitVector3LoadStore(Instruction* Inst)
         {
             Value* Ptr = ASI->getPointerOperand();
             // Split 3-element into 2-element + 1 scalar
-            Type* newVTy = VectorType::get(eTy, 2);
+            Type* newVTy = FixedVectorType::get(eTy, 2);
             Value* StoredVal = ASI->getValueOperand();
             Value* offsetAddr = ASI->CreateConstScalarGEP(StoredVal->getType(), Ptr, 2);
             InsertElementInst* IEInsts[3];
@@ -1301,7 +1302,7 @@ Instruction* VectorPreProcess::simplifyLoadStore(Instruction* Inst)
         if (N == MaxIndex + 1)
             return Inst;
 
-        Type* NewVecTy = IGCLLVM::FixedVectorType::get(cast<VectorType>(Inst->getType())->getElementType(),
+        Type* NewVecTy = FixedVectorType::get(cast<VectorType>(Inst->getType())->getElementType(),
             MaxIndex + 1);
         IRBuilder<> Builder(Inst);
         Instruction* NewLI = ALI.Create(NewVecTy);
@@ -1413,7 +1414,7 @@ Instruction* VectorPreProcess::simplifyLoadStore(Instruction* Inst)
     if (MaxIndex >= 0 && MaxIndex + 1 < (int)N && isa<UndefValue>(ChainVal))
     {
         IRBuilder<> Builder(ASI.getInst());
-        Type* NewVecTy = VectorType::get(cast<VectorType>(Val->getType())->getElementType(),
+        Type* NewVecTy = FixedVectorType::get(cast<VectorType>(Val->getType())->getElementType(),
             MaxIndex + 1);
         Value* SVal = UndefValue::get(NewVecTy);
         for (int i = 0; i <= MaxIndex; ++i)

IGC/Compiler/CISACodeGen/VectorProcess.cpp

@@ -31,6 +31,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "common/IGCIRBuilder.h"
 #include "common/LLVMWarningsPush.hpp"
 #include "llvmWrapper/Support/Alignment.h"
+#include "llvmWrapper/IR/DerivedTypes.h"
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/IRBuilder.h>
@@ -41,6 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using namespace llvm;
 using namespace IGC;
+using IGCLLVM::FixedVectorType;
 
 //
 // Description of VectorProcess Pass
@@ -334,7 +336,7 @@ bool VectorProcess::reLayoutLoadStore(Instruction* Inst)
     }
     else
     {
-        newVTy = VectorType::get(new_eTy, new_nelts);
+        newVTy = FixedVectorType::get(new_eTy, new_nelts);
     }
     Type* newPtrTy = PointerType::get(newVTy, PtrTy->getPointerAddressSpace());
     Value* newPtr;
@@ -365,7 +367,7 @@ bool VectorProcess::reLayoutLoadStore(Instruction* Inst)
             //        with int-element type.
             // second, IntToPtr cast to the original vector type.
             Type* int_eTy = Type::getIntNTy(*m_C, eTyBits);
-            Type* new_intTy = VTy ? VectorType::get(int_eTy, nelts) : int_eTy;
+            Type* new_intTy = VTy ? FixedVectorType::get(int_eTy, nelts) : int_eTy;
             V = Builder.CreateBitCast(V, new_intTy);
             if (VTy)
             {
@@ -405,7 +407,7 @@ bool VectorProcess::reLayoutLoadStore(Instruction* Inst)
                 if (VTy)
                 {
                     // If we need a vector inttoptr, scalarize it here.
-                    V = UndefValue::get(VectorType::get(int_eTy, nelts));
+                    V = UndefValue::get(FixedVectorType::get(int_eTy, nelts));
                     for (unsigned i = 0; i < nelts; i++)
                     {
                         auto* EE = Builder.CreateExtractElement(StoreVal, i);

IGC/Compiler/GenTTI.h

@@ -68,7 +68,7 @@ namespace llvm
 
 #if LLVM_VERSION_MAJOR >= 11
         void getPeelingPreferences(Loop* L, ScalarEvolution& SE,
-            llvm::TargetTransformInfo::PeelingPreferences& PP);
+            TTI::PeelingPreferences& PP);
 #endif
 
         bool isProfitableToHoist(Instruction* I);
@@ -87,4 +87,4 @@ namespace llvm
 
     };
 
-}
+}