fixes, add pass

.gitignore

@@ -78,4 +78,3 @@ Sapfor/Sapc++/x64/
 
 Sapfor/out/
 Sapfor/_bin/*
-_bin/*

CMakeLists.txt

@@ -208,8 +208,6 @@ set(TR_INLINER src/Transformations/FunctionInlining/inliner.cpp
         src/Transformations/FunctionInlining/inliner.h)
 set(TR_RENAME_SYMBOLS  src/Transformations/RenameSymbols/rename_symbols.cpp
                     src/Transformations/RenameSymbols/rename_symbols.h)
-SET(TR_MOVE_OPERATORS src/Transformations/MoveOperators/move_operators.cpp
-        src/Transformations/MoveOperators/move_operators.h)
 
 set(TRANSFORMS 
         ${TR_DEAD_CODE}
@@ -232,8 +230,7 @@ set(TRANSFORMS
         ${TR_REPLACE_ARRAYS_IN_IO}
         ${TR_EXPR_TRANSFORM}
         ${TR_INLINER}
-        ${TR_RENAME_SYMBOLS}
-        ${TR_MOVE_OPERATORS})
+        ${TR_RENAME_SYMBOLS})
         
 set(CFG src/CFGraph/IR.cpp
         src/CFGraph/IR.h
@@ -467,7 +464,6 @@ source_group (Transformations\\GlobalVariables FILES ${TR_GV})
 source_group (Transformations\\ConvertToC FILES ${TR_CONV})
 source_group (Transformations\\SetImplicitNone FILES ${TR_IMPLICIT_NONE})
 source_group (Transformations\\ReplaceArraysInIO FILES ${TR_REPLACE_ARRAYS_IN_IO})
-source_group (Transformations\\MoveOperators FILES ${TR_MOVE_OPERATORS})
 
 
 source_group (CreateIntervals FILES ${CREATE_INTER_T})

src/ArrayConstantPropagation/propagation.cpp

@@ -42,133 +42,16 @@ static SgExpression* CreateVar(int& variableNumber, SgType* type)
 
     SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), *type, *declPlace->controlParent());
 
-    const string commonBlockName = "__propagation_common__";
+    SgVarDeclStmt* decl = varSymbol->makeVarDeclStmt();
+    decl->setVariant(VAR_DECL);
+    SgStatement* insertPoint = declPlace;
+    SgStatement* scope = declPlace->controlParent();
+    decl->setFileName(insertPoint->fileName());
+    decl->setFileId(insertPoint->getFileId());
+    decl->setProject(insertPoint->getProject());
+    decl->setlineNumber(getNextNegativeLineNumber()); 
 
-    SgStatement* funcStart = declPlace->controlParent();
-    SgStatement* commonStat = NULL;
-    SgExpression* commonList = NULL;
-
-    SgStatement* funcEnd = funcStart->lastNodeOfStmt();
-    SgStatement* current = funcStart->lexNext();
-
-    while (current != funcEnd && current)
-    {
-        if (current->variant() == COMM_STAT)
-        {
-            for (SgExpression* exp = current->expr(0); exp; exp = exp->rhs())
-            {
-                if (exp->variant() == COMM_LIST)
-                {
-                    string existingName = exp->symbol() ?
-                        string(exp->symbol()->identifier()) :
-                        string("spf_unnamed");
-                    if (existingName == commonBlockName)
-                    {
-                        commonStat = current;
-                        commonList = exp;
-                        break;
-                    }
-                }
-            }
-            if (commonStat)
-                break;
-        }
-        current = current->lexNext();
-    }
-
-    vector<SgExpression*> varRefs;
-    if (commonList)
-    {
-        SgExpression* varList = commonList->lhs();
-        if (varList)
-        {
-            auto extractSymbol = [](SgExpression* exp) -> SgSymbol* {
-                if (!exp) 
-                    return NULL;
-                if (exp->symbol()) 
-                    return exp->symbol();
-                if (exp->lhs() && exp->lhs()->symbol())
-                    return exp->lhs()->symbol();
-                return NULL;
-                };
-            if (varList->variant() == EXPR_LIST)
-            {
-                for (SgExpression* exp = varList; exp; exp = exp->rhs())
-                {
-                    SgExpression* varExp = exp->lhs();
-                    SgSymbol* sym = extractSymbol(varExp);
-                    if (sym)
-                    {
-                        varRefs.push_back(new SgVarRefExp(sym));
-                    }
-                }
-            }
-            else
-            {
-                for (SgExpression* varExp = varList; varExp; varExp = varExp->rhs())
-                {
-                    SgSymbol* sym = extractSymbol(varExp);
-                    if (sym)
-                    {
-                        varRefs.push_back(new SgVarRefExp(sym));
-                    }
-                }
-            }
-        }
-    }
-
-    if (!commonList)
-    {
-        current = funcStart->lexNext();
-        while (current != funcEnd && current)
-        {
-            if (current->variant() == COMM_STAT)
-            {
-                commonStat = current;
-                break;
-            }
-            current = current->lexNext();
-        }
-
-        SgSymbol* commonSymbol = new SgSymbol(COMMON_NAME, commonBlockName.c_str());
-        commonList = new SgExpression(COMM_LIST, NULL, NULL, commonSymbol);
-
-        if (commonStat)
-        {
-            SgExpression* lastCommList = commonStat->expr(0);
-            if (lastCommList)
-            {
-                while (lastCommList->rhs())
-                    lastCommList = lastCommList->rhs();
-                lastCommList->setRhs(commonList);
-            }
-            else
-            {
-                commonStat->setExpression(0, commonList);
-            }
-        }
-        else
-        {
-            commonStat = new SgStatement(COMM_STAT);
-            commonStat->setFileName(declPlace->fileName());
-            commonStat->setFileId(declPlace->getFileId());
-            commonStat->setProject(declPlace->getProject());
-            commonStat->setlineNumber(getNextNegativeLineNumber());
-            commonStat->setExpression(0, commonList);
-
-            declPlace->insertStmtBefore(*commonStat, *declPlace->controlParent());
-        }
-
-    }
-    varRefs.push_back(new SgVarRefExp(varSymbol));
-
-    if (varRefs.size() > 0)
-    {
-        std::reverse(varRefs.begin(), varRefs.end());
-        SgExpression* varList = makeExprList(varRefs, false);
-
-        commonList->setLhs(varList);
-    }
+    insertPoint->insertStmtBefore(*decl, *scope);
    
     return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
 }
@@ -230,7 +113,7 @@ static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<
     string expUnparsed = exp->unparse();
     if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
     {
-        arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
+        arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type());
     }
     SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, arrayToVariable[expUnparsed]->copyPtr(), st->expr(1)->copyPtr(), NULL);
 
@@ -262,6 +145,7 @@ void ArrayConstantPropagation(SgProject& project)
 
             for (; st != lastNode; st = st->lexNext())
             {
+                cout << st->unparse() << endl;
                 if (st->variant() == ASSIGN_STAT)
                 {
                     if (st->expr(1))
@@ -296,6 +180,13 @@ void ArrayConstantPropagation(SgProject& project)
                     }
                 }
             }
-        }
+            /*st = file->functions(i);
+            for (; st != lastNode; st = st->lexNext())
+            {
+                cout << st->unparse() << endl;  
+            }*/
+        }
+        //FILE* unp = fopen(file->filename(), "w");
+        //file->unparse(unp);
     }
 }

src/CFGraph/CFGraph.cpp

@@ -1162,7 +1162,6 @@ map<FuncInfo*, vector<BBlock*>> buildCFG(const map<string, CommonBlock*>& common
     if (SgFile::switchToFile(oldFile) == -1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    if (!settings.withUnreachable) 
     for (auto& [func, blocks] : result)
         removedUnreachableBlocks(blocks);
 

src/CFGraph/CFGraph.h

@@ -105,52 +105,23 @@ namespace SAPFOR
 
     struct CFG_Settings
     {
-        enum setting { CFG_atLeastOneIterInLoop = 1, 
-                       CFG_withRD = 2, 
-                       CFG_withRegisters = 3,  
-                       CFG_withSPF = 4, 
-                       CFG_withDVM = 5, 
-                       CFG_withCallsInBlocks = 6, 
-                       CFG_withCallFrom = 7, 
-                       CFG_withDominators = 8, 
-                       CFG_withUnreachable = 9 };
-
         bool atLeastOneIterInLoop = false;
-        bool withRD =               false;
+        bool withRD = true;
         bool withRegisters = false;
         bool withSPF = false;
         bool withDVM = false;
         bool withCallsInBlocks = false; // separate each F_CALL to own BasicBlock
-        bool withCallFrom =         false;
-        bool withDominators =       false;
-        bool withUnreachable =      false;
+        bool withCallFrom = true;
+        bool withDominators = true;
 
-        explicit CFG_Settings(const std::set<setting> &settings = { CFG_withRD, CFG_withCallFrom, CFG_withDominators })
-        {
-            for (auto& set : settings)
-            {
-                if (set == CFG_atLeastOneIterInLoop)
-                    atLeastOneIterInLoop = true;
-                else if (set == CFG_withRD)
-                    withRD = true;
-                else if (set == CFG_withRegisters)
-                    withRegisters = true;
-                else if (set == CFG_withSPF)
-                    withSPF = true;
-                else if (set == CFG_withDVM)
-                    withDVM = true;
-                else if (set == CFG_withCallsInBlocks)
-                    withCallsInBlocks = true;
-                else if (set == CFG_withCallFrom)
-                    withCallFrom = true;
-                else if (set == CFG_withDominators)
-                    withDominators = true;
-                else if (set == CFG_withUnreachable)
-                    withUnreachable = true;
-                else
-                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-            }
-        }
+        explicit CFG_Settings(int) { }
+
+        explicit CFG_Settings(bool atLeastOneIterInLoop = false, bool withRD = true, bool withRegisters = false, 
+                              bool withDVM = false, bool withSPF = false, bool withCallsInBlocks = false, 
+                              bool withCallFrom = true, bool withDominators = true) :
+            atLeastOneIterInLoop(atLeastOneIterInLoop), withRD(withRD), withRegisters(withRegisters), withDVM(withDVM), withSPF(withSPF), 
+            withCallsInBlocks(withCallsInBlocks), withCallFrom(withCallFrom), withDominators(withDominators)
+        { }
     };
 }
 

src/CFGraph/private_variables_analysis.cpp

@@ -200,41 +200,15 @@ static void fillOutForFunc(const FuncInfo* func, const vector<SAPFOR::BasicBlock
     outForFunc[func->funcName] = { defined, common_defined };
 }
 
-static bool isInstructionSpfParameter(SAPFOR::Instruction* instr)
-{
-    SgStatement* st = instr->getOperator();
-
-    // check if this operator is SPF(ANALYSIS(PARAMETER( )))
-    if (st && st->variant() == ASSIGN_STAT)
-    {
-        if (st->lineNumber() < 0 && st->numberOfAttributes())
-        {
-            for (int i = 0; i < st->numberOfAttributes(); ++i)
-            {
-                SgAttribute* attr = st->getAttribute(i);
-                SgStatement* attributeStatement = (SgStatement*)(attr->getAttributeData());
-                int type = st->attributeType(i);
-
-                if (type == SPF_PARAMETER_OP)
-                    return true;
-            }
-        }
-    }
-    return false;
-}
-
 static void getDefsFromBlock(SAPFOR::BasicBlock* block, set<SAPFOR::Argument*>& res, 
                              const vector<pair<const Variable*, CommonBlock*>>& commonVars,
                              const FuncInfo* func)
 {
     vector<SAPFOR::Argument*> lastParamRef;
 
-    for (const auto &ir_block : block->getInstructions())
+    for (auto ir_block : block->getInstructions())
     {
         SAPFOR::Instruction* instr = ir_block->getInstruction();
-        if (isInstructionSpfParameter(instr))
-            continue;
-
         SAPFOR::CFG_OP instr_operation = instr->getOperation();
         if (instr_operation == SAPFOR::CFG_OP::PARAM)
         {
@@ -262,19 +236,11 @@ static void getDefsFromBlock(SAPFOR::BasicBlock* block, set<SAPFOR::Argument*>&
     int last_instr_num = block->getInstructions().back()->getNumber();
 
     for (const auto& def : block->getRD_Out())
-    {
         for (int place : def.second)
-        {
             if (place >= first_instr_num && place <= last_instr_num && def.first->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
             {
-                SAPFOR::Instruction* instr = block->getInstructions()[place - first_instr_num]->getInstruction();
-                if (isInstructionSpfParameter(instr))
-                    continue;
-
                 res.insert(def.first);
-                addPlaceWithDef(commonVars, func, def.first, instr);
-            }
-        }
+                addPlaceWithDef(commonVars, func, def.first, block->getInstructions()[place - first_instr_num]->getInstruction());
             }
 }
 
@@ -300,7 +266,7 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
     SAPFOR::BasicBlock* head_block = NULL;
 
     int loop_start = loop->lineNum, loop_end = loop->lineNumAfterLoop;
-    for (const auto &bb : blocks)
+    for (auto bb : blocks)
     {
         if (!bb || (bb->getInstructions().size() == 0))
             continue;
@@ -321,12 +287,6 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
         }
     }
 
-    if (currentLoop.empty()) // can't find loop IR - loop unreachable!
-    {
-        __spf_print(1, "Unreachable loop on %s:%d\n", current_file->filename(), loop_operator->lineNumber());
-        return currentLoop;
-    }
-
     if (!head_block)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
     
@@ -388,7 +348,7 @@ static set<SAPFOR::BasicBlock*> analyzeLoop(LoopGraph* loop, const set<SAPFOR::B
         getDefsFromBlock(*loop_it, changeValueOnExit, commonVars, func);
 
 
-    for (const auto &bb : currentLoop)
+    for (auto bb : currentLoop)
     {
         //fill LiveWhenLoopEnds
         bool has_next_outside_body = false;

src/CreateInterTree/CreateInterTree.cpp

@@ -17,7 +17,7 @@ using std::fstream;
 static long int getNextTag()
 {
     static long int INTERVAL_TAG = 0;
-    return -(INTERVAL_TAG++);
+    return INTERVAL_TAG++;
 }
 
 //Debug funcs
@@ -413,7 +413,7 @@ static void findIntervals(SpfInterval *interval, map<int, int> &labelsRef, map<i
         inter->lineFile = std::make_pair(currentSt->lineNumber(), currentSt->fileName());
         inter->parent = interval;
         inter->exit_levels.push_back(0);
-        inter->tag = currentSt->lineNumber();//getNextTag();
+        inter->tag = getNextTag();
         interval->nested.push_back(inter);
 
         findIntervals(inter, labelsRef, gotoStmts, currentSt);

src/DirectiveProcessing/insert_directive.cpp

@@ -853,21 +853,12 @@ static pair<string, string> getModuleRename(const set<SgStatement*>& allocatable
         return make_pair("", "");
 }
 
-static void doRename(string& str, const pair<string, string>& renamePair)
-{
-    auto it = str.find(renamePair.first);
-    if (it != string::npos)
-        if (str[it + renamePair.first.size()] == '(' && str[it - 1] == ' ')
-            str = str.replace(it, renamePair.first.size(), renamePair.second);
-}
-
 static pair<DIST::Array*, string>
 getNewDirective(const string &fullArrayName, 
                 const vector<string> &distrRules,
                 const vector<string> &alignRules,
                 const DataDirective &dataDir,
-                const set<SgStatement*>& allocatableStmts,
-                const pair<string, int>& position_decl)
+                const set<SgStatement*>& allocatableStmts)
 {
     string out = "";
     DIST::Array* outA = NULL;
@@ -886,8 +877,7 @@ getNewDirective(const string &fullArrayName,
 
     for (int i = 0; i < dataDir.alignRules.size(); ++i)
     {
-        auto alignArray = dataDir.alignRules[i].alignArray;
-        if (alignArray->GetName() == fullArrayName)
+        if (dataDir.alignRules[i].alignArray->GetName() == fullArrayName)
         {
             string rule = alignRules[i];
             if (allocatableStmts.size())
@@ -899,21 +889,21 @@ getNewDirective(const string &fullArrayName,
                     it = rule.find("ALIGN", it + 7);
                 }
                 
-                auto renamePair = getModuleRename(allocatableStmts, alignArray);
-                doRename(rule, renamePair);
-            }
-            else if (alignArray->GetLocation().first == DIST::l_COMMON)
+                auto renamePair = getModuleRename(allocatableStmts, dataDir.alignRules[i].alignArray);
+                if (renamePair.first != "")
                 {
-                auto symb = alignArray->GetDeclSymbol(position_decl);
-                if (symb->identifier() != alignArray->GetShortName())
-                    doRename(rule, make_pair(alignArray->GetShortName(), symb->identifier()));
+                    it = rule.find(renamePair.first);
+                    if (it != string::npos)
+                        if (rule[it + renamePair.first.size()] == '(' && rule[it - 1] == ' ')
+                            rule = rule.replace(it, renamePair.first.size(), renamePair.second);
+                }
             }
 
             out += "!DVM$ " + rule + "\n";
             if (!out_free_form)
                 out = splitDirective(out);
 
-            return make_pair(alignArray, out);
+            return make_pair(dataDir.alignRules[i].alignArray, out);
         }
     }
     
@@ -1753,7 +1743,7 @@ void insertDistributionToFile(SgFile *file, const char *fin_name, const DataDire
                             if (allocatableStmtsCopy.size())
                                 allocatableStmts = filterAllocateStats(file, allocatableStmtsCopy, currSymb->identifier());
    
-                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, allocatableStmts, make_pair(st->fileName(), st->lineNumber()));
+                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, allocatableStmts);
 
                             string toInsert = dirWithArray.second;
                             if (toInsert != "")
@@ -1985,27 +1975,20 @@ void insertDistributionToFile(SgFile *file, const char *fin_name, const DataDire
                 set<string> toInsertArrays;
                 for (auto &array : dynamicArraysLocal)
                 {
-                    string name = array->GetShortName();
-                    if (array->GetLocation().first == DIST::l_COMMON)
-                    {
-                        auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
-                        name = symb->identifier();
-                    }
-
                     if (extractDir)
                     {
-                        if (dynamicArraysAdded.find(name) != dynamicArraysAdded.end())
+                        if (dynamicArraysAdded.find(array->GetShortName()) != dynamicArraysAdded.end())
                         {
-                            dynamicArraysAdded.erase(name);
-                            toInsertArrays.insert(name);
+                            dynamicArraysAdded.erase(array->GetShortName());
+                            toInsertArrays.insert(array->GetShortName());
                         }
                     }
                     else
                     {
-                        if (dynamicArraysAdded.find(name) == dynamicArraysAdded.end())
+                        if (dynamicArraysAdded.find(array->GetShortName()) == dynamicArraysAdded.end())
                         {
-                            dynamicArraysAdded.insert(name);
-                            toInsertArrays.insert(name);
+                            dynamicArraysAdded.insert(array->GetShortName());
+                            toInsertArrays.insert(array->GetShortName());
                         }
                     }
                 }
@@ -2162,14 +2145,7 @@ void insertShadowSpecToFile(SgFile *file, const char *fin_name, const set<string
 
                     if (needToGen)
                     {
-                        string name = array->GetShortName();
-                        if (array->GetLocation().first == DIST::l_COMMON)
-                        {
-                            auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
-                            name = symb->identifier();
-                        }
-
-                        string shadowSpecInsert = "!DVM$ SHADOW " + name + "(";
+                        string shadowSpecInsert = "!DVM$ SHADOW " + array->GetShortName() + "(";
                         for (int k = 0; k < currSpec.size(); ++k)
                         {
                             char buf[256];
@@ -2181,7 +2157,7 @@ void insertShadowSpecToFile(SgFile *file, const char *fin_name, const set<string
                         shadowSpecInsert += ")\n";
 
                         shadowsSpecsString.push_back(shadowSpecInsert);
-                        pair<SgExpression*, SgExpression*> newSpec = genShadowSpec(file, make_pair(name, currSpec));
+                        pair<SgExpression*, SgExpression*> newSpec = genShadowSpec(file, make_pair(array->GetShortName(), currSpec));
                         if (newSpec.first == NULL || newSpec.second == NULL)
                             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
                         shadowsSpecs.push_back(newSpec);

src/DirectiveProcessing/shadow.cpp

@@ -26,7 +26,6 @@ using std::string;
 using std::vector;
 using std::pair;
 using std::make_pair;
-using SAPFOR::CFG_Settings;
 
 extern int debSh;
 
@@ -1673,12 +1672,9 @@ void GroupShadow(const map<string, vector<FuncInfo*>>& allFuncs,
         
             SgStatement* func = currF->funcPointer->GetOriginal();
 
-            const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withDVM, 
-                                                 CFG_Settings::CFG_withCallsInBlocks, CFG_Settings::CFG_withUnreachable });
-            auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs);
+            auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, true, false, true, false), commonBlocks, allFuncs);
             if (cfg.size() != 1)
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
             auto& blocks = cfg.begin()->second;
 
             //create reaching blocks

src/Distribution/Array.h

@@ -336,24 +336,9 @@ namespace Distribution
             if (pos != STRING::npos)
             {
                 name.erase(pos, shortName.size());
-                name += newName;
-            }
-            else if (locationPos.first == l_COMMON) // name of array in common may be different
-            {
-                pos = name.rfind("_");
-                if (pos != STRING::npos)
-                {
-                    name.erase(pos + 1, shortName.size());
-                    name += newName;
-                }
-                else
-                {
-#if __SPF
-                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-#endif
-                }
-            }
                 shortName = newName;
+                name += newName;
+            }
             GenUniqKey();
         }
 
@@ -557,44 +542,6 @@ namespace Distribution
             return NULL; 
         }
 
-        Symbol* GetDeclSymbol(const PAIR<STRING, int>& position_decl) const
-        {
-            if (!IsArray() || locationPos.first != l_COMMON)
-                return declSymbol;
-
-            auto it = declPlacesSymbol.find(position_decl);
-            if (it != declPlacesSymbol.end())
-                return it->second;
-            else // find nearest
-            {
-                MAP<PAIR<STRING, int>, Symbol*> currFile;
-                for (auto& [position, symb] : declPlacesSymbol)
-                {
-                    if (position.first == position_decl.first)
-                        currFile[position] = symb;
-                }
-
-                PAIR<int, Symbol*> nearest = { (int)0, NULL };
-                const int needed_pos = position_decl.second;
-
-                for (auto& [position, symb] : currFile)
-                {
-                    if (nearest.second == NULL)
-                        nearest = { abs(position.second - needed_pos), symb };
-
-                    if (abs(position.second - needed_pos) < nearest.first)
-                        nearest = { abs(position.second - needed_pos), symb };
-                }
-
-                if (nearest.second)
-                    return nearest.second;
-#if __SPF
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-#endif
-            }
-            return NULL;
-        }
-
         Symbol* GetDeclSymbol() const { return declSymbol; }
         void SetDeclSymbol(Symbol *s) { declSymbol = s; }
 

src/Distribution/CreateDistributionDirs.cpp

@@ -274,7 +274,7 @@ static void convertTrees(const map<DIST::Array*, int> &treesIn, map<int, vector<
 static DIST::Array* findBestInEqual(vector<DIST::Array*> &arrays, DIST::GraphCSR<int, double, attrType> &reducedG, DIST::Arrays<int> &allArrays)
 {
     DIST::Array *retVal = NULL;
-    vector<vector<attrType>> coeffsByDims;
+    vector<vector<attrType>> coefsByDims;
     for (auto &array : arrays)
     {
         vector<int> verts;
@@ -285,7 +285,7 @@ static DIST::Array* findBestInEqual(vector<DIST::Array*> &arrays, DIST::GraphCSR
         {
             retVal = array;
             for (auto &V : verts)
-                coeffsByDims.push_back(reducedG.GetAllAttributes(V));
+                coefsByDims.push_back(reducedG.GetAllAttributes(V));
         }
         else
         {
@@ -294,11 +294,11 @@ static DIST::Array* findBestInEqual(vector<DIST::Array*> &arrays, DIST::GraphCSR
                 toCmp.push_back(reducedG.GetAllAttributes(V));
             for (int z = 0; z < toCmp.size(); ++z)
             {
-                if (toCmp[z].size() && coeffsByDims[z].size())
+                if (toCmp[z].size() && coefsByDims[z].size())
                 {
-                    if (toCmp[z].back().first.first > coeffsByDims[z].back().first.first)
+                    if (toCmp[z].back().first.first > coefsByDims[z].back().first.first)
                     {
-                        coeffsByDims = toCmp;
+                        coefsByDims = toCmp;
                         retVal = array;
                         break;
                     }

src/Distribution/DvmhDirective.cpp

@@ -45,10 +45,10 @@ static bool findArrayRefAndCheck(SgExpression *ex, const DIST::Array* currArray,
                 int countOfShadows = 0;
                 for (int i = 0; i < ref->numberOfSubscripts(); ++i)
                 {
-                    const vector<int*> &coeffs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
-                    if (coeffs.size() == 1)
+                    const vector<int*> &coefs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
+                    if (coefs.size() == 1)
                     {
-                        const pair<int, int> coef(coeffs[0][0], coeffs[0][1]);
+                        const pair<int, int> coef(coefs[0][0], coefs[0][1]);
                         auto it = shiftsByAccess[i].find(coef);
                         if (it != shiftsByAccess[i].end())
                             if (it->second != 0)

src/Distribution/DvmhDirectiveBase.cpp

@@ -364,11 +364,11 @@ static inline string calculateShifts(DIST::GraphCSR<int, double, attrType> &redu
             {
                 if (sharedMemoryParallelization)
                 {
-                    for (auto& coeffs : currReadOp->first[k].coefficients)
+                    for (auto& coefs : currReadOp->first[k].coefficients)
                     {
-                        auto currAccess = coeffs.first;
+                        auto currAccess = coefs.first;
 
-                        const int currShift = coeffs.first.second;
+                        const int currShift = coefs.first.second;
 
                         auto itFound = shiftsByAccess[k].find(currAccess);
                         if (itFound == shiftsByAccess[k].end())
@@ -393,9 +393,9 @@ static inline string calculateShifts(DIST::GraphCSR<int, double, attrType> &redu
                             int minShift = 9999999;
                             int maxShift = -9999999;
 
-                            for (auto &coeffs : currReadOp->first[k].coefficients)
+                            for (auto &coefs : currReadOp->first[k].coefficients)
                             {
-                                auto currAccess = coeffs.first;
+                                auto currAccess = coefs.first;
                                 auto result = DIST::Fx(currAccess, currRuleShadow);
 
                                 if (result.first == loopRule.first)
@@ -417,7 +417,7 @@ static inline string calculateShifts(DIST::GraphCSR<int, double, attrType> &redu
                                     auto it = remoteRegularReads.find(calcForArray);
                                     if (it == remoteRegularReads.end())
                                         it = remoteRegularReads.insert(it, make_pair(calcForArray, vector<ArrayOp>(calcForArray->GetDimSize())));
-                                    it->second[k].coefficients.insert(coeffs);
+                                    it->second[k].coefficients.insert(coefs);
                                 }
                             }
 

src/GraphLoop/graph_loops_base.cpp

@@ -1137,9 +1137,9 @@ static bool isMapped(const vector<ArrayOp> &allOps)
     bool mapped = false;
     for (auto &ops : allOps)
     {
-        for (auto &coeffs : ops.coefficients)
+        for (auto &coefs : ops.coefficients)
         {
-            if (coeffs.first.first != 0)
+            if (coefs.first.first != 0)
             {
                 mapped = true;
                 break;

src/LoopAnalyzer/loop_analyzer.cpp

@@ -247,7 +247,7 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
         }
     }
 
-    pair<int, int> coeffs = pair<int, int>(0, 0);
+    pair<int, int> coefs = pair<int, int>(0, 0);
     // more than one loop symbol in subscription
     if (countOfSymbols > 1)
     {
@@ -326,16 +326,16 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
         {
             if (subscr->symbol()->id() == (parentLoops[position]->doName())->id())
             {
-                coeffs.first = 1;
+                coefs.first = 1;
                 needToCacl = false;
             }
         }
 
         if (needToCacl)
-            getCoefsOfSubscript(coeffs, subscr, parentLoops[position]->doName());
-        __spf_print(PRINT_ARRAY_ARCS, " <%d %d> ", coeffs.first, coeffs.second);
+            getCoefsOfSubscript(coefs, subscr, parentLoops[position]->doName());
+        __spf_print(PRINT_ARRAY_ARCS, " <%d %d> ", coefs.first, coefs.second);
 
-        if (coeffs.first == 0) // && coeffs.second == 0)
+        if (coefs.first == 0) // && coefs.second == 0)
         {
             if (currRegime == REMOTE_ACC)
             {
@@ -346,7 +346,7 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
             {                
                 const pair<bool, string> &arrayRefString = constructArrayRefForPrint(arrayRef, dimNum, origSubscr);
                 __spf_print(1, "WARN: can not calculate index expression for array ref '%s' at line %d\n", arrayRefString.second.c_str(), currLine);
-                addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coeffs, UNREC_OP, numOfSubscriptions, currentW);
+                addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coefs, UNREC_OP, numOfSubscriptions, currentW);
                 if (side == LEFT)
                     allPositions.clear();
 
@@ -371,19 +371,19 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
                         currOp.resize(numOfSubscriptions);
 
                     //add only uniq 
-                    auto itAdd = currOp[dimNum].coefficients.find(coeffs);
+                    auto itAdd = currOp[dimNum].coefficients.find(coefs);
                     if (itAdd == currOp[dimNum].coefficients.end())
-                        itAdd = currOp[dimNum].coefficients.insert(itAdd, make_pair(coeffs, currentW));
+                        itAdd = currOp[dimNum].coefficients.insert(itAdd, make_pair(coefs, currentW));
                 }
 
-                if (coeffs.first < 0)
+                if (coefs.first < 0)
                     addInfoToMap(loopInfo, parentLoops[position], currOrigArrayS, arrayRef, dimNum, REMOTE_TRUE, currLine, numOfSubscriptions);
                 else
                     //if we found regular access to array - set it false
                     addInfoToMap(loopInfo, parentLoops[position], currOrigArrayS, arrayRef, dimNum, REMOTE_FALSE, currLine, numOfSubscriptions);
             }
 
-            if (coeffs.first < 0 && sharedMemoryParallelization == 0)
+            if (coefs.first < 0 && sharedMemoryParallelization == 0)
             {
                 if (currRegime == DATA_DISTR)
                 {
@@ -402,15 +402,15 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
                     if (side == LEFT)
                         allPositions.clear();
                     else
-                        addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coeffs, UNREC_OP, numOfSubscriptions, currentW);
+                        addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coefs, UNREC_OP, numOfSubscriptions, currentW);
                 }
             }
             else
             {
                 if (side == LEFT)
-                    addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coeffs, WRITE_OP, numOfSubscriptions, currentW);
+                    addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coefs, WRITE_OP, numOfSubscriptions, currentW);
                 else
-                    addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coeffs, READ_OP, numOfSubscriptions, currentW);
+                    addInfoToVectors(loopInfo, parentLoops[position], currOrigArrayS, dimNum, coefs, READ_OP, numOfSubscriptions, currentW);
             }
         }
     }
@@ -418,13 +418,13 @@ static vector<int> matchSubscriptToLoopSymbols(const vector<SgForStmt*> &parentL
     if (currRegime == ARRAY_ACC_CORNER)
     {
         int *valueSubs = new int[2];
-        valueSubs[0] = coeffs.first;
-        valueSubs[1] = coeffs.second;
+        valueSubs[0] = coefs.first;
+        valueSubs[1] = coefs.second;
 #ifdef __SPF
         addToCollection(__LINE__, __FILE__, valueSubs, 2);
 #endif
-        const vector<int*> &coeffs = getAttributes<SgExpression*, int*>(subscr, set<int>{ INT_VAL });
-        if (coeffs.size() == 0)
+        const vector<int*> &coefs = getAttributes<SgExpression*, int*>(subscr, set<int>{ INT_VAL });
+        if (coefs.size() == 0)
         {
             subscr->addAttribute(INT_VAL, valueSubs, sizeof(int*));
             if (position != -1 && allPositions.size() == 1 && position < parentLoops.size())

src/Predictor/PredictScheme.cpp

@@ -33,7 +33,6 @@ using std::set;
 using std::ofstream;
 using std::pair;
 using std::tuple;
-using SAPFOR::CFG_Settings;
 
 using json = nlohmann::json;
 
@@ -327,7 +326,7 @@ static json parseAlign(const map<DIST::Array*, int>& byPos, SgSymbol* srcArr, Sg
         list = list->rhs();
     }
 
-    vector<pair<int, int>> coeffs(srcSymbs.size());
+    vector<pair<int, int>> coefs(srcSymbs.size());
     list = listTgt;
     while (list)
     {
@@ -338,8 +337,8 @@ static json parseAlign(const map<DIST::Array*, int>& byPos, SgSymbol* srcArr, Sg
             has = recSymbolFind(exp, srcSymbs[z].first, VAR_REF);
             if (has)
             {
-                getCoefsOfSubscript(coeffs[z], exp, srcSymbs[z].second);
-                if (coeffs[z].first == 0)
+                getCoefsOfSubscript(coefs[z], exp, srcSymbs[z].second);
+                if (coefs[z].first == 0)
                     printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
                 break;
             }
@@ -347,14 +346,14 @@ static json parseAlign(const map<DIST::Array*, int>& byPos, SgSymbol* srcArr, Sg
         list = list->rhs();
     }
 
-    for (int z = 0; z < coeffs.size(); ++z)
+    for (int z = 0; z < coefs.size(); ++z)
     {
-        if (coeffs[z].first == 0)
+        if (coefs[z].first == 0)
             continue;
-        if (coeffs[z].second)
-            align["rules"].push_back({ z, coeffs[z].first });
+        if (coefs[z].second)
+            align["rules"].push_back({ z, coefs[z].first });
         else
-            align["rules"].push_back({ z, coeffs[z].first, coeffs[z].second });
+            align["rules"].push_back({ z, coefs[z].first, coefs[z].second });
     }
     return align;
 }
@@ -508,8 +507,7 @@ static void parallelDir(const map<DIST::Array*, int>& byPos, SgExpression* spec,
     if (currF == NULL)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withSPF, CFG_Settings::CFG_withDominators });
-    auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncInfo);
+    auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, true, false, false, true), commonBlocks, allFuncInfo);
     //TODO IP analysis
         
     unsigned countOfAccess = 0;

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <map>
 #include <unordered_set>
 #include <unordered_map>
@@ -17,13 +16,10 @@
 
 using namespace std;
 
-static unordered_set<Region*> collapsed;
-
 static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
 {
     ArrayAccessingIndexes resultContainer;
     unordered_set<string> toRemove;
-
     for (auto& [arrayName, accessingSet] : container)
     {
         vector<vector<ArrayDimension>> points;
@@ -32,7 +28,6 @@ static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
             if (!arrayPoint.empty())
                 points.push_back(arrayPoint);
         }
-
         if (points.size() < accessingSet.GetElements().size() && !points.empty())
             resultContainer[arrayName] = points;
 
@@ -41,92 +36,55 @@ static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
     }
 
     for (const string& name : toRemove)
+    {
         container.erase(name);
-
+    }
     for (auto& [arrayName, accessingSet] : resultContainer)
+    {
         container[arrayName] = accessingSet;
     }
+}
 
 static void Collapse(Region* region)
 {
     if (region->getBasickBlocks().empty())
         return;
 
-    bool firstRegion = true;
-    for (Region* basickBlock : region->getBasickBlocks())
+    for (auto& [arrayName, arrayRanges] : region->getHeader()->array_out)
     {
-        if (basickBlock->getNextRegions().empty())
+        for (Region* byBlock : region->getBasickBlocks())
         {
-            if (firstRegion)
-            {
-                region->array_def = basickBlock->array_out;
-                firstRegion = false;
-            }
-            else
-            {
-                unordered_set<string> toErease;
-                for (auto& [arrayName, arrayRanges] : region->array_def)
-                {
-                    if (basickBlock->array_out.find(arrayName) != basickBlock->array_out.end())
-                        arrayRanges = arrayRanges.Intersect(basickBlock->array_out[arrayName]);
-                    else
-                    {
-                        arrayRanges = AccessingSet();
-                        toErease.insert(arrayName);
+            AccessingSet intersection = byBlock->array_def[arrayName].Intersect(arrayRanges);
+            region->array_def[arrayName] = region->array_def[arrayName].Union(intersection);
         }
     }
-                for (string arrayName : toErease)
-                    region->array_def.erase(arrayName);
-            }
-        }
-    }
-
-    RegionInstruction instruction;
-    instruction.def = move(region->array_def);
-
 
     for (auto& byBlock : region->getBasickBlocks()) 
     {
-        for (auto& instruction : byBlock->instructions)
+        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
         {
-            for (auto& [arrayName, _] : instruction.use)
-            {
-                AccessingSet diff = instruction.use[arrayName].Diff(instruction.in[arrayName]);
+            AccessingSet diff = byBlock->array_use[arrayName].Diff(byBlock->array_in[arrayName]);
             region->array_use[arrayName] = region->array_use[arrayName].Union(diff);
         }
     }
-    }
-
-    ArrayAccessingIndexes useUnionB;
+    ArrayAccessingIndexes useUnion;
     for (auto& byBlock : region->getBasickBlocks())
-        for (auto& instruction : byBlock->instructions)
-            for (auto& [arrayName, _] : instruction.use)
-                useUnionB[arrayName] = useUnionB[arrayName].Union(instruction.use[arrayName]);
+        for (auto& [arrayName, arrayRanges] : byBlock->array_use)
+            useUnion[arrayName] = useUnion[arrayName].Union(byBlock->array_use[arrayName]);
 
-    for (auto& [arrayName, _] : useUnionB)
-        region->array_priv[arrayName] = useUnionB[arrayName].Diff(region->array_use[arrayName]);
-
-    instruction.use = move(region->array_use);
+    for (auto& [arrayName, arrayRanges] : useUnion)
+        region->array_priv[arrayName] = useUnion[arrayName].Diff(region->array_use[arrayName]);
     
     for (Region* prevBlock : region->getHeader()->getPrevRegions()) 
-    {
         prevBlock->replaceInNextRegions(region, region->getHeader());
-        region->addPrevRegion(prevBlock);
-    }
     
     for (Region* nextBlock : region->getHeader()->getNextRegions())
-    {
         nextBlock->replaceInPrevRegions(region, region->getHeader());
-        region->addNextRegion(nextBlock);
-    }
-    region->instructions.push_back(instruction);
-
 }
 
 static void SolveDataFlowIteratively(Region* DFG) 
 {
-    auto blocks = DFG->getBasickBlocks();
-    std::unordered_set<Region*> worklist(blocks.begin(), blocks.end());
+    unordered_set<Region*> worklist(DFG->getBasickBlocks());
     do
     {
         Region* b = *worklist.begin();
@@ -144,9 +102,8 @@ static void SolveDataFlowIteratively(Region* DFG)
                 if (prevBlock->array_out.empty())
                 {
                     newIn.clear();
-                    break;
+                    continue;
                 }
-
                 for (const auto& [arrayName, accessSet] : prevBlock->array_out)
                 {
                     if (newIn.find(arrayName) != newIn.end())
@@ -159,7 +116,6 @@ static void SolveDataFlowIteratively(Region* DFG)
 
         b->array_in = move(newIn);
         ArrayAccessingIndexes newOut;
-
         if (b->array_def.empty())        
             newOut = b->array_in;
         else if (b->array_in.empty())
@@ -180,154 +136,37 @@ static void SolveDataFlowIteratively(Region* DFG)
             b->array_out = newOut;
         else
             worklist.erase(b);
-    } while (!worklist.empty());
-}
-
-static void SolveForBasickBlock(Region* block)
-{
-    ArrayAccessingIndexes newIn;
-    bool flagFirst = true;
-    for (Region* prevBlock : block->getPrevRegions())
-    {
-        if (flagFirst)
-        {
-            newIn = prevBlock->array_out;
-            flagFirst = false;
-        }
-        else
-        {
-            if (prevBlock->array_out.empty())
-            {
-                newIn.clear();
-                break;
-            }
-
-            for (const auto& [arrayName, accessSet] : prevBlock->array_out)
-            {
-                if (newIn.find(arrayName) != newIn.end())
-                    newIn[arrayName] = newIn[arrayName].Intersect(accessSet);
-                else
-                    newIn[arrayName] = AccessingSet();
-            }
-        }
-    }
-
-    if (block->instructions.empty())
-        block->instructions.push_back(RegionInstruction());
-
-    block->instructions[0].in = move(newIn);
-
-    for (int i = 0; i < block->instructions.size(); i++)
-    {
-        auto& instruction = block->instructions[i];
-
-        if (i > 0)
-            instruction.in = block->instructions[i - 1].out;
-
-        ArrayAccessingIndexes newOut;
-        if (instruction.def.empty())
-            newOut = instruction.in;
-        else if (instruction.in.empty())
-            newOut = instruction.def;
-        else
-        {
-            for (auto& [arrayName, accessSet] : instruction.def)
-            {
-                if (instruction.in.find(arrayName) != instruction.in.end())
-                    newOut[arrayName] = instruction.def[arrayName].Union(instruction.in[arrayName]);
-                else
-                    newOut[arrayName] = accessSet;
-            }
-            for (auto& [arrayName, accessSet] : instruction.in)
-            {
-                if (newOut.find(arrayName) == newOut.end())
-                {
-                    newOut[arrayName] = accessSet;
-                }
-            }
-        }
-
-        instruction.out = move(newOut);
-    }
-    if (!block->instructions.empty())
-        block->array_out = block->instructions.back().out;
-}
-
-static void SolveDataFlowTopologically(Region* DFG)
-{
-    for (Region* b : DFG->getBasickBlocks())
-    {
-        collapsed.insert(b);
-        SolveForBasickBlock(b);
     } 
+    while (!worklist.empty());
 }
 
 static void SolveDataFlow(Region* DFG)
 {
     if (!DFG)
         return;
+
+    SolveDataFlowIteratively(DFG);
     for (Region* subRegion : DFG->getSubRegions())
-    {
         SolveDataFlow(subRegion);
-        DFG->addBasickBlocks(subRegion);
-    }
-    vector<Region*>& blocks = DFG->getBasickBlocks();
-    auto pos = remove_if(blocks.begin(), blocks.end(), [](Region* r) { return collapsed.find(r) != collapsed.end(); });
-    blocks.erase(pos, blocks.end());
-    TopologySort(DFG->getBasickBlocks(), DFG->getHeader());
-    SolveDataFlowTopologically(DFG);
     Collapse(DFG);
 }
 
-static bool getArrayDeclaredDimensions(SgArrayRefExp* arrayRef, vector<uint64_t>& declaredDims)
-{
-    declaredDims.clear();
-    if (!arrayRef || !arrayRef->symbol() || !isSgArrayType(arrayRef->symbol()->type()))
-        return false;
-    SgArrayType* arrayType = (SgArrayType*)arrayRef->symbol()->type();
-    int dimCount = arrayType->dimension();
-    for (int i = 0; i < dimCount; i++)
-    {
-        SgExpression* sizeExpr = arrayType->sizeInDim(i);
-        SgConstantSymb* constValSymb = isSgConstantSymb(sizeExpr->symbol());
-        string strDimLength;
-        if (sizeExpr && sizeExpr->variant() == INT_VAL)
-            strDimLength = sizeExpr->unparse();
-        else if (constValSymb)
-            strDimLength = constValSymb->constantValue()->unparse();
-        else
-            return false;
-
-        if (strDimLength == "0")
-            return false;
-        declaredDims.push_back((uint64_t)stoi(strDimLength));
-    }
-    return true;
-}
-
-static bool CheckDimensionLength(const AccessingSet& array)
+unsigned long long CalculateLength(const AccessingSet& array) 
 {
     if (array.GetElements().empty())
-        return false;
-    size_t dimCount = array.GetElements()[0].size();
-    SgArrayRefExp* arrayRef = array.GetElements()[0][0].array;
-    if (!arrayRef)
-        return false;
-    vector<uint64_t> declaredDims(dimCount);
-    if (!getArrayDeclaredDimensions(arrayRef, declaredDims))
-        return false;
-    vector<ArrayDimension> testArray(dimCount);
-    for (size_t i = 0; i < dimCount; i++)
+        return 0;
+    unsigned long long result = 1;
+    for (const auto& range : array.GetElements()) 
     {
-        testArray[i] = { 1, 1, declaredDims[i], nullptr };
+        for (const auto& dim : range)
+        {
+            result *= (dim.step * dim.tripCount);
         }
-    AccessingSet diff = AccessingSet({ testArray }).Diff(array);
-
-    return diff.GetElements().empty();
+    }
+    return result;
 }
 
-
-static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
+void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
 {
     SgStatement* spfStat = new SgStatement(SPF_ANALYSIS_DIR);
     spfStat->setlineNumber(loop->loop->lineNumber());
@@ -336,8 +175,6 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
     set<SgSymbol*> arraysToInsert;
     for (const auto& [_, accessingSet] : privates)
     {
-        if (!CheckDimensionLength(accessingSet))
-            continue;
         for (const auto& arrayElement : accessingSet.GetElements())
         {
             if (arrayElement.empty())
@@ -365,12 +202,12 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
         toAdd->setLhs(new SgVarRefExp(elem));
     }
     
-    if (arraysToInsert.size() != 0)
-    {
+    if (arraysToInsert.size() == 0)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
     loop->loop->insertStmtBefore(*spfStat, *loop->loop->controlParent());
     insertedPrivates.insert(spfStat);
 }
-}
 
 void FindPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, set<SgStatement*> &insertedPrivates)
 {  

src/PrivateAnalyzer/range_structures.cpp

@@ -132,10 +132,8 @@ static vector<ArrayDimension> ElementsIntersection(const vector<ArrayDimension>&
 static vector<vector<ArrayDimension>> ElementsDifference(const vector<ArrayDimension>& firstElement,
     const vector<ArrayDimension>& secondElement)
 {
-    if (firstElement.empty())
+    if (firstElement.empty() || secondElement.empty())
         return {};
-    if (secondElement.empty())
-        return { firstElement };
     
     vector<ArrayDimension> intersection = ElementsIntersection(firstElement, secondElement);
     vector<vector<ArrayDimension>> result;
@@ -190,7 +188,7 @@ bool AccessingSet::ContainsElement(const vector<ArrayDimension>& element) const
 {
     vector<vector<ArrayDimension>> tails;
     FindUncovered(element, tails);
-    return tails.empty();
+    return !tails.empty();
 }
 
 void AccessingSet::FindCoveredBy(const vector<ArrayDimension>& element, vector<vector<ArrayDimension>>& result) const
@@ -254,15 +252,13 @@ AccessingSet AccessingSet::Diff(const AccessingSet& secondSet) const
         return *this;
 
     AccessingSet intersection = this->Intersect(secondSet);
-    vector<vector<ArrayDimension>> uncovered;
-    for (const auto& element : allElements)
+    AccessingSet uncovered = *this;
+    vector<vector<ArrayDimension>> result;
+    for (const auto& element : intersection.GetElements())
     {
         vector<vector<ArrayDimension>> current_uncovered;
-        intersection.FindUncovered(element, current_uncovered);
-        uncovered.insert(uncovered.end(),
-            std::move_iterator(current_uncovered.begin()),
-            std::move_iterator(current_uncovered.end())
-        );
+        uncovered.FindUncovered(element, current_uncovered);
+        uncovered = AccessingSet(current_uncovered);
     }
     return uncovered;
 }

src/PrivateAnalyzer/region.cpp

@@ -1,4 +1,3 @@
-#include <algorithm>
 #include<vector>
 #include<map>
 #include<unordered_set>
@@ -9,6 +8,7 @@
 
 #include "range_structures.h"
 #include "region.h"
+
 #include "SgUtils.h"
 
 using namespace std;
@@ -93,7 +93,7 @@ static string FindIndexName(int pos, SAPFOR::BasicBlock* block, map<string, Loop
     return "";
 }
 
-static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use, Region* region) {
+static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use) {
     auto instructions = block->getInstructions();
     map<string, LoopGraph*> loopForIndex;
     BuildLoopIndex(loopForIndex, loop);
@@ -105,32 +105,6 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
 
         auto operation = instruction->getInstruction()->getOperation();
         auto type = instruction->getInstruction()->getArg1()->getType();
-        if (operation == SAPFOR::CFG_OP::ASSIGN && instruction->getInstruction()->getResult()->getType() == SAPFOR::CFG_ARG_TYPE::ARRAY)
-        {
-            SgStatement* op = instruction->getInstruction()->getOperator();
-            if (op && op->expr(0) && isArrayRef(op->expr(0)) && op->expr(0)->symbol() && op->expr(0)->type())
-            {
-                if (isSgArrayType(op->expr(0)->symbol()->type()))
-                {
-                    SgArrayType* arrayType = (SgArrayType*)op->expr(0)->symbol()->type();
-                    int dimCount = ((SgArrayType*)op->expr(0)->symbol()->type())->dimension();
-                    vector<ArrayDimension> point;
-                    for (int i = 0; i < dimCount; i++)
-                    {
-                        string strDimLength = arrayType->sizeInDim(i)->unparse();
-                        if (arrayType->sizeInDim(i)->variant() == INT_VAL && strDimLength != "0")
-                            point.push_back({ 1ULL, 1ULL, (uint64_t)stoi(strDimLength), (SgArrayRefExp*)op->expr(0) });
-                    }
-
-                    if (point.size() == dimCount)
-                    {
-                        def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
-                        RegionInstruction regionInstruction;
-                        regionInstruction.def[instruction->getInstruction()->getResult()->getValue()] = AccessingSet({ point });
-                    }
-                }
-            }
-        }
         if ((operation == SAPFOR::CFG_OP::STORE || operation == SAPFOR::CFG_OP::LOAD) && type == SAPFOR::CFG_ARG_TYPE::ARRAY)
         {
             vector<SAPFOR::Argument*> index_vars;
@@ -150,26 +124,26 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
             vector<ArrayDimension> accessPoint(n);
 
             auto* ref = isSgArrayRefExp(instruction->getInstruction()->getExpression());
-            int fillCount = 0;
-
-            vector<pair<int, int>> coeffsForDims;
+            vector<pair<int, int>> coefsForDims;
             int subs = ref->numberOfSubscripts();
             for (int i = 0; ref && i < ref->numberOfSubscripts(); ++i)
             {
-                const vector<int*>& coeffs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
-                if (coeffs.size() == 1)
+                const vector<int*>& coefs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
+                if (coefs.size() == 1)
                 {
-                    const pair<int, int> coef(coeffs[0][0], coeffs[0][1]);
-                    coeffsForDims.push_back(coef);
+                    const pair<int, int> coef(coefs[0][0], coefs[0][1]);
+                    coefsForDims.push_back(coef);
                 }
 
             }
-            coeffsForDims = { coeffsForDims.rbegin(), coeffsForDims.rend() };
 
-            while (!index_vars.empty() && !refPos.empty() && !coeffsForDims.empty())
+            int fillCount = 0;
+
+            while (!index_vars.empty() && !refPos.empty() && !coefsForDims.empty())
             {
                 auto var = index_vars.back();
                 int currentVarPos = refPos.back();
+                pair<int, int> currentCoefs = coefsForDims.back();
                 ArrayDimension current_dim;
                 if (var->getType() == SAPFOR::CFG_ARG_TYPE::CONST)
                     current_dim = { stoul(var->getValue()), 1, 1, ref};
@@ -198,7 +172,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                             return -1;
                     }
 
-                    uint64_t start = coeffsForDims.back().second * currentLoop->startVal + coeffsForDims.back().first;
+                    uint64_t start = currentLoop->startVal;
                     uint64_t step = currentLoop->stepVal;
                     uint64_t iters = currentLoop->calculatedCountOfIters;
                     current_dim = { start, step, iters, ref };
@@ -211,29 +185,15 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                 }
                 index_vars.pop_back();
                 refPos.pop_back();
-                coeffsForDims.pop_back();
+                coefsForDims.pop_back();
             }
 
             if (fillCount == accessPoint.size())
             {
-                RegionInstruction instruction;
                 if (operation == SAPFOR::CFG_OP::STORE)
-                {
                     def[array_name].Insert(accessPoint);
-                    instruction.def[array_name] = { { accessPoint } };
-                }
                 else
-                {
-                    instruction.use[array_name] = { { accessPoint } };
-                    if (def.find(array_name) == def.end())
                     use[array_name].Insert(accessPoint);
-                    else
-                    {
-                        AccessingSet element({ accessPoint });
-                        use[array_name] = use[array_name].Union(element.Diff(def[array_name]));
-                    }
-                }
-                region->instructions.push_back(instruction);
             }
         }
     }
@@ -241,41 +201,6 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
 
 }
 
-static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const unordered_set<SAPFOR::BasicBlock*>& blockSet, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
-{
-    for (SAPFOR::BasicBlock* block : blockSet)
-    {
-        bool isCycleBlock = false;
-        for (SAPFOR::BasicBlock* prevBlock : block->getPrev())
-            isCycleBlock = isCycleBlock || (blockSet.find(prevBlock) != blockSet.end());
-
-        if (isCycleBlock)
-        {
-            bbToRegion[block]->removeNextRegion(bbToRegion[header]);
-            bbToRegion[header]->removePrevRegion(bbToRegion[block]);
-        }
-    }
-}
-
-static void DFS(Region* block, vector<Region*>& result, unordered_set<Region*> cycleBlocks)
-{
-    for (Region* nextBlock : block->getNextRegions())
-    {
-        if (cycleBlocks.find(nextBlock) != cycleBlocks.end())
-            DFS(nextBlock, result, cycleBlocks);
-    }
-    result.push_back(block);
-}
-
-void TopologySort(std::vector<Region*>& basikBlocks, Region* header)
-{
-    vector<Region*> result;
-    unordered_set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
-    DFS(header, result, cycleBlocks);
-    reverse(result.begin(), result.end());
-    basikBlocks = result;
-}
-
 static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const unordered_set<SAPFOR::BasicBlock*>& blockSet)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
@@ -290,11 +215,10 @@ static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegi
     }
 }
 
-static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, const unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     Region* region = new Region;
     auto [header, blockSet] = GetBasicBlocksForLoop(loop, Blocks);
-    RemoveHeaderConnection(header, blockSet, bbToRegion);
     if (bbToRegion.find(header) != bbToRegion.end())
         region->setHeader(bbToRegion.at(header));    
     else
@@ -313,7 +237,6 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
             continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    TopologySort(region->getBasickBlocks(), region->getHeader());
     return region;
 }
 
@@ -324,13 +247,12 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
     for (auto poiner : blockSet)
     {
         bbToRegion[poiner] = new Region(*poiner);
-        this->basickBlocks.push_back(bbToRegion[poiner]);
-        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use, bbToRegion[poiner]);
+        this->basickBlocks.insert(bbToRegion[poiner]);
+        GetDefUseArray(poiner, loop, bbToRegion[poiner]->array_def, bbToRegion[poiner]->array_use);
 
     }
     this->header = bbToRegion[header];
     SetConnections(bbToRegion, blockSet);
-    RemoveHeaderConnection(header, blockSet, bbToRegion);
     //create subRegions
     for (LoopGraph* childLoop : loop->children)
     {
@@ -338,5 +260,4 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
             continue;
         subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    TopologySort(basickBlocks, this->header);
 }

src/PrivateAnalyzer/region.h

@@ -8,11 +8,6 @@
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
 
-struct RegionInstruction
-{
-    ArrayAccessingIndexes def, use, in, out;
-};
-
 class Region : public SAPFOR::BasicBlock {
 public:
     Region() { header = nullptr; }
@@ -25,25 +20,13 @@ public:
 
     void setHeader(Region* region) { header = region; }
 
-    std::vector<Region*>& getBasickBlocks() { return basickBlocks; }
+    std::unordered_set<Region*>& getBasickBlocks() { return basickBlocks; }
 
-    void addBasickBlocks(Region* region) { basickBlocks.push_back(region); }
+    void addBasickBlocks(Region* region) { basickBlocks.insert(region); }
 
     const std::unordered_set<Region*>& getPrevRegions() { return prevRegions; }
 
-    std::unordered_set<Region*>& getNextRegions() { return nextRegions; }
-
-    void removeNextRegion(Region* region)
-    {
-        if (nextRegions.find(region) != nextRegions.end())
-            nextRegions.erase(region);
-    }
-
-    void removePrevRegion(Region* region)
-    {
-        if (prevRegions.find(region) != prevRegions.end())
-            prevRegions.erase(region);
-    }
+    std::unordered_set<Region*> getNextRegions() { return nextRegions; }
 
     void addPrevRegion(Region* region) { prevRegions.insert(region); }
 
@@ -65,18 +48,13 @@ public:
 
     void addSubRegions(Region* region) { subRegions.insert(region); }
 
-    std::vector<RegionInstruction> instructions;
-
     ArrayAccessingIndexes array_def, array_use, array_out, array_in, array_priv;
 
 private:
-    std::vector<Region*> basickBlocks;
-    std::unordered_set<Region*> subRegions;
+    std::unordered_set<Region*> subRegions, basickBlocks;
     /*next Region which is BB for current BB Region*/
     std::unordered_set<Region*> nextRegions;
     /*prev Regions which is BBs for current BB Region*/
     std::unordered_set<Region*> prevRegions;
     Region* header;
 };
-
-void TopologySort(std::vector<Region*>& basikBlocks, Region* header);

src/Sapfor.cpp

@@ -1,4 +1,4 @@
-#include "Utils/leak_detector.h"
+#include "Utils/leak_detector.h"
 
 #pragma comment(linker, "/STACK:536870912") // 512 МБ
 
@@ -90,7 +90,6 @@
 #include "Transformations/DeadCodeRemoving/dead_code.h"
 #include "Transformations/RenameSymbols/rename_symbols.h"
 #include "Transformations/FunctionInlining/inliner.h"
-#include "Transformations/MoveOperators/move_operators.h"
 
 #include "ProjectParameters/projectParameters.h"
 
@@ -942,8 +941,6 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                     internalExit = err;
             }
         }
-        else if (curr_regime == MOVE_OPERATORS)        
-            moveOperators(file, fullIR, countOfTransform);
         else if (curr_regime == PRIVATE_REMOVING_ANALYSIS)
         {
             auto itFound = loopGraph.find(file->filename());
@@ -1040,8 +1037,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                           PRIVATE_REMOVING,
                           PRIVATE_ARRAYS_EXPANSION, 
                           PRIVATE_ARRAYS_SHRINKING,
-                          REMOVE_DEAD_CODE,
-                          MOVE_OPERATORS };
+                          REMOVE_DEAD_CODE };
 
     if ((countOfTransform == 0 || internalExit > 0) && applyFor.find(curr_regime) != applyFor.end())
     {
@@ -1893,7 +1889,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         findParameters(parametersOfProject, fullIR, declaredArrays);
     else if (curr_regime == BUILD_IR)
     {
-        auto CFG_forFile = buildCFG(commonBlocks, allFuncInfo_IR, SAPFOR::CFG_Settings());
+        auto CFG_forFile = buildCFG(commonBlocks, allFuncInfo_IR, SAPFOR::CFG_Settings(0));
         for (auto& byFunc : CFG_forFile)
             fullIR[byFunc.first].insert(fullIR[byFunc.first].end(), byFunc.second.begin(), byFunc.second.end());
 
@@ -2343,7 +2339,6 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
     case INSERT_NO_DISTR_FLAGS_FROM_GUI:
     case PRIVATE_REMOVING:
     case RENAME_INLCUDES:
-    case MOVE_OPERATORS:
         runAnalysis(*project, curr_regime, true, "", folderName);
         break;
     case INLINE_PROCEDURES:
@@ -2524,8 +2519,8 @@ int main(int argc, char **argv)
                     out_free_form = 1;
                     out_line_unlimit = 1;
                 }
-                /*else if (string(curr_arg) == "-sh")
-                    staticShadowAnalysis = 1;*/
+                else if (string(curr_arg) == "-sh")
+                    staticShadowAnalysis = 1;
                 else if (string(curr_arg) == "-shWidth")
                 {
                     i++;

src/Sapfor.h

@@ -122,8 +122,6 @@ enum passes {
     CREATE_INTER_TREE,
     INSERT_INTER_TREE,
 
-    MOVE_OPERATORS,
-
     SHADOW_GROUPING,
     INLINE_PROCEDURES,
     FILL_PARALLEL_REG_IR,
@@ -189,6 +187,7 @@ enum passes {
     FIND_PRIVATE_ARRAYS,
 
     TRANSFORM_ASSUMED_SIZE_PARAMETERS,
+
     ARRAY_PROPAGATION,
 
     TEST_PASS,
@@ -323,7 +322,6 @@ static void setPassValues()
     passNames[CHECK_PAR_REG_DIR] = "CHECK_PAR_REG_DIR";
     passNames[CREATE_INTER_TREE] = "CREATE_INTER_TREE";
     passNames[INSERT_INTER_TREE] = "INSERT_INTER_TREE";
-    passNames[MOVE_OPERATORS] = "MOVE_OPERATORS";
     passNames[CREATE_PARALLEL_REGIONS] = "CREATE_PARALLEL_REGIONS";
     passNames[PRIVATE_REMOVING_ANALYSIS] = "PRIVATE_REMOVING_ANALYSIS";
     passNames[PRIVATE_REMOVING] = "PRIVATE_REMOVING";
@@ -380,6 +378,7 @@ static void setPassValues()
     passNames[FIND_PRIVATE_ARRAYS] = "FIND_PRIVATE_ARRAYS";
 
     passNames[TRANSFORM_ASSUMED_SIZE_PARAMETERS] = "TRANSFORM_ASSUMED_SIZE_PARAMETERS";
+
     passNames[ARRAY_PROPAGATION] = "ARRAY_PROPAGATION";
 
     passNames[TEST_PASS] = "TEST_PASS";

src/SapforData.h

@@ -19,7 +19,7 @@
 extern std::map<std::string, std::string> shortFileNames;
 static int activeState = 0;
 
-int staticShadowAnalysis = 1;
+int staticShadowAnalysis = 0;
 int staticPrivateAnalysis = 0;
 int keepDvmDirectives = 0;
 int keepFiles = 0;

src/Transformations/DeadCodeRemoving/dead_code.cpp

@@ -12,7 +12,6 @@ using std::map;
 using std::string;
 using std::vector;
 using std::set;
-using  SAPFOR::CFG_Settings;
 
 using std::remove_if;
 
@@ -425,8 +424,7 @@ int removeDeadCode(SgStatement* func,
         if (intervalDelEnd->lineNumber() < prog->lineNumber() || intervalDelEnd->lineNumber() > prog->lastNodeOfStmt()->lineNumber())
             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop });
-    auto cfg = buildCFGforCurrentFunc(func, settings, commonBlocks, allFuncs);
+    auto cfg = buildCFGforCurrentFunc(func, SAPFOR::CFG_Settings(true, false, false, false, false, false, false), commonBlocks, allFuncs);
 
     if(cfg.size() != 1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);

src/Transformations/FunctionInlining/inliner.cpp

@@ -1089,8 +1089,6 @@ static int clean(const string& funcName, SgStatement* funcSt, const map<string,
             }
 
             SgGotoStmt* gotoSt = new SgGotoStmt(*contLab);
-            if (st->label())
-                gotoSt->setLabel(*st->label());
             st->insertStmtBefore(*gotoSt, *st->controlParent());
 
             toDelete.push_back(st);

src/Transformations/GlobalVariables/fix_common_blocks.cpp

@@ -18,66 +18,69 @@ using std::tuple;
 
 /// main function:
 // renew unions for all common blocks in the file
-//void BuildNewCommDecls
+static void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBlocks,
+    map<string, deque<CommConstraint>>& newCommonDecls, map<string, map<string, deque<CommConstraint>>>& commDecls,
+    set<string>& badCommon, map<string, set<string>>& notUsedVars, vector<SgStatement*>& programUnits);
 
 // get names of variables and array elements, which were referenced in programm unit
-//set<string> getUses
-//void getUsesFromExpr
+static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames);
+static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used);
 
 // splits arrays into elements and replaces not used vars with empty constraints
-//bool splitType
- 
+static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars);
 // create constraits set
-//deque<CommConstraint> makeConstraints
- 
+static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars);
 // build union
-//bool buildConstraintsUnion
-//bool docheckUnequalConstraints
-//bool check
+static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints);
+static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints);
+static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints);
 
 /// small help functions:
-//string getParentName
-//bool equalDims
-//bool equalConstraints
-//void addElem
+static string getParentName(const string& name);
+static bool equalDims(const CommConstraint& a, const CommConstraint& b);
+static bool equalConstraints(const CommConstraint& a, const CommConstraint& b);
+static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem);
+//////
 
 // change names of variables in 'constraints'
-//void fixNames
+static void fixNames(deque<CommConstraint>& constraints, const string& commName);
 
 ////// step2: transformation
+
 /// main function
 // peform transformation on every program unit in the file
-//void fixFunctions
+static void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
+    map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars);
 
 // get pairs of names (namesOldToNew) for renaming
-//bool getNamesOldToNew
+static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew);
 
 // create new symbols for new variables in new common declaration (constraints)
-//void makeCommVarSymbs
-
+static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
+    map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl);
 // delete from program unit all references to names in commVarNames
-//void deleteOldVars
+static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames);
 
 // calls fixExpression for each statement, replaces names in data statement
-//void renameVariables
-
+static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew);
 // replacing variables or array elements in expression expr if their names are in namesOldToNew
-//SgExpression* fixExpression
+static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew);
 
 // make new exprList exprssion for new declaration decl with symbols from newSymbs
-//SgExpression* makeExprListForCommon
-
+static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
+    SgFile* file, SgStatement* firstSt);
 // replace old common declarations with new ones
-//void rewriteCommon
+static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs);
 
 /// help functions:
-//SgExpression* makeIdxFromStr(const string& str);
-
+static SgExpression* makeIdxFromStr(const string& str);
 // make new expression of array element
-//SgExpression* newArrElemExpr
-//bool variablePositionComp
+static SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs);
+static bool variablePositionComp(const Variable* lhs, const Variable* rhs);
 //////
 
+
+
 CommConstraint::CommConstraint(const Variable* var, bool u, const string& funcName, const string& fileName)
 {
     used = u;
@@ -122,6 +125,7 @@ CommConstraint::CommConstraint(const Variable* var, bool u, const string& funcNa
     }
 }
 
+
 CommConstraint::CommConstraint(const string& name, SgType* t, bool u) : used(u), type(t), identifier(name)
 {
     typeVariant = type->variant();
@@ -135,7 +139,8 @@ CommConstraint::CommConstraint(const string& name, SgType* t, bool u, vector<Dec
     size = getSizeOfType(type);
 }
 
-static string getParentName(const string& name)
+
+string getParentName(const string& name)
 {
     size_t len = name.find("%");
     size_t posB = name.find("(");
@@ -149,7 +154,8 @@ static string getParentName(const string& name)
     return name.substr(0, len);
 }
 
-static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used)
+
+void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarNames, set<string>& used)
 {
     if (expr == NULL)
         return;
@@ -188,7 +194,8 @@ static void getUsesFromExpr(SgExpression* expr, const set<string>& commonVarName
     getUsesFromExpr(expr->rhs(), commonVarNames, used);
 }
 
-static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames)
+
+set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNames)
 {
     set<string> used;
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
@@ -205,7 +212,8 @@ static set<string> getUses(SgStatement* firstSt, const set<string>& commonVarNam
     return used;
 }
 
-static bool equalDims(const CommConstraint& a, const CommConstraint& b)
+
+bool equalDims(const CommConstraint& a, const CommConstraint& b)
 {
     const vector<pair<int, int>>& adim = a.arrayInfo->GetSizes();
     const vector<pair<int, int>>& bdim = b.arrayInfo->GetSizes();
@@ -216,12 +224,11 @@ static bool equalDims(const CommConstraint& a, const CommConstraint& b)
         if (adim[i].second - adim[i].first != bdim[i].second - bdim[i].first)
             return false;
     }
-
-    return true;
 }
 
+
 // TODO: add attributes to CommConstraints, check if a and b have equal attributes
-static bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
+bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
 {
     if ((a.arrayInfo != NULL && b.arrayInfo == NULL) || ((a.arrayInfo == NULL && b.arrayInfo != NULL)))
         return false;
@@ -232,7 +239,8 @@ static bool equalConstraints(const CommConstraint& a, const CommConstraint& b)
     return true;
 }
 
-static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
+
+void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
 {
     if (elem.typeVariant == 0 && !comm.empty() && comm.back().typeVariant == 0)
         comm.back().size += elem.size;
@@ -240,8 +248,9 @@ static void addElem(deque<CommConstraint>& comm, const CommConstraint& elem)
         comm.push_back(elem);
 }
 
+
 // TODO: check attributes: do not split arrays with pointer or target attributes if check_use == true
-static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
+bool splitType(deque<CommConstraint>& d, bool check_use, const set<string>& namesOfUsedVars = {})
 {
     CommConstraint var = d.front();
     string name = var.identifier;
@@ -289,7 +298,8 @@ static bool splitType(deque<CommConstraint>& d, bool check_use, const set<string
     }
 }
 
-static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars)
+
+deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints, const set<string>& namesOfUsedVars, set<string>& notUsedVars)
 {
     deque<CommConstraint> res;
     while (!constraints.empty())
@@ -306,7 +316,8 @@ static deque<CommConstraint> makeConstraints(deque<CommConstraint>& constraints,
     return res;
 }
 
-static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints)
+
+bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     while (!A.empty() && !B.empty())
     {
@@ -345,8 +356,8 @@ static bool check(deque<CommConstraint>& A, deque<CommConstraint>& B, pair<CommC
     return true;
 }
 
-static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, 
-                                      pair<CommConstraint, CommConstraint>& problemConstraints)
+
+bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstraint>& B, deque<CommConstraint>& newU, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     if (U.front().typeVariant == 0)
     {
@@ -369,8 +380,8 @@ static bool docheckUnequalConstraints(deque<CommConstraint>& U, deque<CommConstr
     return true;
 }
 
-static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, 
-                                  const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
+
+bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint> B, const set<string>& namesOfUsedVars, pair<CommConstraint, CommConstraint>& problemConstraints)
 {
     deque<CommConstraint> newU;
     while (!U.empty() && !B.empty())
@@ -425,8 +436,8 @@ static bool buildConstraintsUnion(deque<CommConstraint>& U, deque<CommConstraint
     return true;
 }
 
-//TODO: check this: newDecl and oldDecl => do these variables need references?
-static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
+
+bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint> oldDecl, map<string, string>& namesOldToNew)
 {
     bool needChange = false;
     map<string, string> rename;
@@ -491,17 +502,15 @@ static bool getNamesOldToNew(deque<CommConstraint> newDecl, deque<CommConstraint
             newDecl.pop_front();
         }
     }
-
     if (!oldDecl.empty() || !newDecl.empty())
         needChange = true;
-
     if (needChange)
         namesOldToNew.insert(rename.begin(), rename.end());
-
     return needChange;
 }
 
-static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, const string& commName,
+
+void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* file, SgStatement* func, string commName,
     map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl)
 {
     for (const CommConstraint& var : constraints)
@@ -515,7 +524,8 @@ static void makeCommVarSymbs(const deque<CommConstraint>& constraints, SgFile* f
     }
 }
 
-static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
+
+void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
 {
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
     vector<SgStatement*> stmtsToDelete;
@@ -561,12 +571,12 @@ static void deleteOldVars(SgStatement* firstSt, const set<string>& commVarNames)
         }
         // TODO: delete common variables form attributes statements (like DIM_STAT)
     }
-
     for (SgStatement* st : stmtsToDelete)
         st->deleteStmt();
 }
 
-static SgExpression* makeIdxFromStr(const string& str)
+
+SgExpression* makeIdxFromStr(const string& str)
 {
     vector<SgExpression*> items;
     int num = 0;
@@ -581,13 +591,13 @@ static SgExpression* makeIdxFromStr(const string& str)
             num = 0;
         }
     }
-
     reverse(items.begin(), items.end());
     SgExpression* exprList = makeExprList(items, false);
     return exprList;
 }
 
-static SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs)
+
+SgExpression* newArrElemExpr(const string& newName, const map<string, SgSymbol*>& newSymbs)
 {
     size_t pos = newName.find('(');
     SgExpression* newExpr = new SgArrayRefExp(*newSymbs.at(newName.substr(0, pos)));
@@ -595,11 +605,11 @@ static SgExpression* newArrElemExpr(const string& newName, const map<string, SgS
     return newExpr;
 }
 
-static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew)
+
+SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbol*>& newSymbs, const map<string, string>& namesOldToNew)
 {
     if (expr == NULL)
         return NULL;
-
     if (expr->variant() == VAR_REF || expr->variant() == ARRAY_REF)
     {
         string name = expr->symbol()->identifier();
@@ -635,18 +645,17 @@ static SgExpression* fixExpression(SgExpression* expr, const map<string, SgSymbo
             }
         }
     }
-
     SgExpression* lhs = fixExpression(expr->lhs(), newSymbs, namesOldToNew);
     if (lhs != NULL)
         expr->setLhs(lhs);
-
     SgExpression* rhs = fixExpression(expr->rhs(), newSymbs, namesOldToNew);
     if (rhs != NULL)
         expr->setRhs(rhs);
     return NULL;
 }
 
-static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew)
+
+void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>& newVarSymbs, const map<string, string>& namesOldToNew)
 {
     SgStatement* lastSt = firstSt->lastNodeOfStmt();
     for (SgStatement* curSt = firstSt; curSt != NULL && curSt != lastSt; curSt = curSt->lexNext())
@@ -694,7 +703,8 @@ static void renameVariables(SgStatement* firstSt, const map<string, SgSymbol*>&
     }
 }
 
-static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
+
+SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, const map<string, SgSymbol*>& newSymbs,
     SgFile* file, SgStatement* firstSt)
 {
     vector<SgExpression*> items;
@@ -728,7 +738,8 @@ static SgExpression* makeExprListForCommon(const deque<CommConstraint>& decl, co
     return exprList;
 }
 
-static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs)
+
+void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& commListExprs)
 {
     vector<SgStatement*> commonStmtsToDelete;
     for (SgStatement* st = firstSt; st != firstSt->lastDeclaration()->lexNext(); st = st->lexNext())
@@ -779,12 +790,12 @@ static void rewriteCommon(SgStatement* firstSt, map<string, SgExpression*>& comm
                 commonStmtsToDelete.push_back(st);
         }
     }
-
     for (SgStatement* st : commonStmtsToDelete)
         st->deleteStmt();
 }
 
-static void fixNames(deque<CommConstraint>& constraints, const string& commName)
+
+void fixNames(deque<CommConstraint>& constraints, const string& commName)
 {
     for (auto& var : constraints)
     {
@@ -799,12 +810,14 @@ static void fixNames(deque<CommConstraint>& constraints, const string& commName)
     }
 }
 
-static bool variablePositionComp(const Variable* lhs, const Variable* rhs)
+
+bool variablePositionComp(const Variable* lhs, const Variable* rhs)
 {
     return lhs->getPosition() < rhs->getPosition();
 }
 
-static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
+
+void fixFunctions(SgFile* file, vector<SgStatement*> programUnits, map<string, deque<CommConstraint>>& newCommonDecls,
     map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars)
 {
     for (SgStatement* unitSt : programUnits)
@@ -812,13 +825,11 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
         string funcName = unitSt->symbol()->identifier();
         if (commDecls.find(funcName) == commDecls.end())
             continue;
-
         SgStatement* firstSt = unitSt;
         map<string, SgExpression*> commListExprs;
         map<string, SgSymbol*> newVarSymbs; // new symbols for new variables
         map<string, string> namesOldToNew; // for ranaming: old name -> new name
         vector<SgSymbol*> needNewDecl;
-
         for (auto& common : commDecls[funcName])
         {
             string commName = common.first;
@@ -829,11 +840,9 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
             bool needChange = getNamesOldToNew(newDecl, common.second, namesOldToNew);
             if (!needChange)
                 continue;
-
             makeCommVarSymbs(newDecl, file, firstSt, commName, newVarSymbs, needNewDecl);
             commListExprs[commName] = makeExprListForCommon(newDecl, newVarSymbs, file, firstSt);
         }
-
         if (!commListExprs.empty())
         {
             for (const auto& item : commListExprs)
@@ -847,7 +856,8 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
     }
 }
 
-static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& allCommonBlocks,
+
+void BuildNewCommDecls(SgFile* file, const map<string, CommonBlock*> allCommonBlocks,
         map<string, deque<CommConstraint>>& newCommonDecls, map<string, map<string, deque<CommConstraint>>>& commDecls,
         set<string>& badCommon, map<string, set<string>>& notUsedVars, vector<SgStatement*>& programUnits)
 {
@@ -888,8 +898,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
                     constraints.push_back(newConstr);
                 }
                 if (hasChar && hasNotChar)  // TDOO: make proper warning message or separate such common blocks
-                    __spf_print(1, "common block '%s' ('%s':%d) contains variables of symbolic and numeric types. It is required to divide\n", 
-                                    commName.c_str(), fileName.c_str(), constraints.back().uses.back().getLineNum());
+                    __spf_print(1, "common block '%s' ('%s':%d) contains variables of symbolic and numeric types. It is required to divide\n", commName.c_str(), fileName.c_str(), constraints.back().uses.back().lineNum);
                 if (hasChar)
                 {
                     badCommon.insert(commName);
@@ -906,7 +915,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
                     for (auto x : problemConstraints.first.uses)         // TODO: make proper warning message
                         for (auto y : problemConstraints.second.uses)
                             __spf_print(1, "variables '%s' and '%s' in one storage association (common block '%s') have different types (files - %s:%d and %s:%d)\n",
-                                            x.getVarName(), y.getVarName(), commName.c_str(), x.getFileName(), x.getLineNum(), y.getFileName(), y.getLineNum());
+                                x.varName.c_str(), y.varName.c_str(), commName.c_str(), x.fileName.c_str(), x.lineNum, y.fileName.c_str(), y.lineNum);
                 }
             }
             curSt = curSt->lastNodeOfStmt();
@@ -918,7 +927,7 @@ static void buildNewCommDecls(SgFile* file, const map<string, CommonBlock*>& all
 
 
 // main function
-void fixCommonBlocks(const map<string, vector<FuncInfo*>>& allFuncInfo, const map<string, CommonBlock*>& allCommonBlocks, SgProject* project)  // TODO: separate into 2 steps?
+void fixCommonBlocks(const map<string, vector<FuncInfo*>> allFuncInfo, const map<string, CommonBlock*> allCommonBlocks, SgProject* project)  // TODO: separate into 2 steps?
 {
     int filesNum = project->numberOfFiles();
     map<string, map<string, map<string, deque<CommConstraint>>>> commDecls; // file_name -> function_name -> common block name -> old declaration of common block
@@ -932,12 +941,10 @@ void fixCommonBlocks(const map<string, vector<FuncInfo*>>& allFuncInfo, const ma
         SgFile* file = &project->file(i);
         string fileName = file->filename();
         file->switchToFile(fileName);
-        buildNewCommDecls(file, allCommonBlocks, newCommonDecls, commDecls[fileName], badCommon, notUsedVars, programUnitsInFile[fileName]);
+        BuildNewCommDecls(file, allCommonBlocks, newCommonDecls, commDecls[fileName], badCommon, notUsedVars, programUnitsInFile[fileName]);
     }
-
     for (auto& elem : newCommonDecls)
         fixNames(elem.second, elem.first);
-
     for (int i = 0; i < filesNum; i++)  // second step
     {
         SgFile* file = &project->file(i);

src/Transformations/GlobalVariables/fix_common_blocks.h

@@ -16,18 +16,12 @@
 
 struct DeclInfo // for error messages
 {
-private:
     std::string varName;
     std::string fileName;
     int lineNum;
 
-public:
     DeclInfo() : varName(""), fileName(""), lineNum(0) {};
     DeclInfo(const std::string& vn, const std::string& fn, int ln) : varName(vn), fileName(fn), lineNum(ln) {};
-
-    const char* getVarName() const { return varName.c_str(); }
-    const char* getFileName() const { return fileName.c_str(); }
-    int getLineNum() const { return lineNum; }
 };
 
 struct CommConstraint  // TODO: add variable attributes
@@ -48,4 +42,4 @@ struct CommConstraint  // TODO: add variable attributes
 };
 
 
-void fixCommonBlocks(const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, const std::map<std::string, CommonBlock*>& allCommonBlocks, SgProject* project);
+void fixCommonBlocks(const std::map<std::string, std::vector<FuncInfo*>> allFuncInfo, const std::map<std::string, CommonBlock*> allCommonBlocks, SgProject* project);

src/Transformations/LoopCombining/loops_combiner.cpp

@@ -1123,7 +1123,7 @@ static bool hasDependenciesBetweenArrays(LoopGraph* firstLoop, LoopGraph* loop,
         for (int d = 0; d < dimensions; ++d)
         {
             //по измерениям массива отображение на цикл вложенности d
-            vector<set<pair<int, int>>> coeffsRead[2], coeffsWrite[2];
+            vector<set<pair<int, int>>> coefsRead[2], coefsWrite[2];
 
             checkNull(currLoop[0], convertFileName(__FILE__).c_str(), __LINE__);
             checkNull(currLoop[1], convertFileName(__FILE__).c_str(), __LINE__);
@@ -1133,31 +1133,31 @@ static bool hasDependenciesBetweenArrays(LoopGraph* firstLoop, LoopGraph* loop,
                 auto it = currLoop[k]->readOpsForLoop.find(array);
                 if (it != currLoop[k]->readOpsForLoop.end())
                 {
-                    if (coeffsRead[k].size() == 0)
-                        coeffsRead[k].resize(it->second.size());
+                    if (coefsRead[k].size() == 0)
+                        coefsRead[k].resize(it->second.size());
 
                     for (int z = 0; z < it->second.size(); ++z)
                         if (it->second[z].coefficients.size())
                             for (auto& coef : it->second[z].coefficients)
-                                coeffsRead[k][z].insert(coef.first);
+                                coefsRead[k][z].insert(coef.first);
                 }
 
                 auto itW = currLoop[k]->writeOpsForLoop.find(array);
                 if (itW != currLoop[k]->writeOpsForLoop.end())
                 {
-                    if (coeffsWrite[k].size() == 0)
-                        coeffsWrite[k].resize(itW->second.size());
+                    if (coefsWrite[k].size() == 0)
+                        coefsWrite[k].resize(itW->second.size());
 
                     for (int z = 0; z < itW->second.size(); ++z)
                         if (itW->second[z].coefficients.size())
                             for (auto& coef : itW->second[z].coefficients)
-                                coeffsWrite[k][z].insert(coef.first);
+                                coefsWrite[k][z].insert(coef.first);
                 }
             }
 
             //нет записей, значит нет зависимости
             bool nulWrite = true;
-            for (auto& wr : coeffsWrite)
+            for (auto& wr : coefsWrite)
                 for (auto& elem : wr)
                     if (elem.size() != 0)
                         nulWrite = false;
@@ -1168,62 +1168,62 @@ static bool hasDependenciesBetweenArrays(LoopGraph* firstLoop, LoopGraph* loop,
             // если чтение в одном цикле и запись (и наоборот) в другом идут по разным правилам, то пока что это зависимость.
             // здесь можно уточнить.
 
-            const int len = std::max(coeffsWrite[0].size(), coeffsRead[0].size());
+            const int len = std::max(coefsWrite[0].size(), coefsRead[0].size());
             int countW[2] = { 0, 0 };
             int countR[2] = { 0, 0 };
 
             for (int L = 0; L < 2; ++L)
-                for (int z = 0; z < coeffsWrite[L].size(); ++z)
-                    countW[L] += (coeffsWrite[L][z].size() ? 1 : 0);
+                for (int z = 0; z < coefsWrite[L].size(); ++z)
+                    countW[L] += (coefsWrite[L][z].size() ? 1 : 0);
 
             for (int L = 0; L < 2; ++L)
-                for (int z = 0; z < coeffsRead[L].size(); ++z)
-                    countR[L] += (coeffsRead[L][z].size() ? 1 : 0);
+                for (int z = 0; z < coefsRead[L].size(); ++z)
+                    countR[L] += (coefsRead[L][z].size() ? 1 : 0);
 
             for (int p = 0; p < len; ++p)
             {
-                if (coeffsWrite[1].size() && coeffsWrite[0].size())
-                    if (coeffsWrite[0][p].size() != 0 && coeffsWrite[1][p].size() != 0)
-                        if (coeffsWrite[0][p] != coeffsWrite[1][p])
+                if (coefsWrite[1].size() && coefsWrite[0].size())
+                    if (coefsWrite[0][p].size() != 0 && coefsWrite[1][p].size() != 0)
+                        if (coefsWrite[0][p] != coefsWrite[1][p])
                             return true;
 
-                if (coeffsRead[1].size() && coeffsWrite[0].size())
-                    if (coeffsWrite[0][p].size() != 0 && coeffsRead[1][p].size() != 0)
-                        if (coeffsWrite[0][p] != coeffsRead[1][p])
+                if (coefsRead[1].size() && coefsWrite[0].size())
+                    if (coefsWrite[0][p].size() != 0 && coefsRead[1][p].size() != 0)
+                        if (coefsWrite[0][p] != coefsRead[1][p])
                             return true;
 
-                if (coeffsWrite[1].size() && coeffsRead[0].size())
-                    if (coeffsWrite[1][p].size() != 0 && coeffsRead[0][p].size() != 0)
-                        if (coeffsWrite[1][p] != coeffsRead[0][p])
+                if (coefsWrite[1].size() && coefsRead[0].size())
+                    if (coefsWrite[1][p].size() != 0 && coefsRead[0][p].size() != 0)
+                        if (coefsWrite[1][p] != coefsRead[0][p])
                             return true;
                 
 
                 //отображение на разные измерения
-                if (coeffsWrite[1].size() && coeffsWrite[0].size())
+                if (coefsWrite[1].size() && coefsWrite[0].size())
                 {
-                    if (coeffsWrite[0][p].size() != 0 && coeffsWrite[1][p].size() == 0 && countW[1] ||
-                        coeffsWrite[0][p].size() == 0 && coeffsWrite[1][p].size() != 0 && countW[0])
+                    if (coefsWrite[0][p].size() != 0 && coefsWrite[1][p].size() == 0 && countW[1] ||
+                        coefsWrite[0][p].size() == 0 && coefsWrite[1][p].size() != 0 && countW[0])
                         return true;
                 }
 
-                if (coeffsRead[1].size() && coeffsWrite[0].size())
+                if (coefsRead[1].size() && coefsWrite[0].size())
                 {
-                    if (coeffsWrite[0][p].size() != 0 && coeffsRead[1][p].size() == 0 && countR[1] ||
-                        coeffsWrite[0][p].size() == 0 && coeffsRead[1][p].size() != 0 && countW[0])
+                    if (coefsWrite[0][p].size() != 0 && coefsRead[1][p].size() == 0 && countR[1] ||
+                        coefsWrite[0][p].size() == 0 && coefsRead[1][p].size() != 0 && countW[0])
                         return true;
                 }
 
-                if (coeffsWrite[1].size() && coeffsRead[1].size())
+                if (coefsWrite[1].size() && coefsRead[1].size())
                 {
-                    if (coeffsWrite[1][p].size() != 0 && coeffsRead[0][p].size() == 0 && countR[0] ||
-                        coeffsWrite[1][p].size() == 0 && coeffsRead[0][p].size() != 0 && countW[1])
+                    if (coefsWrite[1][p].size() != 0 && coefsRead[0][p].size() == 0 && countR[0] ||
+                        coefsWrite[1][p].size() == 0 && coefsRead[0][p].size() != 0 && countW[1])
                         return true;
                 }
 
                 //где то нет правил отображения вообще, но есть факт его наличия. 
-                if ( ((coeffsWrite[0].size() == 0 && coeffsRead[0].size() == 0) && (countW[0] == 0 && countR[0] == 0)) 
+                if ( ((coefsWrite[0].size() == 0 && coefsRead[0].size() == 0) && (countW[0] == 0 && countR[0] == 0)) 
                     ||
-                    ((coeffsWrite[1].size() == 0 && coeffsRead[1].size() == 0) && (countW[1] == 0 && countR[1] == 0)) )
+                    ((coefsWrite[1].size() == 0 && coefsRead[1].size() == 0) && (countW[1] == 0 && countR[1] == 0)) )
                     return true;
             }
             

src/Transformations/LoopSplitting/loops_splitter.cpp

@@ -19,7 +19,6 @@ using std::pair;
 using std::make_pair;
 using std::wstring;
 using std::stack;
-using SAPFOR::CFG_Settings;
 
 #define PRINT_SPLITTED_FRAGMENTS 0
 
@@ -316,7 +315,7 @@ static map<SgStatement*, pair<set<SgStatement*>, set<SgStatement*>>>
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
             map<SAPFOR::Argument*, set<int>> outForCurr;
-            buildGenKillForCFG(itCFG->second, funcByName, outForFunc, gen, kill, &genForIR, &killForIR, notInitedGlobals, SAPFOR::CFG_Settings());
+            buildGenKillForCFG(itCFG->second, funcByName, outForFunc, gen, kill, &genForIR, &killForIR, notInitedGlobals, SAPFOR::CFG_Settings(0));
             
             if (outForFunc.count(byFunc))
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -1052,8 +1051,7 @@ int splitLoops(SgFile *file, vector<LoopGraph*> &loopGraphs, vector<Messages> &m
                 checkNull(listExp, convertFileName(__FILE__).c_str(), __LINE__);
                 int deep = listExp->length();
                 
-                const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withRD, CFG_Settings::CFG_withCallFrom, CFG_Settings::CFG_withDominators });
-                currIR = buildCFGforCurrentFunc(loop->loop, settings, commonBlocks, allFuncInfo);
+                currIR = buildCFGforCurrentFunc(loop->loop, SAPFOR::CFG_Settings(true, true), commonBlocks, allFuncInfo);
                 totalErr = splitLoop(loop, messages, deep, depInfoForLoopGraph);
 
                 if (totalErr > 0)

src/Transformations/MoveOperators/move_operators.cpp

@@ -1,626 +0,0 @@
-#include <map>
-#include <set>
-#include <vector>
-#include <iostream>
-#include <algorithm>
-#include <cstring>
-#include <cstdlib>
-
-#include "../../Utils/errors.h"
-#include "../../Utils/SgUtils.h"
-#include "../../GraphCall/graph_calls.h"
-#include "../../GraphCall/graph_calls_func.h"
-#include "../../CFGraph/CFGraph.h"
-#include "../../CFGraph/IR.h"
-#include "../../GraphLoop/graph_loops.h"
-#include "move_operators.h"
-
-using namespace std;
-
-set<int> loop_tags = {FOR_NODE};
-set<int> control_tags = {IF_NODE, ELSEIF_NODE, DO_WHILE_NODE, WHILE_NODE, LOGIF_NODE};
-set<int> control_end_tags = {CONTROL_END};
-
-
-static vector<SAPFOR::IR_Block*> findInstructionsFromStatement(SgStatement* st, const vector<SAPFOR::BasicBlock*>& blocks)
-{
-    vector<SAPFOR::IR_Block*> result;
-    if (!st)
-        return result;
-
-    const int stmtId = st->id();
-    for (auto* bb : blocks)
-    {
-        if (!bb)
-            continue;
-
-        for (auto* ir : bb->getInstructions())
-        {
-            if (!ir || !ir->getInstruction())
-                continue;
-
-            SgStatement* op = ir->getInstruction()->getOperator();
-            if (op && op->id() == stmtId)
-                result.push_back(ir);
-        }
-    }
-
-    sort(result.begin(), result.end(),
-         [](const SAPFOR::IR_Block* a, const SAPFOR::IR_Block* b) { return a->getNumber() < b->getNumber(); });
-    return result;
-}
-
-vector<SAPFOR::BasicBlock*> findFuncBlocksByFuncStatement(SgStatement *st, const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR) {
-    vector<SAPFOR::BasicBlock*> result;
-    if (!st)
-        return result;
-
-    Statement* forSt = (Statement*)st;
-    const string stmtFile = st->fileName();
-    const int stmtLine = st->lineNumber();
-
-    for (auto& func: FullIR) {
-        if (!func.first || !func.first->funcPointer)
-            continue;
-
-        const string funcFile = func.first->fileName;
-        const int funcLine = func.first->funcPointer->lineNumber();
-
-        // Important: select CFG blocks only for the same file and function header.
-        if (funcFile == stmtFile && funcLine == stmtLine)
-        {
-            result = func.second;
-            break;
-        }
-    }
-    return result;
-}
-
-map<SgForStmt*, vector<SAPFOR::BasicBlock*>> findAndAnalyzeLoops(SgStatement *st, const vector<SAPFOR::BasicBlock*>& blocks) {
-    map<SgForStmt*, vector<SAPFOR::BasicBlock*>> result;
-    SgStatement *lastNode = st->lastNodeOfStmt();
-    
-    while (st && st != lastNode) {
-        if (loop_tags.find(st -> variant()) != loop_tags.end()) {
-            SgForStmt *forSt = (SgForStmt*)st;
-            SgStatement *loopBody = forSt -> body();
-            SgStatement *lastLoopNode = st->lastNodeOfStmt();
-            set<int> blocks_nums;
-            
-            while (loopBody && loopBody != lastLoopNode) {
-                vector<SAPFOR::IR_Block*> irBlocks = findInstructionsFromStatement(loopBody, blocks);
-                if (!irBlocks.empty()) {
-                    SAPFOR::IR_Block* IR = irBlocks.front();
-                    if (IR && IR->getBasicBlock()) {
-                        if (blocks_nums.find(IR -> getBasicBlock() -> getNumber()) == blocks_nums.end()) {
-                            result[forSt].push_back(IR -> getBasicBlock());
-                            blocks_nums.insert(IR -> getBasicBlock() -> getNumber());
-                        }
-                    }
-                }
-                loopBody = loopBody -> lexNext();
-            }
-            sort(result[forSt].begin(), result[forSt].end());
-        }
-        st = st -> lexNext();
-    }
-    return result;
-}
-
-
-vector<SAPFOR::BasicBlock*> findBlocksInLoopsByFullIR(
-    SgStatement* funcStmt,
-    const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
-{
-    vector<SAPFOR::BasicBlock*> result;
-    if (!funcStmt)
-        return result;
-
-    const vector<SAPFOR::BasicBlock*> funcBlocks = findFuncBlocksByFuncStatement(funcStmt, FullIR);
-    const auto loopsMapping = findAndAnalyzeLoops(funcStmt, funcBlocks);
-
-    set<SAPFOR::BasicBlock*> uniq;
-    for (const auto& kv : loopsMapping)
-        for (auto* bb : kv.second)
-            if (bb)
-                uniq.insert(bb);
-
-    result.assign(uniq.begin(), uniq.end());
-    sort(result.begin(), result.end(),
-         [](const SAPFOR::BasicBlock* a, const SAPFOR::BasicBlock* b)
-         {
-             if (!a || !b)
-                 return a < b;
-             return a->getNumber() < b->getNumber();
-         });
-
-    return result;
-}
-
-static map<SgStatement*, vector<SgStatement*>> analyzeBasicBlockIntraDependencies(const SAPFOR::BasicBlock* bb)
-{
-    map<SgStatement*, vector<SgStatement*>> result;
-    if (!bb)
-        return result;
-
-    auto isCompoundStmt = [](SgStatement* st) -> bool
-    {
-        if (!st)
-            return true;
-        const int v = st->variant();
-        return loop_tags.count(v) || control_tags.count(v) || control_end_tags.count(v);
-    };
-
-    auto isTrackable = [](const SAPFOR::Argument* a) -> bool
-    {
-        if (!a)
-            return false;
-        const auto t = a->getType();
-        return t == SAPFOR::CFG_ARG_TYPE::VAR || t == SAPFOR::CFG_ARG_TYPE::REG;
-    };
-
-    auto argKey = [&](const SAPFOR::Argument* a) -> string
-    {
-        if (!a)
-            return string();
-        return to_string((int)a->getType()) + "#" + to_string((int)a->getMemType()) + "#" + a->getValue();
-    };
-
-    auto memKeyFromInstr = [&](const SAPFOR::Instruction* instr) -> string
-    {
-        if (!instr)
-            return string();
-        SgExpression* ex = instr->getExpression();
-        if (!ex)
-            return string();
-
-        auto exprKey = [&](auto&& self, SgExpression* e) -> string
-        {
-            if (!e)
-                return string("_");
-
-            if (auto* ar = isSgArrayRefExp(e))
-            {
-                SgSymbol* sym = ar->symbol() ? OriginalSymbol(ar->symbol()) : nullptr;
-                string key = string("A(") + (sym ? sym->identifier() : "?");
-                const int n = ar->numberOfSubscripts();
-                for (int i = 0; i < n; ++i)
-                {
-                    key += ",";
-                    key += self(self, ar->subscript(i));
-                }
-                key += ")";
-                return key;
-            }
-
-            if (e->variant() == VAR_REF || e->variant() == CONST_REF)
-            {
-                SgSymbol* sym = e->symbol() ? OriginalSymbol(e->symbol()) : nullptr;
-                return string((e->variant() == VAR_REF) ? "V(" : "C(") + (sym ? sym->identifier() : "?") + ")";
-            }
-
-            if (auto* v = isSgValueExp(e))
-            {
-                if (e->variant() == INT_VAL)
-                    return string("I(") + to_string(v->intValue()) + ")";
-                if (e->variant() == BOOL_VAL)
-                    return string("B(") + (v->boolValue() ? "1" : "0") + ")";
-                if (e->variant() == CHAR_VAL)
-                    return string("CH(") + string(1, v->charValue()) + ")";
-                if (e->variant() == FLOAT_VAL)
-                    return string("F(") + (v->floatValue() ? v->floatValue() : "") + ")";
-                if (e->variant() == DOUBLE_VAL)
-                    return string("D(") + (v->doubleValue() ? v->doubleValue() : "") + ")";
-                if (e->variant() == STRING_VAL)
-                    return string("S(") + (v->stringValue() ? v->stringValue() : "") + ")";
-            }
-
-            string key = string("N(") + to_string(e->variant());
-            if (e->lhs())
-                key += ",L=" + self(self, e->lhs());
-            if (e->rhs())
-                key += ",R=" + self(self, e->rhs());
-            key += ")";
-            return key;
-        };
-
-        return "MEMEX#" + exprKey(exprKey, ex);
-    };
-
-    auto isBarrier = [&](const SAPFOR::Instruction* instr) -> bool
-    {
-        if (!instr)
-            return true;
-        const auto op = instr->getOperation();
-        switch (op)
-        {
-        case SAPFOR::CFG_OP::F_CALL:
-        case SAPFOR::CFG_OP::IO_PARAM:
-        case SAPFOR::CFG_OP::DVM_DIR:
-        case SAPFOR::CFG_OP::SPF_DIR:
-        case SAPFOR::CFG_OP::POINTER_ASS:
-        case SAPFOR::CFG_OP::EXIT:
-            return true;
-        default:
-            return false;
-        }
-    };
-
-    auto isDef = [&](const SAPFOR::Instruction* instr) -> bool
-    {
-        if (!instr)
-            return false;
-        SAPFOR::Argument* r = instr->getResult();
-        if (!isTrackable(r))
-            return false;
-
-        const auto op = instr->getOperation();
-        if (op == SAPFOR::CFG_OP::STORE || op == SAPFOR::CFG_OP::REC_REF_STORE)
-            return false;
-
-        return true;
-    };
-
-    // Reaching definitions inside the BasicBlock in straight-line order:
-    // lastDef[var] = last operator in this block that defined it.
-    map<string, pair<SgStatement*, const SAPFOR::Argument*>> lastDef;
-    map<string, pair<SgStatement*, const SAPFOR::Argument*>> lastMemDef;
-    map<SgStatement*, set<SgStatement*>> depsSets;
-
-    for (auto* ir : bb->getInstructions())
-    {
-        if (!ir || !ir->getInstruction())
-            continue;
-
-        const SAPFOR::Instruction* instr = ir->getInstruction();
-        SgStatement* opStmt = instr->getOperator();
-        if (!opStmt)
-            continue;
-        if (isCompoundStmt(opStmt))
-            continue;
-
-        if (isBarrier(instr))
-        {
-            for (auto it = lastDef.begin(); it != lastDef.end();)
-            {
-                const SAPFOR::Argument* a = it->second.second;
-                if (!a || a->isMemGlobal() || a->isParameter())
-                    it = lastDef.erase(it);
-                else
-                    ++it;
-            }
-            for (auto it = lastMemDef.begin(); it != lastMemDef.end();)
-            {
-                const SAPFOR::Argument* a = it->second.second;
-                if (!a || a->isMemGlobal() || a->isParameter())
-                    it = lastMemDef.erase(it);
-                else
-                    ++it;
-            }
-        }
-
-        if (!result.count(opStmt))
-            result[opStmt] = {};
-
-        auto addDep = [&](SAPFOR::Argument* use)
-        {
-            if (!isTrackable(use))
-                return;
-            const string k = argKey(use);
-            auto it = lastDef.find(k);
-            if (it == lastDef.end())
-                return;
-            if (it->second.first && it->second.first != opStmt)
-                depsSets[opStmt].insert(it->second.first);
-        };
-
-        auto addMemDep = [&](const string& key)
-        {
-            if (key.empty())
-                return;
-            auto it = lastMemDef.find(key);
-            if (it == lastMemDef.end())
-                return;
-            if (it->second.first && it->second.first != opStmt)
-                depsSets[opStmt].insert(it->second.first);
-        };
-
-        addDep(instr->getArg1());
-        addDep(instr->getArg2());
-        if (instr->getOperation() == SAPFOR::CFG_OP::RANGE)
-            addDep(instr->getResult());
-
-        if (instr->getOperation() == SAPFOR::CFG_OP::STORE || instr->getOperation() == SAPFOR::CFG_OP::REC_REF_STORE)
-            addDep(instr->getResult());
-
-        if (instr->getOperation() == SAPFOR::CFG_OP::LOAD || instr->getOperation() == SAPFOR::CFG_OP::REC_REF_LOAD)
-        {
-            const string memKey = memKeyFromInstr(instr);
-            addMemDep(memKey);
-        }
-
-        if (isDef(instr))
-        {
-            const string dk = argKey(instr->getResult());
-            lastDef[dk] = { opStmt, instr->getResult() };
-        }
-
-        if (instr->getOperation() == SAPFOR::CFG_OP::STORE || instr->getOperation() == SAPFOR::CFG_OP::REC_REF_STORE)
-        {
-            const string k = memKeyFromInstr(instr);
-            SAPFOR::Argument* base = instr->getArg1();
-            if (!k.empty() && base)
-                lastMemDef[k] = { opStmt, base };
-            addMemDep(k);
-        }
-    }
-
-    for (auto& kv : result)
-    {
-        SgStatement* op = kv.first;
-        auto it = depsSets.find(op);
-        if (it == depsSets.end())
-            continue;
-
-        kv.second.assign(it->second.begin(), it->second.end());
-        sort(kv.second.begin(), kv.second.end(),
-             [](SgStatement* a, SgStatement* b)
-             {
-                 const int la = a ? a->lineNumber() : -1;
-                 const int lb = b ? b->lineNumber() : -1;
-                 if (la != lb)
-                     return la < lb;
-                 return a < b;
-             });
-    }
-
-    return result;
-}
-
-static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb, const char* expectedFile)
-{
-    if (!bb)
-        return false;
-
-    auto isCompoundStmt = [](SgStatement* st) -> bool
-    {
-        if (!st)
-            return true;
-        const int v = st->variant();
-        return loop_tags.count(v) || control_tags.count(v) || control_end_tags.count(v);
-    };
-
-    vector<SgStatement*> ops;
-    ops.reserve(bb->getInstructions().size());
-    set<SgStatement*> seen;
-    for (auto* ir : bb->getInstructions())
-    {
-        if (!ir || !ir->getInstruction())
-            continue;
-        SgStatement* st = ir->getInstruction()->getOperator();
-        if (!st || isCompoundStmt(st))
-            continue;
-        if (seen.insert(st).second)
-            ops.push_back(st);
-    }
-
-    if (ops.size() < 2)
-        return false;
-
-    // Check that analyzed BB is in the same file as the expected file
-    const char* bbFile = ops.front()->fileName();
-    if (!bbFile)
-        bbFile = "(unknown)";
-    if (expectedFile && strcmp(expectedFile, bbFile) != 0)
-        return false;
-    for (auto* st : ops)
-    {
-        if (!st || !st->fileName() || strcmp(st->fileName(), bbFile) != 0)
-            return false;
-    }
-
-    SgStatement* parent = ops.front()->controlParent();
-    if (!parent)
-        return false;
-    for (auto* st : ops)
-        if (!st || st->controlParent() != parent)
-            return false;
-
-    set<SgStatement*> opSet(ops.begin(), ops.end());
-    {
-        SgStatement* lastNode = parent->lastNodeOfStmt();
-        SgStatement* cur = ops.front();
-        size_t idx = 0;
-
-        {
-            SgStatement* scan = parent->lexNext();
-            SgStatement* end = lastNode;
-            bool found = false;
-            set<SgStatement*> visited;
-            while (scan && scan != end)
-            {
-                if (!visited.insert(scan).second)
-                    return false;
-                if (scan == ops.front())
-                {
-                    found = true;
-                    break;
-                }
-                scan = scan->lexNext();
-            }
-            if (!found)
-                return false;
-        }
-
-        while (cur && cur != lastNode && idx < ops.size())
-        {
-            if (cur == ops[idx])
-                ++idx;
-            else if (isSgExecutableStatement(cur) && !opSet.count(cur))
-                return false;
-            if (idx == ops.size())
-                break;
-            cur = cur->lexNext();
-        }
-        if (idx != ops.size())
-            return false;
-    }
-
-    // Compute dependencies (inside BB) and build a new order by moving each statement
-    // as close as possible after its last dependency (if any).
-    const auto depsMap = analyzeBasicBlockIntraDependencies(bb);
-    vector<SgStatement*> order = ops;
-    const vector<SgStatement*> originalOrder = ops;
-    const int nOrig = (int)originalOrder.size();
-
-    auto indexIn = [](const vector<SgStatement*>& v, SgStatement* s) -> int
-    {
-        for (int i = 0; i < (int)v.size(); ++i)
-            if (v[i] == s)
-                return i;
-        return -1;
-    };
-
-    auto indexInOriginal = [&](SgStatement* s) -> int
-    {
-        return indexIn(originalOrder, s);
-    };
-
-    for (SgStatement* s : ops)
-    {
-        auto itDeps = depsMap.find(s);
-        if (itDeps == depsMap.end() || itDeps->second.empty())
-            continue;
-
-        int lastDepOrigIdx = -1;
-        for (SgStatement* dep : itDeps->second)
-        {
-            const int j = indexInOriginal(dep);
-            if (j >= 0)
-                lastDepOrigIdx = max(lastDepOrigIdx, j);
-        }
-        if (lastDepOrigIdx < 0)
-            continue;
-
-        SgStatement* successor = nullptr;
-        if (lastDepOrigIdx + 1 < nOrig)
-            successor = originalOrder[lastDepOrigIdx + 1];
-
-        int posS = indexIn(order, s);
-        if (posS < 0)
-            continue;
-
-        if (successor == nullptr)
-        {
-            if (posS == (int)order.size() - 1)
-                continue;
-            order.erase(order.begin() + posS);
-            order.push_back(s);
-            continue;
-        }
-
-        if (successor == s)
-            continue;
-
-        const int posSucc = indexIn(order, successor);
-        if (posSucc < 0)
-            continue;
-
-        if (posS + 1 == posSucc)
-            continue;
-
-        order.erase(order.begin() + posS);
-        const int posSucc2 = indexIn(order, successor);
-        if (posSucc2 < 0)
-            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-        order.insert(order.begin() + posSucc2, s);
-    }
-
-    bool changed = false;
-    for (size_t i = 0; i < ops.size(); ++i)
-        if (ops[i] != order[i])
-        {
-            changed = true;
-            break;
-        }
-    if (!changed)
-        return false;
-
-    SgStatement* anchor = parent;
-    {
-        SgStatement* scan = parent->lexNext();
-        SgStatement* end = parent->lastNodeOfStmt();
-        while (scan && scan != end)
-        {
-            if (scan == ops.front())
-                break;
-            anchor = scan;
-            scan = scan->lexNext();
-        }
-    }
-
-    // apply AST reordering
-    map<SgStatement*, int> savedLine;
-    map<SgStatement*, char*> savedComments;
-    map<SgStatement*, SgStatement*> extracted;
-
-    for (SgStatement* st : ops)
-    {
-        if (!st)
-            return false;
-
-        savedLine[st] = st->lineNumber();
-        savedComments[st] = st->comments() ? strdup(st->comments()) : nullptr;
-
-        SgStatement* ex = st->extractStmt();
-        if (!ex)
-            return false;
-        extracted[st] = ex;
-    }
-
-    SgStatement* insertAfter = anchor;
-    for (SgStatement* st : order)
-    {
-        SgStatement* ex = extracted[st];
-        if (!ex)
-            continue;
-
-        auto itC = savedComments.find(st);
-        if (itC != savedComments.end() && itC->second)
-            ex->setComments(itC->second);
-
-        auto itL = savedLine.find(st);
-        if (itL != savedLine.end())
-            ex->setlineNumber(itL->second);
-
-        insertAfter->insertStmtAfter(*ex, *parent);
-        insertAfter = ex;
-    }
-
-    for (auto& kv : savedComments)
-        if (kv.second)
-            free(kv.second);
-
-    return true;
-}
-
-void moveOperators(SgFile* file, const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform) {
-    if (!file)
-        return;
-    if (SgFile::switchToFile(file->filename()) == -1)
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-    const int funcNum = file->numberOfFunctions();
-    for (int i = 0; i < funcNum; ++i)
-    {
-        SgStatement* st = file->functions(i);
-
-        const auto loopBlocks = findBlocksInLoopsByFullIR(st, FullIR);
-        for (auto* bb : loopBlocks)
-        {
-            if (!bb)
-                continue;
-            if (reorderOperatorsInBasicBlockUsingDeps(bb, file->filename()))
-                countOfTransform += 1;
-        }
-    }
-}

src/Transformations/MoveOperators/move_operators.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include "../../GraphLoop/graph_loops.h"
-#include "../../CFGraph/CFGraph.h"
-
-void moveOperators(SgFile* file, const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform);

src/Transformations/PrivateArrayRemoving/private_removing.cpp

@@ -13,7 +13,6 @@ using std::set;
 using std::string;
 using std::vector;
 using std::wstring;
-using SAPFOR::CFG_Settings;
 
 using CFG_Type = map<FuncInfo*, vector<SAPFOR::BasicBlock*>>;
 using UsersDirectives = map<pair<string, int>, set<SgStatement*>>;
@@ -2208,8 +2207,8 @@ static void removePrivateAnalyze(Context *ctx)
         makeDeclaration(ctx->loopStmt, vector<SgSymbol*> {receiverVar}, nullptr)
     ));
 
-    const auto settings = CFG_Settings({ CFG_Settings::CFG_atLeastOneIterInLoop, CFG_Settings::CFG_withRD, CFG_Settings::CFG_withCallFrom, CFG_Settings::CFG_withDominators });
-    CFG_Type CFG_ForFunc = buildCFGforCurrentFunc(ctx->loopStmt, settings,
+    CFG_Type CFG_ForFunc = buildCFGforCurrentFunc(ctx->loopStmt,
+                                                  SAPFOR::CFG_Settings(true, true),
                                                   ctx->commonBlocks, ctx->allFuncInfo);
     if (CFG_ForFunc.empty())
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);

src/Utils/PassManager.h

@@ -206,9 +206,7 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     Pass(DEF_USE_STAGE1) <= Pass(DEF_USE_STAGE2);
 
-    list({ VERIFY_DVM_DIRS, VERIFY_COMMON, FILL_COMMON_BLOCKS, PRIVATE_CALL_GRAPH_STAGE1, PRIVATE_CALL_GRAPH_STAGE2, MACRO_EXPANSION, CONVERT_ASSIGN_TO_LOOP, DEF_USE_STAGE1, DEF_USE_STAGE2, FILL_PARALLEL_REG_IR, CALL_GRAPH_IR }) <= list({ SUBST_EXPR, SUBST_EXPR_RD, BUILD_IR });
-
-    Pass(VERIFY_COMMON) <= Pass(FILL_COMMON_BLOCKS);
+    list({ VERIFY_DVM_DIRS, PRIVATE_CALL_GRAPH_STAGE1, PRIVATE_CALL_GRAPH_STAGE2, MACRO_EXPANSION, CONVERT_ASSIGN_TO_LOOP, DEF_USE_STAGE1, DEF_USE_STAGE2, FILL_PARALLEL_REG_IR, VERIFY_COMMON, FILL_COMMON_BLOCKS, CALL_GRAPH_IR }) <= list({ SUBST_EXPR, SUBST_EXPR_RD, BUILD_IR });
 
     Pass(BUILD_IR) <= Pass(SUBST_EXPR) <= Pass(SUBST_EXPR_AND_UNPARSE);
 
@@ -219,7 +217,7 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     Pass(RESTORE_LOOP_FROM_ASSIGN) <= list({ SUBST_EXPR_AND_UNPARSE, SUBST_EXPR_RD_AND_UNPARSE });
 
-    Pass(FILL_COMMON_BLOCKS) <= Pass(GET_ALL_ARRAY_DECL) <= list({ CALL_GRAPH_IR, INSERT_NO_DISTR_FLAGS_FROM_GUI });
+    Pass(GET_ALL_ARRAY_DECL) <= list({ CALL_GRAPH_IR, INSERT_NO_DISTR_FLAGS_FROM_GUI });
 
     Pass(LOOP_GRAPH) <= Pass(PRIVATE_CALL_GRAPH_STAGE3) <= list(FIND_FUNC_TO_INCLUDE, PRIVATE_ANALYSIS_IR) <= list({ LOOP_ANALYZER_DATA_DIST_S0, LOOP_ANALYZER_DATA_DIST_S1, ONLY_ARRAY_GRAPH, LOOP_ANALYZER_ALIGNS });
 
@@ -229,7 +227,7 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_SPF, PREPROC_ALLOCATES, GET_ALL_ARRAY_DECL, GCOV_PARSER }) <= list({ CALL_GRAPH, MACRO_EXPANSION, DEF_USE_STAGE1 });
 
-    list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_ALLOCATES, FILL_PARALLEL_REG_IR }) <= list({ FILL_COMMON_BLOCKS, GET_ALL_ARRAY_DECL, PARSE_OMP_DIRS }) <= Pass(PREPROC_SPF);
+    list({ VERIFY_OPERATORS, VERIFY_ENDDO, VERIFY_INCLUDES, PREPROC_ALLOCATES, FILL_PARALLEL_REG_IR }) <= list({ GET_ALL_ARRAY_DECL, FILL_COMMON_BLOCKS, PARSE_OMP_DIRS }) <= Pass(PREPROC_SPF);
 
     Pass(CHECK_PAR_REG_DIR) <= Pass(FILL_PARALLEL_REG_IR);
 
@@ -318,10 +316,10 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     list({ VERIFY_INCLUDES, CORRECT_VAR_DECL }) <= Pass(SET_IMPLICIT_NONE);
 
-    list({ CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS_ANALYSIS);
+    list({ ARRAY_PROPAGATION, CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS_ANALYSIS);
     list({ FIND_PRIVATE_ARRAYS_ANALYSIS, CONVERT_LOOP_TO_ASSIGN, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(FIND_PRIVATE_ARRAYS);
 
-    list({ BUILD_IR, CALL_GRAPH2, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(MOVE_OPERATORS);
+    //Pass( CALL_GRAPH2 ) <= Pass(ARRAY_PROPAGATION);
 
     passesIgnoreStateDone.insert({ CREATE_PARALLEL_DIRS, INSERT_PARALLEL_DIRS, INSERT_SHADOW_DIRS, EXTRACT_PARALLEL_DIRS, 
                                    EXTRACT_SHADOW_DIRS, CREATE_REMOTES, UNPARSE_FILE, REMOVE_AND_CALC_SHADOW,

src/Utils/SgUtils.cpp

@@ -577,20 +577,10 @@ string removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, const ch
                 for (auto& incl : inclByPos.second)
                     inlcude += (renameIncludes ? renameInclude(incl) : incl);
 
-            //check inserted operators
-            SgStatement* toInsert = st;
-            do {
-                auto lexPrev = toInsert->lexPrev();
-                if (lexPrev && lexPrev->variant() > 0 && lexPrev->lineNumber() < 0)
-                    toInsert = lexPrev;
+            if (st->comments())
+                st->setComments((inlcude + st->comments()).c_str());
             else
-                    break;                
-            } while (true);
-
-            if (toInsert->comments())
-                toInsert->setComments((inlcude + toInsert->comments()).c_str());
-            else
-                toInsert->addComment(inlcude.c_str());
+                st->addComment(inlcude.c_str());
         }
     }
 
@@ -944,14 +934,8 @@ void fillNonDistrArraysAsPrivate(SgStatement *st,
         {
             auto itD = declaredArrays.find(*itSet);
             if (itD != declaredArrays.end())
-            {
-                const auto array = itD->second.first;
-                if (array->IsNotDistribute())
-                {
-                    auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
-                    privatesVars.insert(symb->identifier());
-                }
-            }
+                if (itD->second.first->IsNotDistribute())
+                    privatesVars.insert(itD->second.first->GetShortName());
         }
     }
 }
@@ -970,20 +954,8 @@ DIST::Array* getArrayFromDeclarated(SgStatement *st, const string &arrayName)
         {
             auto itD = declaredArrays.find(*itSet);
             if (itD != declaredArrays.end())
-            {
-                DIST::Array* array = itD->second.first;
-                if (array->GetLocation().first == DIST::l_COMMON)
-                {
-                    auto symb = array->GetDeclSymbol(make_pair(st->fileName(), st->lineNumber()));
-                    if (symb && symb->identifier() == arrayName)
-                        found = array;
-                }
-                else
-                {
-                    if (array->GetShortName() == arrayName)
-                        found = array;
-                }
-            }
+                if (itD->second.first->GetShortName() == arrayName)
+                    found = itD->second.first;
         }
     }
     return found;
@@ -1292,32 +1264,6 @@ static SgExpression* isInCommon(const vector<SgExpression*> &commonBlocks, const
     return NULL;
 }
 
-//all common block in project
-extern map<string, CommonBlock*> commonBlocks;
-static string getCommonNameOnPos(const string& name, const int commonPos)
-{
-    if (commonBlocks.size() == 0)
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-    auto it = commonBlocks.find(name);
-    if (it == commonBlocks.end())
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-    auto inPos = it->second->getGroupedVars().find(commonPos);
-    if (inPos == it->second->getGroupedVars().end())
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-    set<string> namesOnPos;
-
-    for (auto& var : inPos->second)
-        namesOnPos.insert(var->getName());
-
-    if (namesOnPos.size() == 0)
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-    return *namesOnPos.begin();
-}
-
 static map<tuple<string, string, int>, tuple<int, string, string>> tableOfUniqNames;
 tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>> &commonBlocks, SgStatement *decl, SgSymbol *symb)
 {
@@ -1326,7 +1272,6 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
     int commonPos = 0;
 
     SgExpression *foundCommon = NULL;
-    string symbCommn = "";
 
     SgStatement *declCP = decl->controlParent();
     // find symbol in parameter list of functions
@@ -1362,7 +1307,6 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
             if (foundCommon)
             {
                 inCommon = true;
-                symbCommn = getCommonNameOnPos(common.first, commonPos);
                 break;
             }
         }
@@ -1370,7 +1314,7 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
 
     tuple<int, string, string> retVal;
     if (inCommon)
-        retVal = make_tuple(commonPos, string("common_") + getCommonName(foundCommon), symbCommn);
+        retVal = make_tuple(commonPos, string("common_") + getCommonName(foundCommon), string(symb->identifier()));
     else
         retVal = make_tuple(decl->lineNumber(), string(decl->fileName()), string(symb->identifier()));
 

src/Utils/module_utils.cpp

@@ -337,15 +337,10 @@ const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
     //if function or module in contains
     auto cp = func->controlParent();
     if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT)
-    {
         getModuleSymbols(cp, symbs);
 
-        if (func->variant() == FUNC_HEDR)
-            symbs.insert(func->symbol());
-    }
-
     symbolsForFunc[func->symbol()->identifier()] = symbs;
-    return symbolsForFunc[func->symbol()->identifier()];
+    return symbs;
 }
 
 static void findSymbol(SgStatement* func, const string& varName, const string& locName,
@@ -354,21 +349,11 @@ static void findSymbol(SgStatement* func, const string& varName, const string& l
     for (const auto& s : getModuleSymbols(func))
     {
         SgSymbol* orig = OriginalSymbol(s);
-        printf("%s == %s\n", orig->identifier(), s->identifier());
         //any suitable symbol can be used
-
-        if (orig->variant() == FUNCTION_NAME)
-        {
-            if (orig->identifier() == varName)
-                altNames[s->identifier()] = s;
-        }
-        else
-        {
         if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
             altNames[s->identifier()] = s;
     }
 }
-}
 
 SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
 {
@@ -384,7 +369,6 @@ SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const stri
         return altNames.begin()->second;
     else {
         __spf_print(1, "%s (%s %s) %s\n", func->symbol()->identifier(), clearName.c_str(), varName.c_str(), locName.c_str());
-        findSymbol(func, varName, locName, altNames);
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
     }
 

src/Utils/utils.cpp

@@ -569,8 +569,8 @@ void copyIncludes(const set<string> &allIncludeFiles, const map<string, map<int,
 
             while (!feof(oldFile))
             {
-                char buf[16384];
-                char *res = fgets(buf, sizeof(buf), oldFile);
+                char buf[8192];
+                char *res = fgets(buf, 16384, oldFile);
                 if (res == NULL)
                     break;
 

src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2472"
+#define VERSION_SPF "2448"

src/VisualizerCalls/get_information.cpp

@@ -152,7 +152,7 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
             intOptions[z] = -1;
     }
 
-    //staticShadowAnalysis = intOptions[STATIC_SHADOW_ANALYSIS];
+    staticShadowAnalysis = intOptions[STATIC_SHADOW_ANALYSIS];
     staticPrivateAnalysis = intOptions[STATIC_PRIVATE_ANALYSIS];
     out_free_form = intOptions[FREE_FORM];
     if (out_free_form == 1)
@@ -1802,13 +1802,6 @@ int SPF_InsertPrivateArrayDirectives(void*& context, int winHandler, short* opti
     return simpleTransformPass(FIND_PRIVATE_ARRAYS, options, projName, folderName, output, outputMessage);
 }
 
-int SPF_MoveOperators(void*& context, int winHandler, short* options, short* projName, short* folderName, string& output, string& outputMessage)
-{
-    MessageManager::clearCache();
-    MessageManager::setWinHandler(winHandler);
-    return simpleTransformPass(MOVE_OPERATORS, options, projName, folderName, output, outputMessage);
-}
-
 static inline void convertBackSlash(char *str, int strL)
 {
     for (int z = 0; z < strL; ++z)
@@ -2517,8 +2510,6 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         retCode = SPF_RenameIncludes(context, winHandler, optSh, projSh, fold, output, outputMessage);
     else if (whichRun == "SPF_InsertPrivateArrayDirectives")
         retCode = SPF_InsertPrivateArrayDirectives(context, winHandler, optSh, projSh, fold, output, outputMessage);
-    else if (whichRun == "SPF_MoveOperators")
-        retCode = SPF_MoveOperators(context, winHandler, optSh, projSh, fold, output, outputMessage);
     else if (whichRun == "SPF_CreateParallelVariant")
     {
         vector<string> splited;