Vectorizer refactoring

Vectorizer now preallocates chain vector. And removes
unnecessary parameters from functions.

(cherry picked from commit d89764f)

Author: esukhov

IGC/Compiler/CISACodeGen/IGCVectorizer.cpp

@@ -114,8 +114,12 @@ void IGCVectorizer::initializeLogFile(Function &F) {
     if (!IGC_IS_FLAG_ENABLED(VectorizerLog))
         return;
 
+    string FName = F.getName().str();
+
+    if (FName.size() > 128) FName.resize(128);
+
     std::stringstream ss;
-    ss << F.getName().str() << "_"
+    ss << FName << "_"
        << "Vectorizer";
     auto Name = Debug::DumpName(IGC::Debug::GetShaderOutputName())
                     .Hash(CGCtx->hash)
@@ -221,7 +225,7 @@ bool isSafeToVectorize(Instruction *I) {
     return Result;
 }
 
-bool IGCVectorizer::handlePHI(VecArr &Slice, Type *VectorType) {
+bool IGCVectorizer::handlePHI(VecArr &Slice) {
     PHINode *ScalarPhi = static_cast<PHINode *>(Slice[0]);
 
     if (!checkPHI(ScalarPhi, Slice))
@@ -313,11 +317,6 @@ bool IGCVectorizer::handleInsertElement(VecArr &Slice, Instruction* Final) {
     if (!checkInsertElement(First, Slice))
         return false;
 
-    // we can handle case with more than 1 value
-    // but it wasn't tested
-    if (!Final->hasOneUse())
-        return false;
-
     PRINT_LOG_NL("InsertElement substituted with vectorized instruction");
     PRINT_LOG_NL("");
     Value *Compare = ScalarToVector[First->getOperand(1)];
@@ -471,7 +470,7 @@ bool IGCVectorizer::processChain(InsertStruct &InSt) {
 
         Instruction *First = Slice[0];
         if (llvm::isa<PHINode>(First)) {
-            if (!handlePHI(Slice, InSt.Final->getType())) return false;
+            if (!handlePHI(Slice)) return false;
         } else if (llvm::isa<CastInst>(First)) {
             if (!handleCastInstruction(Slice)) return false;
         } else if (llvm::isa<BinaryOperator>(First)) {
@@ -487,10 +486,8 @@ bool IGCVectorizer::processChain(InsertStruct &InSt) {
     return true;
 }
 
-void IGCVectorizer::clusterInsertElement(
-    InsertElementInst* HeadInsertEl, InsertStruct &InSt) {
-    InSt.Final = HeadInsertEl;
-    Instruction *Head = HeadInsertEl;
+void IGCVectorizer::clusterInsertElement(InsertStruct &InSt) {
+    Instruction *Head = InSt.Final;
 
     while (true) {
         InSt.Vec.push_back(Head);
@@ -801,9 +798,20 @@ bool IGCVectorizer::runOnFunction(llvm::Function &F) {
 
         // we process collected insert elements into a specific data structure
         // for convenience
-        for (auto el : VecOfInsert) {
-            InsertStruct InSt;
-            clusterInsertElement(static_cast<InsertElementInst*>(el), InSt);
+        InsertStruct InSt;
+        InSt.SlChain.reserve(128);
+        for (auto elFinal : VecOfInsert) {
+
+            InSt.SlChain.clear();
+            InSt.Vec.clear();
+
+            if (!elFinal->hasOneUse()) {
+                PRINT_LOG_NL("Final insert has more than one use -> rejected");
+                continue;
+            }
+            InSt.Final = elFinal;
+            clusterInsertElement(InSt);
+
             if (InSt.Vec.size() != getVectorSize(InSt.Final)) {
                 PRINT_LOG_NL("partial insert -> rejected");
                 continue;

IGC/Compiler/CISACodeGen/IGCVectorizer.h

@@ -47,7 +47,6 @@ class IGCVectorizer : public llvm::FunctionPass {
         // contains insert elements
         VecArr Vec;
         // contains slices of vector tree
-        VectorSliceChain Chain;
         VecOfSlices SlChain;
     };
 
@@ -72,18 +71,16 @@ class IGCVectorizer : public llvm::FunctionPass {
     void writeLog();
 
     void findInsertElementsInDataFlow(llvm::Instruction* I, VecArr& Chain);
-    void collectScalarPath(VecArr& V, VectorSliceChain& Chain);
-    void canonicalizeSlices(VectorSliceChain& Chain);
     bool checkSlice(VecArr& Slice, InsertStruct& InSt);
     bool processChain(InsertStruct& InSt);
-    void clusterInsertElement(InsertElementInst* VecOfInsert, InsertStruct& InSt);
+    void clusterInsertElement(InsertStruct& InSt);
     void collectInstructionToProcess(VecArr& ToProcess, Function& F);
     void buildTree(VecArr &V, VecOfSlices& Chain);
     void printSlice(Slice* S);
 
 
     bool checkPHI(Instruction* Compare, VecArr& Slice);
-    bool handlePHI(VecArr& Slice, Type* VectorType);
+    bool handlePHI(VecArr& Slice);
     bool checkInsertElement(Instruction* First, VecArr& Slice);
     bool handleInsertElement(VecArr& Slice, Instruction* Final);
     bool checkExtractElement(Instruction* Compare, VecArr& Slice);