attempt to build new ast

CMakeLists.txt

@@ -163,10 +163,6 @@ set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp
         src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
         src/ParallelizationRegions/resolve_par_reg_conflicts.h)
 
-set(ARRAY_PROP src/ArrayConstantPropagation/propagation.cpp
-	src/ArrayConstantPropagation/propagation.h	
-)
-
 set(TR_DEAD_CODE src/Transformations/DeadCodeRemoving/dead_code.cpp
         src/Transformations/DeadCodeRemoving/dead_code.h)
 set(TR_CP src/Transformations/CheckPoints/checkpoints.cpp
@@ -207,9 +203,9 @@ set(TR_EXPR_TRANSFORM src/Transformations/ExpressionSubstitution/control_flow_gr
 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)
+                    src/Transformations/RenameSymbols/rename_symbols.h)
+SET(TR_SWAP_OPERATORS src/Transformations/SwapOperators/swap_operators.cpp
+        src/Transformations/SwapOperators/swap_operators.h)
 
 set(TRANSFORMS 
         ${TR_DEAD_CODE}
@@ -233,7 +229,7 @@ set(TRANSFORMS
         ${TR_EXPR_TRANSFORM}
         ${TR_INLINER}
         ${TR_RENAME_SYMBOLS}
-        ${TR_MOVE_OPERATORS})
+        ${TR_SWAP_OPERATORS})
         
 set(CFG src/CFGraph/IR.cpp
         src/CFGraph/IR.h
@@ -338,9 +334,7 @@ set(MAIN src/Sapfor.cpp
         src/Utils/PassManager.h)
 
 set(PREDICTOR src/Predictor/PredictScheme.cpp
-              src/Predictor/PredictScheme.h
-              src/Predictor/PredictSchemeWithLibrary.cpp
-              src/Predictor/PredictSchemeWithLibrary.h)
+              src/Predictor/PredictScheme.h)
               
 set(LIBPREDICTOR  ${libpred_sources}/cluster.cpp
                   ${libpred_sources}/predictor.cpp
@@ -429,7 +423,6 @@ set(SOURCE_EXE
     ${TRANSFORMS}
     ${PARALLEL_REG}
     ${PRIV}
-    ${ARRAY_PROP}
     ${FDVM}
     ${OMEGA}
     ${UTILS}
@@ -469,7 +462,7 @@ 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 (Transformations\\SwapOperators FILES ${TR_SWAP_OPERATORS})
 
 
 source_group (CreateIntervals FILES ${CREATE_INTER_T})
@@ -482,7 +475,6 @@ source_group (GraphLoop FILES ${GR_LOOP})
 source_group (LoopAnalyzer FILES ${LOOP_ANALYZER})
 source_group (ParallelizationRegions FILES ${PARALLEL_REG})
 source_group (PrivateAnalyzer FILES ${PRIV})      
-source_group (ArrayConstantPropagation FILES ${ARRAY_PROP})      
 source_group (FDVM_Compiler FILES ${FDVM})
 source_group (SageExtension FILES ${OMEGA})
 source_group (Utils FILES ${UTILS})

src/ArrayConstantPropagation/propagation.cpp

@@ -1,301 +0,0 @@
-#include "propagation.h"
-
-#include "../Utils/SgUtils.h"
-
-#include <iostream>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-using namespace std;
-
-static SgStatement* declPlace = NULL;
-
-static bool CheckConstIndexes(SgExpression* exp)
-{
-    if (!exp)
-    {
-        return true;
-    }
-    SgExpression* lhs = exp->lhs();
-    SgExpression* rhs = exp->rhs();
-    do
-    {
-        if (lhs->variant() != INT_VAL)
-        {
-            return false;
-        }
-        if (rhs)
-        {
-            lhs = rhs->lhs();
-            rhs = rhs->rhs();
-        }
-    } while (rhs);
-    return true;
-}
-
-static SgExpression* CreateVar(int& variableNumber, SgType* type)
-{
-    string varName = "__tmp_prop_var";
-    string name = varName + std::to_string(variableNumber) + "__";
-    variableNumber++;
-
-    SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), *type, *declPlace->controlParent());
-
-    const string commonBlockName = "__propagation_common__";
-
-    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);
-    }
-
-    return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
-}
-
-static void TransformRightPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber) 
-{
-    if (!exp)
-    {
-        return;
-    }
-
-    vector<SgExpression*> subnodes = { exp->lhs(), exp->rhs() };
-
-    string expUnparsed;
-    SgExpression* toAdd = NULL;
-    if (exp->variant() == ARRAY_REF && CheckConstIndexes(exp->lhs()))
-    {
-        cout << st->unparse() << endl;
-        if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
-        {
-            arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());  
-        }
-        st->setExpression(1, arrayToVariable[expUnparsed]->copyPtr());
-        return;
-    }
-    for (int i = 0; i < 2; i++)
-    {
-        if (subnodes[i] && subnodes[i]->variant() == ARRAY_REF && subnodes[i]->symbol()->type()->baseType() && CheckConstIndexes(subnodes[i]->lhs()))
-        {
-            expUnparsed = subnodes[i]->unparse();
-            if (arrayToVariable.find(expUnparsed) == arrayToVariable.end())
-            {                
-                arrayToVariable[expUnparsed] = CreateVar(variableNumber, subnodes[i]->symbol()->type()->baseType());;
-            }
-            toAdd = arrayToVariable[expUnparsed]->copyPtr();
-            if (toAdd)
-            {
-                if (i == 0)
-                {
-                    exp->setLhs(toAdd);
-                }
-                else
-                {
-                    exp->setRhs(toAdd);
-                }
-            }
-        }
-        else
-        {
-            TransformRightPart(st, subnodes[i], arrayToVariable, variableNumber);
-        }
-    }
-}
-
-static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber)
-{
-    if (exp->symbol()->type()->variant() == T_STRING)
-        return;
-    string expUnparsed = exp->unparse();
-    if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
-    {
-        arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
-    }
-    SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, arrayToVariable[expUnparsed]->copyPtr(), st->expr(1)->copyPtr(), NULL);
-
-    newStatement->setFileId(st->getFileId());
-    newStatement->setProject(st->getProject()); 
-
-    newStatement->setlineNumber(getNextNegativeLineNumber());
-    newStatement->setLocalLineNumber(st->lineNumber());
-    st->insertStmtBefore(*newStatement, *st->controlParent());
-}
-
-void ArrayConstantPropagation(SgProject& project) 
-{
-    unordered_map<string, SgExpression*> arrayToVariable;
-    int variableNumber = 0;
-    for (int i = 0; i < project.numberOfFiles(); i++) 
-    {
-        SgFile* file = &(project.file(i));
-
-        if (!file)
-            continue;
-
-        const int funcNum = file->numberOfFunctions();
-        for (int i = 0; i < funcNum; ++i)
-        {
-            SgStatement* st = file->functions(i);
-            declPlace = st->lexNext();
-            SgStatement* lastNode = st->lastNodeOfStmt();
-
-            for (; st != lastNode; st = st->lexNext())
-            {
-                if (st->variant() == ASSIGN_STAT)
-                {
-                    if (st->expr(1))
-                    {
-                        TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
-                    }
-                    if (st->expr(0) && st->expr(0)->variant() == ARRAY_REF && CheckConstIndexes(st->expr(0)->lhs()))
-                    {
-                        TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
-                    }
-                }
-                else if (st->variant() == FOR_NODE)
-                {
-                    SgExpression* lowerBound = st->expr(0)->lhs();
-                    SgExpression* upperBound = st->expr(0)->rhs();
-                    string lowerBoundUnparsed = lowerBound->unparse(), upperBoundUnparsed = upperBound->unparse();
-                    if (upperBound->variant() == ARRAY_REF && upperBound->symbol()->type()->baseType() && CheckConstIndexes(upperBound->lhs()))
-                    {
-                        if (arrayToVariable.find(upperBoundUnparsed) == arrayToVariable.end())
-                        {
-                            arrayToVariable[upperBoundUnparsed] = CreateVar(variableNumber, upperBound->symbol()->type()->baseType());
-                        }
-                        st->expr(0)->setRhs(arrayToVariable[upperBoundUnparsed]->copyPtr());
-                    }
-                    if (lowerBound->variant() == ARRAY_REF && lowerBound->symbol()->type()->baseType() && CheckConstIndexes(lowerBound->lhs()))
-                    {
-                        if (arrayToVariable.find(lowerBoundUnparsed) == arrayToVariable.end())
-                        {
-                            arrayToVariable[lowerBoundUnparsed] = CreateVar(variableNumber, lowerBound->symbol()->type()->baseType());
-                        }
-                        st->expr(0)->setLhs(arrayToVariable[lowerBoundUnparsed]->copyPtr());
-                    }
-                }
-            }
-        }
-    }
-}

src/ArrayConstantPropagation/propagation.h

@@ -1,4 +0,0 @@
-#pragma once
-#include "../Utils/SgUtils.h"
-
-void ArrayConstantPropagation(SgProject& project);

src/CFGraph/CFGraph.cpp

@@ -1162,9 +1162,8 @@ 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);
+    for (auto& [func, blocks] : result)
+        removedUnreachableBlocks(blocks);
 
     return result;
 }

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 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 withRD = true;
+        bool withRegisters = false;
+        bool withSPF = false;
+        bool withDVM = false;
+        bool withCallsInBlocks = false; // separate each F_CALL to own BasicBlock
+        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,46 +200,20 @@ 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,
+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)
         {
             SAPFOR::Argument* arg = instr->getArg1();
-            if (arg->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
+            if(arg->getType() == SAPFOR::CFG_ARG_TYPE::VAR)
                 addPlaceWithDef(commonVars, func, arg, instr);
 
             lastParamRef.push_back(arg);
@@ -262,20 +236,12 @@ 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());
             }
-        }
-    }
 }
 
 // recursively analyze FOR loops 
@@ -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/DirectiveProcessing/directive_creator_base.cpp

@@ -122,7 +122,6 @@ static LoopGraph* createDirectiveForLoop(LoopGraph *currentLoop, MapToArray &mai
                 if (found == false)
                 {
                     directive->shadowRenew.push_back(make_pair(key, vector<pair<int, int>>()));
-                    directive->shadowRenewCorner.push_back(false);
 
                     const DIST::Array *arrayRef = read;
                     for (int i = 0; i < arrayRef->GetDimSize(); ++i)

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 symb = alignArray->GetDeclSymbol(position_decl);
-                if (symb->identifier() != alignArray->GetShortName())
-                    doRename(rule, make_pair(alignArray->GetShortName(), symb->identifier()));
+                auto renamePair = getModuleRename(allocatableStmts, dataDir.alignRules[i].alignArray);
+                if (renamePair.first != "")
+                {
+                    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());
+                shortName = newName;
                 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;
             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)
@@ -857,11 +857,6 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 shadowRenewShifts[i].resize(shadowRenew[i].second.size());
         }
 
-        if (shadowRenewCorner.size() == 0)
-        {
-            shadowRenewCorner.resize(shadowRenew.size(), false);
-        }
-
         string shadowAdd = ", SHADOW_RENEW(";
         int inserted = 0;
 
@@ -904,10 +899,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 for (auto& elem : genSubscripts(shadowRenew[i1].second, shadowRenewShifts[i1]))
                     newArrayRef->addSubscript(*elem);
 
-                bool needCornerFlag = shadowRenew[i1].second.size() > 1 && needCorner(shadowArray, shiftsByAccess, loop);
-                shadowRenewCorner[i1] = needCornerFlag;
-
-                if (needCornerFlag)
+                if (shadowRenew[i1].second.size() > 1 && needCorner(shadowArray, shiftsByAccess, loop))
                 {
                     SgExpression* tmp = new SgExpression(ARRAY_OP, newArrayRef, NULL, NULL);
                     p->setLhs(*tmp);

src/Distribution/DvmhDirective.h

@@ -102,7 +102,6 @@ public:
     //                               origin_Name   uniqName                   bounds
     std::vector<std::pair<std::pair<std::string, std::string>, std::vector<std::pair<int, int>>>> shadowRenew;
     std::vector<std::vector<std::pair<int, int>>> shadowRenewShifts;
-    std::vector<bool> shadowRenewCorner;
 
     //                               origin_Name   uniqName                   bounds
     std::vector<std::pair<std::pair<std::string, std::string>, std::vector<std::pair<int, int>>>> across;
@@ -126,7 +125,6 @@ public:
         privates = copyFrom.privates;
         shadowRenew = copyFrom.shadowRenew;
         shadowRenewShifts = copyFrom.shadowRenewShifts;
-        shadowRenewCorner = copyFrom.shadowRenewCorner;
         across = copyFrom.across;
         acrossShifts = copyFrom.acrossShifts;
         remoteAccess = copyFrom.remoteAccess;
@@ -153,7 +151,6 @@ public:
         on.clear();
         privates.clear();
         shadowRenew.clear();
-        shadowRenewCorner.clear();
         across.clear();
         acrossShifts.clear();
         reduction.clear();

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

@@ -23,7 +23,6 @@
 #include "expr_transform.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "CFGraph/CFGraph.h"
-#include "../Utils/utils.h"
 
 #include "json.hpp"
 
@@ -34,113 +33,9 @@ using std::set;
 using std::ofstream;
 using std::pair;
 using std::tuple;
-using SAPFOR::CFG_Settings;
 
 using json = nlohmann::json;
 
-void runPredictSchemeOld(SgProject &project,
-                      vector<vector<size_t>> &topologies,
-                      vector<ParallelRegion*> &parallelRegions,
-                      map<string, vector<LoopGraph*>> &loopGraph,
-                      map<string, vector<SpfInterval*>> &intervals,
-                      map<string, vector<Messages>> &SPF_messages)
-{
-        int maxSizeDist = 0;
-        for (int z = 0; z < parallelRegions.size(); ++z)
-        {
-            const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
-            const vector<int> &currentVariant = parallelRegions[z]->GetCurrentVariant();
-
-            auto &tmp = dataDirectives.distrRules;
-            vector<pair<DIST::Array*, const DistrVariant*>> currentVar;
-            for (int z1 = 0; z1 < currentVariant.size(); ++z1)
-                currentVar.push_back(std::make_pair(tmp[z1].first, &tmp[z1].second[currentVariant[z1]]));
-
-            for (auto &elem : currentVar)
-            {
-                DIST::Array *array = elem.first;
-                const DistrVariant *var = elem.second;
-
-                int countBlock = 0;
-                for (int z = 0; z < var->distRule.size(); ++z)
-                    if (var->distRule[z] == dist::BLOCK)
-                        ++countBlock;
-                maxSizeDist = std::max(maxSizeDist, countBlock);
-            }
-        }
-                        
-        SpfInterval *mainIterval = getMainInterval(&project, intervals, SPF_messages);
-        topologies.clear();
-        if (maxSizeDist)
-        {
-            const int procNum = 8;
-            //TODO:
-            //topologies = getTopologies(procNum, maxSizeDist);
-            throw -10;
-
-            const int countOfTop = topologies.size();
-            if (countOfTop < 0)
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-            for (auto &inter : intervals)
-                initTimeForIntervalTree(countOfTop, inter.second);
-
-            for (int z = 0; z < parallelRegions.size(); ++z)
-            {
-                const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
-                const vector<int> &currentVariant = parallelRegions[z]->GetCurrentVariant();
-                DIST::Arrays<int> &allArrays = parallelRegions[z]->GetAllArraysToModify();
-
-                auto &tmp = dataDirectives.distrRules;
-                vector<pair<DIST::Array*, const DistrVariant*>> currentVar;
-                for (int z1 = 0; z1 < currentVariant.size(); ++z1)
-                    currentVar.push_back(std::make_pair(tmp[z1].first, &tmp[z1].second[currentVariant[z1]]));
-
-                map<LoopGraph*, ParallelDirective*> parallelDirs;
-                vector<std::tuple<DIST::Array*, vector<long>, pair<string, int>>> allSingleRemotes;
-                for (int i = project.numberOfFiles() - 1; i >= 0; --i)
-                {
-                    SgFile *file = &(project.file(i));
-                    auto fountInfo = findAllDirectives(file, getObjectForFileFromMap(file->filename(), loopGraph), parallelRegions[z]->GetId());
-                    parallelDirs.insert(fountInfo.begin(), fountInfo.end());
-
-                    auto fountRem = findAllSingleRemotes(file, parallelRegions[z]->GetId(), parallelRegions);
-                    allSingleRemotes.insert(allSingleRemotes.end(), fountRem.begin(), fountRem.end());
-                }
-                //TODO!
-                //int err = predictScheme(parallelRegions[z], currentVar, allArrays.GetArrays(), parallelDirs, intervals, SPF_messages, allSingleRemotes, maxSizeDist, procNum);                
-                /*if (err != 0)
-                    internalExit = err;*/
-            }
-
-            vector<SpfInterval*> tmp = { mainIterval };
-            aggregatePredictedTimes(tmp);
-
-            int idx = 0;
-            int best = -1;
-            double bestSpeedUp = 0;
-            for (auto &top : topologies)
-            {
-                string outStr = "";
-                for (auto &elem : top)
-                    outStr += std::to_string(elem) + " ";
-                double currS = mainIterval->exec_time / mainIterval->predictedTimes[idx];
-                __spf_print(1, "%d: speed up %f for top. %s\n", idx, currS, outStr.c_str());
-                
-                if (best == -1 || bestSpeedUp < currS)
-                {
-                    bestSpeedUp = currS;
-                    best = idx;
-                }
-                ++idx;
-            }
-            __spf_print(1, "best topology %d with speed up %f\n", best, bestSpeedUp);
-        }
-        else
-            for (auto &inter : intervals)
-                initTimeForIntervalTree(0, inter.second);
-}
-
 static void fillParallel(SgExpression *exp, ParallelStats &parStats, int &totalScoreComm)
 {
     if (exp)
@@ -431,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)
     {
@@ -442,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;
             }
@@ -451,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;
 }
@@ -612,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/Predictor/PredictScheme.h

@@ -60,6 +60,4 @@ public:
 void processFileToPredict(SgFile *file, PredictorStats &predictorCounts);
 
 void calculateStatsForPredictor(const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, const std::map<std::string, std::map<int, Gcov_info>>& gCovInfo);
-void parseDvmDirForPredictor(const std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>>& declaredArrays, const std::map<std::string, CommonBlock*>& commonBlocks, const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, const std::map<std::string, std::map<int, Gcov_info>>& gCovInfo);
-
-void runPredictSchemeOld(SgProject &project, std::vector<std::vector<size_t>> &topologies, std::vector<ParallelRegion*> &parallelRegions, std::map<std::string, std::vector<LoopGraph*>> &loopGraph, std::map<std::string, std::vector<SpfInterval*>> &intervals, std::map<std::string, std::vector<Messages>> &SPF_messages);
+void parseDvmDirForPredictor(const std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>>& declaredArrays, const std::map<std::string, CommonBlock*>& commonBlocks, const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, const std::map<std::string, std::map<int, Gcov_info>>& gCovInfo);

src/Predictor/PredictSchemeWithLibrary.cpp

@@ -1,470 +0,0 @@
-#include "leak_detector.h"
-
-#include <limits>
-#include <map>
-#include <vector>
-#include <string>
-#include <tuple>
-
-#include "dvm.h"
-#include "PredictSchemeWithLibrary.h"
-#include "../../projects/libpredictor/include/libpredict/predictor.h"
-#include "../DirectiveProcessing/directive_parser.h"
-#include "../Distribution/DvmhDirective.h"
-#include "../ParallelizationRegions/ParRegions.h"
-#include "../GraphLoop/graph_loops_func.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-
-using std::map;
-using std::pair;
-using std::string;
-using std::tuple;
-using std::vector;
-
-map<size_t, size_t> createTemplateIdMapping(const vector<ParallelRegion*>& parallelRegions)
-{
-    size_t maxArrayId = 0;
-    for (int z = 0; z < parallelRegions.size(); ++z) {
-        const DataDirective& dataDirectives = parallelRegions[z]->GetDataDir();
-
-        for (const auto& distrRule : dataDirectives.distrRules) {
-            if (distrRule.first && !distrRule.first->IsTemplate()) {
-                maxArrayId = std::max(maxArrayId, (size_t)distrRule.first->GetId());
-            }
-        }
-
-        for (const auto& alignRule : dataDirectives.alignRules) {
-            if (alignRule.alignArray && !alignRule.alignArray->IsTemplate()) {
-                maxArrayId = std::max(maxArrayId, (size_t)alignRule.alignArray->GetId());
-            }
-        }
-    }
-
-    map<size_t, size_t> templateIdMapping;
-    size_t nextTemplateId = maxArrayId + 1;
-    for (int z = 0; z < parallelRegions.size(); ++z) {
-        const DataDirective& dataDirectives = parallelRegions[z]->GetDataDir();
-
-        for (const auto& distrRule : dataDirectives.distrRules) {
-            if (distrRule.first && distrRule.first->IsTemplate()) {
-                size_t originalId = distrRule.first->GetId();
-                if (templateIdMapping.find(originalId) == templateIdMapping.end()) {
-                    templateIdMapping[originalId] = nextTemplateId++;
-                }
-            }
-        }
-
-        for (const auto& alignRule : dataDirectives.alignRules) {
-            if (alignRule.alignWith && alignRule.alignWith->IsTemplate()) {
-                size_t originalId = alignRule.alignWith->GetId();
-                if (templateIdMapping.find(originalId) == templateIdMapping.end()) {
-                    templateIdMapping[originalId] = nextTemplateId++;
-                }
-            }
-        }
-    }
-
-    return templateIdMapping;
-}
-
-PrecomputedLibpredictParams precomputeLibpredictParams(
-    SgProject& project,
-    const vector<ParallelRegion*>& parallelRegions,
-    const map<string, vector<LoopGraph*>>& loopGraph,
-    const map<size_t, size_t>& templateIdMapping)
-{
-    PrecomputedLibpredictParams result;
-
-    // distribute and align from parallelRegions
-    for (int z = 0; z < parallelRegions.size(); ++z) {
-        const DataDirective& dataDirectives = parallelRegions[z]->GetDataDir();
-        const vector<int>& currentVariant = parallelRegions[z]->GetCurrentVariant();
-        const DIST::Arrays<int>& allArrays = parallelRegions[z]->GetAllArrays();
-
-        auto& tmp = dataDirectives.distrRules;
-        vector<pair<DIST::Array*, const DistrVariant*>> currentVar;
-        for (int z1 = 0; z1 < currentVariant.size(); ++z1) {
-            currentVar.push_back(std::make_pair(tmp[z1].first, &tmp[z1].second[currentVariant[z1]]));
-        }
-
-        // distribute
-        for (const auto& distrRule : currentVar) {
-            DIST::Array* array = distrRule.first;
-            const DistrVariant* variant = distrRule.second;
-
-            if (array && variant && !array->IsNotDistribute()) {
-                PrecomputedDistributeParams params;
-
-                size_t originalId = array->GetId();
-                params.arrayId = originalId;
-
-                if (array->IsTemplate()) {
-                    auto it = templateIdMapping.find(originalId);
-                    if (it != templateIdMapping.end()) {
-                        params.arrayId = it->second;
-                    }
-                }
-
-                params.elemSize = array->GetTypeSize();
-                params.array = array;
-
-                const auto& arraySizes = array->GetSizes();
-                for (int dim = 0; dim < array->GetDimSize(); ++dim) {
-                    size_t dimSize = arraySizes[dim].second - arraySizes[dim].first + 1;
-
-                    if (dim < variant->distRule.size() && variant->distRule[dim] == dist::BLOCK) {
-                        params.axisDistributions.emplace_back(dimSize, libpredict::TypeDistribute::BLOCK);
-                    } else {
-                        params.axisDistributions.emplace_back(dimSize, libpredict::TypeDistribute::NONE);
-                    }
-                }
-
-                const auto& shadowSpec = array->GetShadowSpec();
-                for (int dim = 0; dim < shadowSpec.size() && dim < array->GetDimSize(); ++dim) {
-                    if (dim < variant->distRule.size() && variant->distRule[dim] == dist::BLOCK) {
-                        params.shadowEdges.emplace_back(shadowSpec[dim].first, shadowSpec[dim].second);
-                    }
-                }
-
-                result.distributeParams.push_back(params);
-            }
-        }
-
-        // align
-        for (const auto& alignRule : dataDirectives.alignRules) {
-            DIST::Array* alignArray = alignRule.alignArray;
-            DIST::Array* alignWithArray = alignRule.alignWith;
-
-            if (alignArray && alignWithArray && !alignArray->IsNotDistribute()) {
-                PrecomputedAlignParams params;
-
-                params.arrayId = alignArray->GetId();
-                size_t originalDistributedArrayId = alignWithArray->GetId();
-                params.distributedArrayId = originalDistributedArrayId;
-
-                if (alignWithArray->IsTemplate()) {
-                    auto it = templateIdMapping.find(originalDistributedArrayId);
-                    if (it != templateIdMapping.end()) {
-                        params.distributedArrayId = it->second;
-                    }
-                }
-
-                params.elemSize = alignArray->GetTypeSize();
-                params.alignArray = alignArray;
-                params.alignWithArray = alignWithArray;
-
-                const auto& arraySizes = alignArray->GetSizes();
-                for (int dim = 0; dim < alignArray->GetDimSize(); ++dim) {
-                    size_t dimSize = arraySizes[dim].second - arraySizes[dim].first + 1;
-                    params.dimensions.push_back(dimSize);
-                }
-
-                for (int dim = 0; dim < alignWithArray->GetDimSize(); ++dim) {
-                    bool found = false;
-                    for (int i = 0; i < alignRule.alignRuleWith.size(); ++i) {
-                        const auto& ruleWith = alignRule.alignRuleWith[i];
-                        if (ruleWith.first == dim) {
-                            const auto& rule = ruleWith.second;
-                            if (rule.first == 0) {
-                                // constant
-                                params.distributionExpressions.emplace_back(rule.second);
-                            } else {
-                                // linear expression a * I + b
-                                params.distributionExpressions.emplace_back(i, rule.first, rule.second);
-                            }
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found) {
-                        // There is no rule for this measurement
-                        params.distributionExpressions.emplace_back();
-                    }
-                }
-
-                const auto& shadowSpec = alignArray->GetShadowSpec();
-                for (int dim = 0; dim < shadowSpec.size() && dim < alignArray->GetDimSize(); ++dim) {
-                    params.shadowEdges.emplace_back(shadowSpec[dim].first, shadowSpec[dim].second);
-                }
-
-                result.alignParams.push_back(params);
-            }
-        }
-
-        // shadow_renew
-        map<LoopGraph*, ParallelDirective*> parallelDirs;
-        for (int i = project.numberOfFiles() - 1; i >= 0; --i) {
-            SgFile* file = &(project.file(i));
-            auto fountInfo = findAllDirectives(
-                file,
-                getObjectForFileFromMap(file->filename(), const_cast<map<string, vector<LoopGraph*>>&>(loopGraph)),
-                parallelRegions[z]->GetId());
-            parallelDirs.insert(fountInfo.begin(), fountInfo.end());
-        }
-
-        for (auto& dirPair : parallelDirs) {
-            LoopGraph* loopPtr = dirPair.first;
-            ParallelDirective* directive = dirPair.second;
-
-            if (directive && !directive->shadowRenew.empty()) {
-                for (size_t shadowIdx = 0; shadowIdx < directive->shadowRenew.size(); ++shadowIdx) {
-                    const auto& shadowRenewItem = directive->shadowRenew[shadowIdx];
-                    const string& arrayName = shadowRenewItem.first.second; // uniqName
-                    const vector<pair<int, int>>& bounds = shadowRenewItem.second;
-
-                    DIST::Array* shadowArray = allArrays.GetArrayByName(arrayName);
-                    if (shadowArray == NULL) {
-                        continue;
-                    }
-
-                    if (shadowArray && !shadowArray->IsNotDistribute()) {
-                        PrecomputedShadowRenewParams params;
-
-                        params.arrayId = shadowArray->GetId();
-                        params.shadowArray = shadowArray;
-
-                        for (const auto& bound : bounds) {
-                            params.shadow_renew.emplace_back(static_cast<size_t>(bound.first),
-                                                             static_cast<size_t>(bound.second));
-                        }
-
-                        params.corner = directive->shadowRenewCorner[shadowIdx];
-                        params.number_loop_iterations = loopPtr ? static_cast<size_t>(loopPtr->countOfIters) : 1;
-
-                        result.shadowRenewParams.push_back(params);
-                    }
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
-double runLibpredictCalc(const vector<size_t>& topology,
-                         const string& clusterConfStr,
-                         const PrecomputedLibpredictParams& precomputedParams,
-                         map<string, vector<Messages>>& SPF_messages)
-{
-    libpredict::RetInitGrid retInitGrid = libpredict::InitGrid(topology[0], topology[1], topology[2], topology[3]);
-
-    if (retInitGrid != libpredict::INIT_GRID_SUCCESS) {
-        __spf_print(1, "ERROR: Failed to initialize libpredict grid with topology: %zu %zu %zu %zu, return code: %d\n",
-                    topology[0], topology[1], topology[2], topology[3], (int)retInitGrid);
-
-        std::wstring messageR, messageE;
-        __spf_printToLongBuf(messageE, L"Failed to initialize libpredict grid with topology: %zu %zu %zu %zu, return code: %d",
-                             topology[0], topology[1], topology[2], topology[3], (int)retInitGrid);
-        __spf_printToLongBuf(messageR, R207);
-        getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1064));
-        return -1;
-    }
-
-    // distribute
-    for (const auto& params : precomputedParams.distributeParams) {
-        libpredict::RetDistribute retDistribute = libpredict::Distribute(
-            params.arrayId, params.elemSize, params.axisDistributions, params.shadowEdges);
-
-        if (retDistribute != libpredict::DISTRIBUTE_SUCCESS) {
-            __spf_print(1, "ERROR: Failed to distribute array '%s' (id=%zu) with libpredict, return code: %d\n",
-                        params.array->GetShortName().c_str(), params.arrayId, (int)retDistribute);
-
-            std::wstring messageR, messageE;
-            __spf_printToLongBuf(messageE, L"Failed to distribute array '%s' with libpredict, return code: %d",
-                                 to_wstring(params.array->GetShortName()).c_str(), (int)retDistribute);
-            __spf_printToLongBuf(messageR, R208);
-            getObjectForFileFromMap(params.array->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(Messages(ERROR, params.array->GetDeclInfo().begin()->second, messageR, messageE, 1065));
-        }
-    }
-
-    // align
-    for (const auto& params : precomputedParams.alignParams) {
-        libpredict::RetAlign retAlign = libpredict::Align(
-            params.arrayId, params.distributedArrayId, params.elemSize,
-            params.dimensions, params.distributionExpressions, params.shadowEdges);
-
-        if (retAlign != libpredict::ALIGN_SUCCESS) {
-            __spf_print(1, "ERROR: Failed to align array '%s' (id=%zu) with array '%s' (id=%zu), return code: %d\n",
-                        params.alignArray->GetShortName().c_str(), params.arrayId,
-                        params.alignWithArray->GetShortName().c_str(), params.distributedArrayId, (int)retAlign);
-
-            std::wstring messageR, messageE;
-            __spf_printToLongBuf(messageE, L"Failed to align array '%s' with array '%s' using libpredict, return code: %d",
-                                 to_wstring(params.alignArray->GetShortName()).c_str(),
-                                 to_wstring(params.alignWithArray->GetShortName()).c_str(), (int)retAlign);
-            __spf_printToLongBuf(messageR, R209);
-            getObjectForFileFromMap(params.alignArray->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(Messages(ERROR, params.alignArray->GetDeclInfo().begin()->second, messageR, messageE, 1066));
-        }
-    }
-
-    // shadow_renew
-    for (const auto& params : precomputedParams.shadowRenewParams) {
-        libpredict::RetShadowRenew retShadowRenew = libpredict::ShadowRenew(
-            params.arrayId, params.shadow_renew, params.corner, params.number_loop_iterations);
-
-        if (retShadowRenew != libpredict::SHADOW_RENEW_SUCCESS) {
-            __spf_print(1, "ERROR: Failed to process shadow_renew for array '%s' (id=%zu), return code: %d\n",
-                        params.shadowArray->GetShortName().c_str(), params.arrayId, (int)retShadowRenew);
-
-            std::wstring messageR, messageE;
-            __spf_printToLongBuf(messageE, L"Failed to process shadow_renew for array '%s' with libpredict, return code: %d",
-                                 to_wstring(params.shadowArray->GetShortName()).c_str(), (int)retShadowRenew);
-            __spf_printToLongBuf(messageR, R210);
-            getObjectForFileFromMap(params.shadowArray->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(Messages(ERROR, params.shadowArray->GetDeclInfo().begin()->second, messageR, messageE, 1067));
-        }
-    }
-
-    return libpredict::GetTime();
-}
-
-void runPredictScheme(SgProject& project,
-                      const vector<ParallelRegion*>& parallelRegions,
-                      map<string, vector<LoopGraph*>>& loopGraph,
-                      map<string, vector<Messages>>& SPF_messages)
-{
-    // calculating maximum dimension of distribution
-    int maxSizeDist = 0;
-    for (int z = 0; z < parallelRegions.size(); ++z) {
-        const DataDirective& dataDirectives = parallelRegions[z]->GetDataDir();
-        const vector<int>& currentVariant = parallelRegions[z]->GetCurrentVariant();
-
-        auto& tmp = dataDirectives.distrRules;
-        vector<const DistrVariant*> currentVar;
-        for (int z1 = 0; z1 < currentVariant.size(); ++z1) {
-            currentVar.push_back(&tmp[z1].second[currentVariant[z1]]);
-        }
-
-        for (auto var : currentVar) {
-            int countBlock = 0;
-            for (int z = 0; z < var->distRule.size(); ++z) {
-                if (var->distRule[z] == dist::BLOCK) {
-                    ++countBlock;
-                }
-            }
-            maxSizeDist = std::max(maxSizeDist, countBlock);
-        }
-    }
-
-    // calculating name of a cluster configuration file
-    string clusterConfStr;
-    if (project.numberOfFiles() > 0) {
-        string firstFilePath = project.fileName(0);
-
-        size_t lastSlash = firstFilePath.find_last_of("/\\");
-        clusterConfStr = firstFilePath.substr(0, lastSlash + 1) + "cluster.conf";
-    }
-
-    // creating template ID display to avoid conflicts
-    map<size_t, size_t> templateIdMapping = createTemplateIdMapping(parallelRegions);
-
-    // Precomputing parameters of directive functions from libpredict
-    PrecomputedLibpredictParams precomputedParams = precomputeLibpredictParams(
-        project, parallelRegions, loopGraph, templateIdMapping);
-
-    // iterating through topologies and processes_per_processor to find most optimal one
-    if (maxSizeDist) {
-        if (maxSizeDist > 4) {
-            maxSizeDist = 4;
-        }
-
-        // Initialize cluster
-        int maxCoresCount = 0;
-        libpredict::RetInitCluster retInitCluster = libpredict::InitCluster(clusterConfStr, maxCoresCount);
-
-        if (retInitCluster != libpredict::INIT_CLUSTER_SUCCESS) {
-            __spf_print(1, "ERROR: Failed to initialize libpredict cluster with config: %s, return code: %d\n", clusterConfStr.c_str(), (int)retInitCluster);
-
-            std::wstring messageR, messageE;
-            __spf_printToLongBuf(messageE, L"Failed to initialize libpredict cluster with config: %s, return code: %d",
-                                 to_wstring(clusterConfStr).c_str(), (int)retInitCluster);
-            __spf_printToLongBuf(messageR, R206);
-            getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1063));
-            return;
-        }
-
-        vector<size_t> bestTopology;
-        double bestTime = std::numeric_limits<double>::max();
-        size_t bestProcessesPerProcessor = 0;
-        int prevProcCount = -1;
-
-        for (size_t processes_per_processor = 1; processes_per_processor <= maxCoresCount; ++processes_per_processor) {
-            int procCount = 0;
-            libpredict::RetInitMapping retInitMapping = libpredict::InitMapping(processes_per_processor, procCount);
-
-            if (retInitMapping != libpredict::INIT_MAPPING_SUCCESS) {
-                __spf_print(1, "ERROR: Failed to initialize libpredict mapping with processes_per_processor: %zu, return code: %d\n",
-                            processes_per_processor, (int)retInitMapping);
-
-                std::wstring messageR, messageE;
-                __spf_printToLongBuf(messageE, L"Failed to initialize libpredict mapping with processes_per_processor: %zu, return code: %d",
-                                     processes_per_processor, (int)retInitMapping);
-                __spf_printToLongBuf(messageR, R211);
-                getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1068));
-                continue;
-            }
-
-            if (procCount == 0) {
-                break; // No more processors available
-            }
-
-            if (procCount == prevProcCount) {
-                continue; // Skip with procCount value unchanged for different processes_per_processor
-            }
-
-            prevProcCount = procCount;
-            __spf_print(1, "Calculate with processes_per_processor=%zu, procCount=%d\n", processes_per_processor, procCount);
-
-            for (size_t n1 = 2; n1 <= procCount; ++n1) {
-                for (size_t n2 = 1; n2 <= n1 && n1 * n2 <= procCount; ++n2) {
-                    if (n2 != 1 && maxSizeDist < 2 || n2 == 1 && maxSizeDist == 2) {
-                        continue;
-                    }
-
-                    for (size_t n3 = 1; n3 <= n2 && n1 * n2 * n3 <= procCount; ++n3) {
-                        if (n3 != 1 && maxSizeDist < 3 || n3 == 1 && maxSizeDist == 3) {
-                            continue;
-                        }
-
-                        for (size_t n4 = 1; n4 <= n3 && n1 * n2 * n3 * n4 <= procCount; ++n4) {
-                            if (n4 != 1 && maxSizeDist < 4 || n4 == 1 && maxSizeDist == 4) {
-                                continue;
-                            }
-
-                            vector<size_t> topology = {n1, n2, n3, n4};
-                            double currTime = runLibpredictCalc(topology, clusterConfStr, precomputedParams, SPF_messages);
-
-                            string outStr = "";
-                            for (const auto& elem : topology) {
-                                outStr += std::to_string(elem) + " ";
-                            }
-                            __spf_print(1, "topology %s has time %f\n", outStr.c_str(), currTime);
-
-                            if (currTime == -1) {
-                                continue;
-                            }
-
-                            if (currTime < bestTime) {
-                                bestTime = currTime;
-                                bestTopology = topology;
-                                bestProcessesPerProcessor = processes_per_processor;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!bestTopology.empty()) {
-            string outStr;
-            for (const auto& elem : bestTopology) {
-                outStr += std::to_string(elem) + " ";
-            }
-
-            __spf_print(1, "best topology %s with time %f (processes_per_processor=%zu)\n",
-                        outStr.c_str(), bestTime, bestProcessesPerProcessor);
-        }
-    } else {
-        __spf_print(1, "impossible to calculate best topology: project does not contain distribution directives\n");
-    }
-}

src/Predictor/PredictSchemeWithLibrary.h

@@ -1,56 +0,0 @@
-#pragma once
-#include <vector>
-#include <map>
-#include <string>
-#include "dvm.h"
-#include "graph_calls.h"
-#include "../../projects/libpredictor/include/libpredict/predictor.h"
-
-struct PrecomputedDistributeParams {
-    size_t arrayId;
-    size_t elemSize;
-    std::vector<libpredict::DistributeAxisRule> axisDistributions;
-    std::vector<std::pair<size_t, size_t>> shadowEdges;
-    DIST::Array* array;
-};
-
-struct PrecomputedAlignParams {
-    size_t arrayId;
-    size_t distributedArrayId;
-    size_t elemSize;
-    std::vector<size_t> dimensions;
-    std::vector<libpredict::AlignDisplay> distributionExpressions;
-    std::vector<std::pair<size_t, size_t>> shadowEdges;
-    DIST::Array* alignArray;
-    DIST::Array* alignWithArray;
-};
-
-struct PrecomputedShadowRenewParams {
-    size_t arrayId;
-    std::vector<std::pair<size_t, size_t>> shadow_renew;
-    bool corner;
-    size_t number_loop_iterations;
-    DIST::Array* shadowArray;
-};
-
-struct PrecomputedLibpredictParams {
-    std::vector<PrecomputedDistributeParams> distributeParams;
-    std::vector<PrecomputedAlignParams> alignParams;
-    std::vector<PrecomputedShadowRenewParams> shadowRenewParams;
-};
-
-PrecomputedLibpredictParams precomputeLibpredictParams(
-    SgProject& project,
-    const std::vector<ParallelRegion*>& parallelRegions,
-    const std::map<std::string, std::vector<LoopGraph*>>& loopGraph,
-    const std::map<size_t, size_t>& templateIdMapping);
-
-void runPredictScheme(SgProject& project,
-                      const std::vector<ParallelRegion*>& parallelRegions,
-                      std::map<std::string, std::vector<LoopGraph*>>& loopGraph,
-                      std::map<std::string, std::vector<Messages>>& SPF_messages);
-
-double runLibpredictCalc(const std::vector<size_t>& topology,
-                         const std::string& clusterConfStr,
-                         const PrecomputedLibpredictParams& precomputedParams,
-                         std::map<std::string, std::vector<Messages>>& SPF_messages);

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -12,38 +12,9 @@
 #include "SgUtils.h"
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
-#include "utils.h"
 
 using namespace std;
 
-static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
-{
-    ArrayAccessingIndexes resultContainer;
-    unordered_set<string> toRemove;
-
-    for (auto& [arrayName, accessingSet] : container)
-    {
-        vector<vector<ArrayDimension>> points;
-        for (auto& arrayPoint : accessingSet.GetElements())
-        {
-            if (!arrayPoint.empty())
-                points.push_back(arrayPoint);
-        }
-
-        if (points.size() < accessingSet.GetElements().size() && !points.empty())
-            resultContainer[arrayName] = points;
-
-        if (points.empty())
-            toRemove.insert(arrayName);
-    }
-
-    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())
@@ -66,13 +37,13 @@ static void Collapse(Region* region)
             region->array_use[arrayName] = region->array_use[arrayName].Union(diff);
         }
     }
-
     ArrayAccessingIndexes useUnion;
     for (auto& byBlock : region->getBasickBlocks())
         for (auto& [arrayName, arrayRanges] : byBlock->array_use)
             useUnion[arrayName] = useUnion[arrayName].Union(byBlock->array_use[arrayName]);
 
-    region->array_priv = 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());
@@ -103,7 +74,6 @@ static void SolveDataFlowIteratively(Region* DFG)
                     newIn.clear();
                     continue;
                 }
-
                 for (const auto& [arrayName, accessSet] : prevBlock->array_out)
                 {
                     if (newIn.find(arrayName) != newIn.end())
@@ -116,7 +86,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())
@@ -152,83 +121,21 @@ static void SolveDataFlow(Region* DFG)
     Collapse(DFG);
 }
 
-static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
-{
-    SgStatement* spfStat = new SgStatement(SPF_ANALYSIS_DIR);
-    spfStat->setlineNumber(loop->loop->lineNumber());
-    spfStat->setFileName(loop->loop->fileName());
-    SgExpression* toAdd = new SgExpression(EXPR_LIST, new SgExpression(ACC_PRIVATE_OP), NULL, NULL);
-    set<SgSymbol*> arraysToInsert;
-    for (const auto& [_, accessingSet] : privates)
-    {
-        for (const auto& arrayElement : accessingSet.GetElements())
-        {
-            if (arrayElement.empty())
-                continue;
-            arraysToInsert.insert(arrayElement[0].array->symbol());
-        }
-    }
-
-    spfStat->setExpression(0, *toAdd);
-    toAdd = toAdd->lhs();
-    bool first = true;
-    for (auto& elem : arraysToInsert)
-    {
-        if (first)
-        {
-            toAdd->setLhs(new SgExpression(EXPR_LIST));
-            toAdd = toAdd->lhs();
-            first = false;
-        }
-        else
-        {
-            toAdd->setRhs(new SgExpression(EXPR_LIST));
-            toAdd = toAdd->rhs();
-        }
-        toAdd->setLhs(new SgVarRefExp(elem));
-    }
-    
-    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)
+map<LoopGraph*, ArrayAccessingIndexes>  FindPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
 {  
     map<LoopGraph*, ArrayAccessingIndexes> result;
-    for (const auto& [fileName, loops] : loopGraph)
+    for (const auto& [loopName, loops] : loopGraph)
     {
-        SgFile::switchToFile(fileName);
         for (const auto& loop : loops)
         {
-            if (!loop->isFor())
-                continue;
-            SgStatement* search_func = loop->loop->GetOriginal();
-
-            while (search_func && (!isSgProgHedrStmt(search_func)))
-                search_func = search_func->controlParent();
-
             for (const auto& [funcInfo, blocks]: FullIR)
             {   
-                if (funcInfo->fileName == fileName && funcInfo->funcPointer->GetOriginal() == search_func)
-                {
-                    Region* loopRegion = new Region(loop, blocks);
-                    if (loopRegion->getBasickBlocks().size() <= 1)
-                    {
-                        delete(loopRegion);
-                        continue;
-                    }
-                    SolveDataFlow(loopRegion);
-                    RemoveEmptyPoints(loopRegion->array_priv);
-                    result[loop] = loopRegion->array_priv;
-                    delete(loopRegion);
-                }
+                Region* loopRegion = new Region(loop, blocks);
+                SolveDataFlow(loopRegion);
+                result[loop] = loopRegion->array_priv;
+                delete(loopRegion);
             }
-
-            if (result.find(loop) != result.end() && !result[loop].empty())
-                AddPrivateArraysToLoop(loop, result[loop], insertedPrivates);
         }
     }
+    return result;
 }

src/PrivateAnalyzer/private_arrays_search.h

@@ -2,12 +2,11 @@
 
 #include <vector>
 #include <map>
-#include <set>
 #include <unordered_set>
 
 #include "range_structures.h"
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
 
-void FindPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, std::set<SgStatement*>& insertedPrivates);
+std::map<LoopGraph*, ArrayAccessingIndexes> FindPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR);
 std::pair<SAPFOR::BasicBlock*, std::unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector<SAPFOR::BasicBlock*> blocks);

src/PrivateAnalyzer/range_structures.cpp

@@ -47,7 +47,7 @@ static ArrayDimension* DimensionIntersection(const ArrayDimension& dim1, const A
     
     uint64_t start3 = dim1.start + x0 * dim1.step;
     uint64_t step3 = c * dim1.step;
-    ArrayDimension* result = new(ArrayDimension){ start3, step3, tMax + 1 , dim1.array};
+    ArrayDimension* result = new(ArrayDimension){ start3, step3, tMax + 1 };
     return result;
 }
 
@@ -61,16 +61,21 @@ static vector<ArrayDimension> DimensionDifference(const ArrayDimension& dim1, co
     vector<ArrayDimension> result;
     /* add the part before intersection */
     if (dim1.start < intersection->start)    
-        result.push_back({ dim1.start, dim1.step, (intersection->start - dim1.start) / dim1.step, dim1.array});
+        result.push_back({ dim1.start, dim1.step, (intersection->start - dim1.start) / dim1.step });
     
     /* add the parts between intersection steps */
-    if (intersection->step > dim1.step)
+    uint64_t start = (intersection->start - dim1.start) / dim1.step;
+    uint64_t interValue = intersection->start;
+    for (int64_t i = start; dim1.start + i * dim1.step <= intersection->start + intersection->step * (intersection->tripCount - 1); i++)
     {
-        uint64_t start = (intersection->start - dim1.start) / dim1.step;
-        uint64_t interValue = intersection->start;
-        for (int64_t i = start; interValue <= intersection->start + intersection->step * (intersection->tripCount - 1); i++)
+        uint64_t centerValue = dim1.start + i * dim1.step;
+        if (centerValue == interValue)
         {
-            result.push_back({interValue + dim1.step, dim1.step, intersection->step / dim1.step, dim1.array});
+            if (i - start > 1)
+            {
+                result.push_back({ dim1.start + (start + 1) * dim1.step, dim1.step, i - start - 1 });
+                start = i;
+            }
             interValue += intersection->step;
         }
     }
@@ -80,7 +85,7 @@ static vector<ArrayDimension> DimensionDifference(const ArrayDimension& dim1, co
         /* first value after intersection */
         uint64_t right_start = intersection->start + intersection->step * (intersection->tripCount - 1) + dim1.step;
         uint64_t tripCount = (dim1.start + dim1.step * dim1.tripCount - right_start) / dim1.step;
-        result.push_back({ right_start, dim1.step, tripCount, dim1.array });
+        result.push_back({ right_start, dim1.step, tripCount });
     }
     delete(intersection);
     return result;
@@ -211,10 +216,6 @@ void AccessingSet::Insert(const vector<ArrayDimension>& element)
 }
 
 AccessingSet AccessingSet::Union(const AccessingSet& source) {
-    if (source.GetElements().empty())
-        return *this;
-    if (allElements.empty())
-        return source;
     AccessingSet result;
     for (auto& element : source.GetElements())
         result.Insert(element);

src/PrivateAnalyzer/range_structures.h

@@ -6,12 +6,9 @@
 #include <string>
 #include <cstdint>
 
-#include "SgUtils.h"
-
 struct ArrayDimension
 {
     uint64_t start, step, tripCount;
-    SgArrayRefExp* array;
 };
 
 class AccessingSet {

src/PrivateAnalyzer/region.cpp

@@ -4,7 +4,6 @@
 #include<unordered_map>
 #include<string>
 #include <numeric>
-#include <iostream>
 
 #include "range_structures.h"
 #include "region.h"
@@ -105,33 +104,15 @@ 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});
-                }
-            }
-        }
         if ((operation == SAPFOR::CFG_OP::STORE || operation == SAPFOR::CFG_OP::LOAD) && type == SAPFOR::CFG_ARG_TYPE::ARRAY)
         {
             vector<SAPFOR::Argument*> index_vars;
             vector<int> refPos;
-            string array_name = instruction->getInstruction()->getArg1()->getValue();            
+            string array_name;
+            if (operation == SAPFOR::CFG_OP::STORE)
+                array_name = instruction->getInstruction()->getArg1()->getValue();            
+            else
+                array_name = instruction->getInstruction()->getArg2()->getValue();
 
             int j = i - 1;
             while (j >= 0 && instructions[j]->getInstruction()->getOperation() == SAPFOR::CFG_OP::REF)
@@ -146,15 +127,29 @@ 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>> coefsForDims;
+            for (int i = 0; ref && i < ref->numberOfSubscripts(); ++i)
+            {
+                const vector<int*>& coefs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
+                if (coefs.size() == 1)
+                {
+                    const pair<int, int> coef(coefs[0][0], coefs[0][1]);
+                    coefsForDims.push_back(coef);
+                }
 
-            while (!index_vars.empty() && !refPos.empty())
+            }
+
+            if(coefsForDims.empty())
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            while (!index_vars.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};
+                    current_dim = { stoul(var->getValue()), 1, 1 };
                 else
                 {
                     string name, full_name = var->getValue();
@@ -180,28 +175,21 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                             return -1;
                     }
 
-                    uint64_t start = currentLoop->startVal;
-                    uint64_t step = currentLoop->stepVal;
-                    uint64_t iters = currentLoop->calculatedCountOfIters;
-                    current_dim = { start, step, iters, ref };
+                    uint64_t start = currentLoop->startVal * currentCoefs.first + currentCoefs.second;
+                    uint64_t step = currentCoefs.first;
+                    current_dim = { start, step, (uint64_t)currentLoop->calculatedCountOfIters };
                 }
 
-                if (current_dim.start != 0 && current_dim.step != 0 && current_dim.tripCount != 0)
-                {
-                    accessPoint[n - index_vars.size()] = current_dim;
-                    fillCount++;
-                }
+                accessPoint[n - index_vars.size()] = current_dim;
                 index_vars.pop_back();
                 refPos.pop_back();
+                coefsForDims.pop_back();
             }
 
-            if (fillCount == accessPoint.size())
-            {
-                if (operation == SAPFOR::CFG_OP::STORE)
-                    def[array_name].Insert(accessPoint);
-                else
-                    use[array_name].Insert(accessPoint);
-            }
+            if (operation == SAPFOR::CFG_OP::STORE)            
+                def[array_name].Insert(accessPoint);
+            else
+                use[array_name].Insert(accessPoint);
         }
     }
     return 0;
@@ -239,11 +227,8 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
             region->addBasickBlocks(bbToRegion.at(block));
 
     for (LoopGraph* childLoop : loop->children)
-    {
-        if (!childLoop->isFor())
-            continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
-    }
+
     return region;
 }
 
@@ -262,9 +247,5 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
     SetConnections(bbToRegion, blockSet);
     //create subRegions
     for (LoopGraph* childLoop : loop->children)
-    {
-        if (!childLoop->isFor())
-            continue;
         subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
-    }
 }

src/Sapfor.cpp

@@ -46,7 +46,6 @@
 #include "DynamicAnalysis/gCov_parser_func.h"
 #include "DynamicAnalysis/createParallelRegions.h"
 
-#include "ArrayConstantPropagation/propagation.h"
 #include "DirectiveProcessing/directive_analyzer.h"
 #include "DirectiveProcessing/directive_creator.h"
 #include "DirectiveProcessing/insert_directive.h"
@@ -58,7 +57,6 @@
 #include "expr_transform.h"
 
 #include "Predictor/PredictScheme.h"
-#include "Predictor/PredictSchemeWithLibrary.h"
 #include "Predictor/PredictorModel.h"
 #include "SageAnalysisTool/depInterfaceExt.h"
 #include "DvmhRegions/DvmhRegionInserter.h"
@@ -91,7 +89,7 @@
 #include "Transformations/DeadCodeRemoving/dead_code.h"
 #include "Transformations/RenameSymbols/rename_symbols.h"
 #include "Transformations/FunctionInlining/inliner.h"
-#include "Transformations/MoveOperators/move_operators.h"
+#include "Transformations/SwapOperators/swap_operators.h"
 
 #include "ProjectParameters/projectParameters.h"
 
@@ -282,8 +280,7 @@ static string unparseProjectIfNeed(SgFile* file, const int curr_regime, const bo
             for (SgStatement* st = file->firstStatement(); st; st = st->lexNext())
                 if (isSPF_stat(st)) // except sapfor parallel regions and if attributes dont move
                     if (st->variant() != SPF_PARALLEL_REG_DIR && st->variant() != SPF_END_PARALLEL_REG_DIR)
-                        if (insertedPrivates.find(st) == insertedPrivates.end())
-                            toDel.push_back(st);
+                        toDel.push_back(st);
 
             for (auto& elem : toDel)
                 elem->deleteStmt();
@@ -943,8 +940,8 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                     internalExit = err;
             }
         }
-        else if (curr_regime == MOVE_OPERATORS)        
-            moveOperators(file, loopGraph, fullIR, countOfTransform);        
+        else if (curr_regime == SWAP_OPERATORS)        
+            runSwapOperators(file, loopGraph, fullIR, countOfTransform);        
         else if (curr_regime == PRIVATE_REMOVING_ANALYSIS)
         {
             auto itFound = loopGraph.find(file->filename());
@@ -1025,6 +1022,8 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                 if(func->funcPointer->variant() != ENTRY_STAT)
                     countOfTransform += removeDeadCode(func->funcPointer, allFuncInfo, commonBlocks);
         }
+        else if (curr_regime == FIND_PRIVATE_ARRAYS)
+            FindPrivateArrays(loopGraph, fullIR);
         else if (curr_regime == TEST_PASS)
         {
         //test pass
@@ -1042,7 +1041,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                           PRIVATE_ARRAYS_EXPANSION, 
                           PRIVATE_ARRAYS_SHRINKING,
                           REMOVE_DEAD_CODE,
-                          MOVE_OPERATORS };
+                          SWAP_OPERATORS };
 
     if ((countOfTransform == 0 || internalExit > 0) && applyFor.find(curr_regime) != applyFor.end())
     {
@@ -1733,7 +1732,103 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         }
     }
     else if (curr_regime == PREDICT_SCHEME)
-        runPredictScheme(project, parallelRegions, loopGraph, SPF_messages);
+    {
+        int maxSizeDist = 0;
+        for (int z = 0; z < parallelRegions.size(); ++z)
+        {
+            const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
+            const vector<int> &currentVariant = parallelRegions[z]->GetCurrentVariant();
+
+            auto &tmp = dataDirectives.distrRules;
+            vector<pair<DIST::Array*, const DistrVariant*>> currentVar;
+            for (int z1 = 0; z1 < currentVariant.size(); ++z1)
+                currentVar.push_back(make_pair(tmp[z1].first, &tmp[z1].second[currentVariant[z1]]));
+
+            for (auto &elem : currentVar)
+            {
+                DIST::Array *array = elem.first;
+                const DistrVariant *var = elem.second;
+
+                int countBlock = 0;
+                for (int z = 0; z < var->distRule.size(); ++z)
+                    if (var->distRule[z] == dist::BLOCK)
+                        ++countBlock;
+                maxSizeDist = std::max(maxSizeDist, countBlock);
+            }
+        }
+                        
+        SpfInterval *mainIterval = getMainInterval(&project, intervals, SPF_messages);
+        topologies.clear();
+        if (maxSizeDist)
+        {
+            const int procNum = 8;
+            //TODO:
+            //topologies = getTopologies(procNum, maxSizeDist);
+            throw -10;
+
+            const int countOfTop = topologies.size();
+            if (countOfTop < 0)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            for (auto &inter : intervals)
+                initTimeForIntervalTree(countOfTop, inter.second);
+
+            for (int z = 0; z < parallelRegions.size(); ++z)
+            {
+                const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
+                const vector<int> &currentVariant = parallelRegions[z]->GetCurrentVariant();
+                DIST::Arrays<int> &allArrays = parallelRegions[z]->GetAllArraysToModify();
+
+                auto &tmp = dataDirectives.distrRules;
+                vector<pair<DIST::Array*, const DistrVariant*>> currentVar;
+                for (int z1 = 0; z1 < currentVariant.size(); ++z1)
+                    currentVar.push_back(make_pair(tmp[z1].first, &tmp[z1].second[currentVariant[z1]]));
+
+                map<LoopGraph*, ParallelDirective*> parallelDirs;
+                vector<std::tuple<DIST::Array*, vector<long>, pair<string, int>>> allSingleRemotes;
+                for (int i = n - 1; i >= 0; --i)
+                {
+                    SgFile *file = &(project.file(i));
+                    auto fountInfo = findAllDirectives(file, getObjectForFileFromMap(file->filename(), loopGraph), parallelRegions[z]->GetId());
+                    parallelDirs.insert(fountInfo.begin(), fountInfo.end());
+
+                    auto fountRem = findAllSingleRemotes(file, parallelRegions[z]->GetId(), parallelRegions);
+                    allSingleRemotes.insert(allSingleRemotes.end(), fountRem.begin(), fountRem.end());
+                }
+                //TODO!
+                //int err = predictScheme(parallelRegions[z], currentVar, allArrays.GetArrays(), parallelDirs, intervals, SPF_messages, allSingleRemotes, maxSizeDist, procNum);                
+                /*if (err != 0)
+                    internalExit = err;*/
+            }
+
+            vector<SpfInterval*> tmp = { mainIterval };
+            aggregatePredictedTimes(tmp);
+
+            int idx = 0;
+            int best = -1;
+            double bestSpeedUp = 0;
+            for (auto &top : topologies)
+            {
+                string outStr = "";
+                for (auto &elem : top)
+                    outStr += std::to_string(elem) + " ";
+                double currS = mainIterval->exec_time / mainIterval->predictedTimes[idx];
+                __spf_print(1, "%d: speed up %f for top. %s\n", idx, currS, outStr.c_str());
+                
+                if (best == -1 || bestSpeedUp < currS)
+                {
+                    bestSpeedUp = currS;
+                    best = idx;
+                }
+                ++idx;
+            }
+            __spf_print(1, "best topology %d with speed up %f\n", best, bestSpeedUp);
+        }
+        else
+            for (auto &inter : intervals)
+                initTimeForIntervalTree(0, inter.second);
+
+    }
     else if (curr_regime == CREATE_INTER_TREE)
     {
         if (keepFiles)
@@ -1798,7 +1893,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());
 
@@ -1825,11 +1920,6 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
     }
     else if (curr_regime == TRANSFORM_ASSUMED_SIZE_PARAMETERS)
         transformAssumedSizeParameters(allFuncInfo);
-    else if (curr_regime == FIND_PRIVATE_ARRAYS_ANALYSIS)
-        FindPrivateArrays(loopGraph, fullIR, insertedPrivates);
-
-    else if (curr_regime == ARRAY_PROPAGATION)
-        ArrayConstantPropagation(project);
 
     const float elapsed = duration_cast<milliseconds>(high_resolution_clock::now() - timeForPass).count() / 1000.;
     const float elapsedGlobal = duration_cast<milliseconds>(high_resolution_clock::now() - globalTime).count() / 1000.;
@@ -2134,8 +2224,9 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
 
             runAnalysis(*project, CALCULATE_STATS_SCHEME, false);
 
-            if (!folderName && !consoleMode || predictOn)
-                runAnalysis(*project, PREDICT_SCHEME, false);
+            //TODO: need to rewrite this to new algo 
+            /*if (!folderName && !consoleMode || predictOn)
+                runAnalysis(*project, PREDICT_SCHEME, false); */
 
             runAnalysis(*project, REMOVE_COPIES, false);
             runAnalysis(*project, SWAP_LOOPS, false);
@@ -2247,7 +2338,7 @@ 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:
+    case SWAP_OPERATORS:
         runAnalysis(*project, curr_regime, true, "", folderName);
         break;
     case INLINE_PROCEDURES:
@@ -2287,7 +2378,6 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
     case SUBST_EXPR_RD_AND_UNPARSE:
     case SUBST_EXPR_AND_UNPARSE:
     case REMOVE_DEAD_CODE_AND_UNPARSE:
-    case FIND_PRIVATE_ARRAYS:
         if (folderName)
             runAnalysis(*project, UNPARSE_FILE, true, "", folderName);
         else
@@ -2428,8 +2518,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++;
@@ -2549,7 +2639,7 @@ int main(int argc, char **argv)
             }
         }
 
-        if (curr_regime == INSERT_PARALLEL_DIRS_NODIST || curr_regime == FIND_PRIVATE_ARRAYS)
+        if (curr_regime == INSERT_PARALLEL_DIRS_NODIST)
         {
             ignoreArrayDistributeState = true;
             sharedMemoryParallelization = 1;

src/Sapfor.h

@@ -122,7 +122,7 @@ enum passes {
     CREATE_INTER_TREE,
     INSERT_INTER_TREE,
 
-    MOVE_OPERATORS,
+    SWAP_OPERATORS,
 
     SHADOW_GROUPING,
     INLINE_PROCEDURES,
@@ -185,11 +185,9 @@ enum passes {
     SET_IMPLICIT_NONE,
     RENAME_INLCUDES,
 
-    FIND_PRIVATE_ARRAYS_ANALYSIS,
     FIND_PRIVATE_ARRAYS,
 
     TRANSFORM_ASSUMED_SIZE_PARAMETERS,
-    ARRAY_PROPAGATION,
 
     TEST_PASS,
     EMPTY_PASS
@@ -323,7 +321,7 @@ 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[SWAP_OPERATORS] = "SWAP_OPERATORS";
     passNames[CREATE_PARALLEL_REGIONS] = "CREATE_PARALLEL_REGIONS";
     passNames[PRIVATE_REMOVING_ANALYSIS] = "PRIVATE_REMOVING_ANALYSIS";
     passNames[PRIVATE_REMOVING] = "PRIVATE_REMOVING";
@@ -376,11 +374,9 @@ static void setPassValues()
     passNames[SET_IMPLICIT_NONE] = "SET_IMPLICIT_NONE";
     passNames[RENAME_INLCUDES] = "RENAME_INLCUDES";
     passNames[INSERT_NO_DISTR_FLAGS_FROM_GUI] = "INSERT_NO_DISTR_FLAGS_FROM_GUI";
-    passNames[FIND_PRIVATE_ARRAYS_ANALYSIS] = "FIND_PRIVATE_ARRAYS_ANALYSIS";
     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;
@@ -132,7 +132,7 @@ std::map<std::string, PredictorStats> allPredictorStats;
 
 //for DVM INTERVALS
 std::map<std::string, std::vector<SpfInterval*>> intervals; // file -> intervals
-std::vector<std::vector<size_t>> topologies; // current topologies
+std::vector<std::vector<long>> topologies; // current topologies
 //
 
 //for GCOV_PARSER
@@ -175,11 +175,6 @@ std::set<std::tuple<std::string, int, std::string>> parametersOfProject; // [fil
 //for GET_MIN_MAX_BLOCK_DIST
 std::pair<int, int> min_max_block = std::make_pair(-1, -1);
 //
-
-//for FIND_PRIVATE_ARRAYS
-std::set<SgStatement*> insertedPrivates;
-//
-
 const char* passNames[EMPTY_PASS + 1];
 const char* optionNames[EMPTY_OPTION + 1];
 bool passNamesWasInit = false;

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/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,18 +502,16 @@ 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,
-                             map<string, SgSymbol*>& symbs, vector<SgSymbol*>& needNewDecl)
+
+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,26 +810,26 @@ 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,
-                         map<string, map<string, deque<CommConstraint>>>& commDecls, const set<string>& badCommon, map<string, set<string>>& notUsedVars)
+
+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)
     {
         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,9 +856,10 @@ static void fixFunctions(SgFile* file, const vector<SgStatement*>& programUnits,
     }
 }
 
-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)
+
+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)
 {
     string fileName = file->filename();
     SgStatement* curSt = file->firstStatement();
@@ -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,826 +0,0 @@
-#include <map>
-#include <unordered_set>
-#include <vector>
-#include <queue>
-#include <iostream>
-#include <algorithm>
-
-#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;
-
-static vector<SAPFOR::IR_Block*> findInstructionsFromOperator(SgStatement* st, const vector<SAPFOR::BasicBlock*>& Blocks) {
-    vector<SAPFOR::IR_Block*> result;
-    string filename = st->fileName();
-    
-    for (auto& block: Blocks) {
-        vector<SAPFOR::IR_Block*> instructionsInBlock = block->getInstructions();
-
-        for (auto& instruction: instructionsInBlock) {
-            SgStatement* curOperator = instruction->getInstruction()->getOperator();
-            if (curOperator->lineNumber() == st->lineNumber())
-                result.push_back(instruction);
-        }
-    }
-    return result;
-}
-
-const unordered_set<int> loop_tags = { FOR_NODE };
-const unordered_set<int> control_tags = { IF_NODE, ELSEIF_NODE, DO_WHILE_NODE, WHILE_NODE, LOGIF_NODE };
-const unordered_set<int> control_end_tags = { CONTROL_END };
-
-struct OperatorInfo {
-    SgStatement* stmt;
-    set<string> usedVars;
-    set<string> definedVars;
-    int lineNumber;
-    bool isMovable;
-    
-    OperatorInfo(SgStatement* s) : stmt(s), lineNumber(s->lineNumber()), isMovable(true) { }
-};
-
-static bool isStatementEmbedded(SgStatement* stmt, SgStatement* parent) {
-    if (!stmt || !parent || stmt == parent)
-        return false;
-    
-    if (parent->variant() == LOGIF_NODE) {
-        if (stmt->lineNumber() == parent->lineNumber())
-            return true;
-        
-        SgStatement* current = parent;
-        SgStatement* lastNode = parent->lastNodeOfStmt();
-
-        while (current && current != lastNode) {
-            if (current == stmt)
-                return true;
-
-            if (current->isIncludedInStmt(*stmt))
-                return true;
-
-            current = current->lexNext();
-        }
-    }
-    
-    if (parent->isIncludedInStmt(*stmt))
-        return true;
-    
-    return false;
-}
-
-static bool isLoopBoundary(SgStatement* stmt) {
-    if (!stmt)
-        return false;
-    
-    if (stmt->variant() == FOR_NODE || stmt->variant() == CONTROL_END)
-        return true;
-    
-    return false;
-}
-
-static bool isPartOfNestedLoop(SgStatement* stmt, SgForStmt* loop) {
-    if (!stmt || !loop)
-        return false;
-    
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    if (!loopStart || !loopEnd)
-        return false;
-    
-    if (stmt->lineNumber() < loopStart->lineNumber() || stmt->lineNumber() > loopEnd->lineNumber())
-        return false;
-    
-    SgStatement* current = loopStart;
-    
-    while (current && current != loopEnd) {
-        
-        if (current->variant() == FOR_NODE && current != loop) {
-            SgForStmt* nestedLoop = (SgForStmt*)current;
-            SgStatement* nestedStart = nestedLoop->lexNext();
-            SgStatement* nestedEnd = nestedLoop->lastNodeOfStmt();
-            
-            if (nestedStart && nestedEnd && 
-                stmt->lineNumber() >= nestedStart->lineNumber() && 
-                stmt->lineNumber() <= nestedEnd->lineNumber()) {
-                return true;
-            }
-        }
-        
-        current = current->lexNext();
-    }
-    
-    return false;
-}
-
-static bool canSafelyExtract(SgStatement* stmt, SgForStmt* loop) {
-    if (!stmt || !loop)
-        return false;
-    
-    if (isLoopBoundary(stmt))
-        return false;
-    
-    if (control_tags.find(stmt->variant()) != control_tags.end())
-        return false;
-    
-    if (isPartOfNestedLoop(stmt, loop))
-        return false;
-    
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    if (!loopStart || !loopEnd) 
-        return false;
-    
-    SgStatement* current = loopStart;
-    
-    while (current && current != loopEnd) {
-        if (current->variant() == LOGIF_NODE && current->lineNumber() == stmt->lineNumber())
-            return false;
-
-        if (control_tags.find(current->variant()) != control_tags.end())
-            if (isStatementEmbedded(stmt, current))
-                return false;
-
-        if (current == stmt) 
-            break;
-        current = current->lexNext();
-    }
-    
-    return true;
-}
-
-static vector<OperatorInfo> analyzeOperatorsInLoop(SgForStmt* loop, const vector<SAPFOR::BasicBlock*>& blocks, 
-                                                   const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR) {
-    vector<OperatorInfo> operators;
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    
-    if (!loopStart || !loopEnd)
-        return operators;
-    
-    SgStatement* current = loopStart;
-    unordered_set<SgStatement*> visited;
-    
-    while (current && current != loopEnd) {
-        
-        if (visited.find(current) != visited.end())
-            break;
-
-        visited.insert(current);
-        
-        if (isLoopBoundary(current)) {
-            current = current->lexNext();
-            continue;
-        }
-        
-        if (current->variant() == FOR_NODE && current != loop) {
-            SgStatement* nestedEnd = current->lastNodeOfStmt();
-            if (nestedEnd)
-                current = nestedEnd->lexNext();
-            else
-                current = current->lexNext();
-            continue;
-        }
-        
-        if (isSgExecutableStatement(current)) {
-            if (control_tags.find(current->variant()) != control_tags.end()) {
-                current = current->lexNext();
-                continue;
-            }
-
-            if (current->variant() != ASSIGN_STAT) {
-                current = current->lexNext();
-                continue;
-            }
-            
-            OperatorInfo opInfo(current);
-            
-            vector<SAPFOR::IR_Block*> irBlocks = findInstructionsFromOperator(current, blocks);
-            for (auto irBlock : irBlocks) {
-                if (!irBlock || !irBlock->getInstruction()) 
-                    continue;
-                
-                const SAPFOR::Instruction* instr = irBlock->getInstruction();
-                if (instr->getArg1()) {
-                    string varName = getNameByArg(instr->getArg1());
-                    if (!varName.empty())
-                        opInfo.usedVars.insert(varName);
-                }
-
-                if (instr->getArg2()) {
-                    string varName = getNameByArg(instr->getArg2());
-                    if (!varName.empty())
-                        opInfo.usedVars.insert(varName);
-                }
-
-                if (instr->getResult()) {
-                    string varName = getNameByArg(instr->getResult());
-                    if (!varName.empty())
-                        opInfo.definedVars.insert(varName);
-                }
-            }
-            
-            operators.push_back(opInfo);
-        }
-        current = current->lexNext();
-    }
-    
-    return operators;
-}
-
-static map<string, vector<SgStatement*>> findVariableDefinitions(SgForStmt* loop, vector<OperatorInfo>& operators) {
-    map<string, vector<SgStatement*>> varDefinitions;
-    for (auto& op : operators)
-        for (const string& var : op.definedVars)
-            varDefinitions[var].push_back(op.stmt);
-
-    return varDefinitions;
-}
-
-static int calculateDistance(SgStatement* from, SgStatement* to) {
-    if (!from || !to) 
-        return INT_MAX;
-
-    return abs(to->lineNumber() - from->lineNumber());
-}
-
-static SgStatement* findBestPosition(SgStatement* operatorStmt, const vector<OperatorInfo>& operators, 
-                                     const map<string, vector<SgStatement*>>& varDefinitions, SgForStmt* loop) {
-    const OperatorInfo* opInfo = nullptr;
-    for (auto& op : operators) {
-        if (op.stmt == operatorStmt) {
-            opInfo = &op;
-            break;
-        }
-    }
-
-    if (!opInfo || !opInfo->isMovable)
-        return nullptr;
-    
-    SgStatement* bestPos = nullptr;
-    int bestLine = -1;
-    
-    for (const string& usedVar : opInfo->usedVars) {
-        if (varDefinitions.find(usedVar) != varDefinitions.end()) {
-            for (SgStatement* defStmt : varDefinitions.at(usedVar)) {
-                if (defStmt->lineNumber() < operatorStmt->lineNumber()) {
-                    if (defStmt->controlParent() == operatorStmt->controlParent()) {
-                        if (defStmt->lineNumber() > bestLine) {
-                            bestLine = defStmt->lineNumber();
-                            bestPos = defStmt;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    if (!bestPos) {
-        bool allLoopCarried = true;
-        bool hasAnyDefinition = false;
-        
-        for (const string& usedVar : opInfo->usedVars) {
-            if (varDefinitions.find(usedVar) != varDefinitions.end()) {
-                for (SgStatement* defStmt : varDefinitions.at(usedVar)) {
-                    if (defStmt == operatorStmt)
-                        continue;
-                    
-                    hasAnyDefinition = true;
-                    if (defStmt->lineNumber() < operatorStmt->lineNumber() &&
-                        defStmt->controlParent() == operatorStmt->controlParent()) {
-                        allLoopCarried = false;
-                        break;
-                    }
-                }
-            }
-
-            if (!allLoopCarried) 
-                break;
-        }
-        
-        if (allLoopCarried || (!hasAnyDefinition && !opInfo->usedVars.empty())) {
-            SgStatement* loopStart = loop->lexNext();
-            return loopStart;
-        }
-    }
-    
-    return bestPos;
-}
-
-static bool canMoveTo(SgStatement* from, SgStatement* to, SgForStmt* loop) {
-    if (!from || !to || from == to)
-        return false;
-    
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    
-    if (!loopStart || !loopEnd) 
-        return false;
-    
-    if (to == loopStart) {
-        SgStatement* fromControlParent = from->controlParent();
-        if (!fromControlParent) fromControlParent = loop;
-        return fromControlParent == loop || fromControlParent == loopStart->controlParent();
-    }
-    
-    if (from->lineNumber() < loopStart->lineNumber() || from->lineNumber() > loopEnd->lineNumber())
-        return false;
-
-    if (to->lineNumber() < loopStart->lineNumber() || to->lineNumber() > loopEnd->lineNumber())
-        return false;
-    
-    if (to->lineNumber() >= from->lineNumber())
-        return false;
-    
-    if (from->controlParent() != to->controlParent())
-        return false;
-    
-    SgStatement* current = to->lexNext();
-    while (current && current != from && current != loopEnd) {
-        if (control_tags.find(current->variant()) != control_tags.end()) {
-            SgStatement* controlEnd = current->lastNodeOfStmt();
-            if (controlEnd && from->lineNumber() <= controlEnd->lineNumber()) {
-                if (from->controlParent() == current && to->controlParent() != current) {
-                    return false;
-                }
-            }
-        }
-        current = current->lexNext();
-    }
-    
-    return true;
-}
-
-static vector<SgStatement*> optimizeOperatorOrder(SgForStmt* loop, 
-                                                  const vector<OperatorInfo>& operators, 
-                                                  const map<string, vector<SgStatement*>>& varDefinitions) {
-    vector<SgStatement*> newOrder;
-    for (auto& op : operators)
-        newOrder.push_back(op.stmt);
-    
-    map<SgStatement*, const OperatorInfo*> stmtToOpInfo;
-    for (auto& op : operators) 
-        stmtToOpInfo[op.stmt] = &op;
-    
-    bool changed = true;
-    
-    while (changed) {
-        changed = false;
-        
-        for (int i = operators.size() - 1; i >= 0; i--) {
-            if (!operators[i].isMovable) 
-                continue;
-            
-            SgStatement* stmt = operators[i].stmt;
-            const OperatorInfo* opInfo = stmtToOpInfo[stmt];
-
-            if (!opInfo)
-                continue;
-            
-            size_t currentPos = 0;
-            for (size_t j = 0; j < newOrder.size(); j++) {
-                if (newOrder[j] == stmt) {
-                    currentPos = j;
-                    break;
-                }
-            }
-            
-            SgStatement* bestPos = findBestPosition(stmt, operators, varDefinitions, loop);
-            
-            if (!bestPos) {
-                bool hasDependents = false;
-                for (size_t j = currentPos + 1; j < newOrder.size(); j++) {
-                    SgStatement* candidate = newOrder[j];
-                    const OperatorInfo* candidateOpInfo = stmtToOpInfo[candidate];
-                    if (candidateOpInfo) {
-                        for (const string& definedVar : opInfo->definedVars) {
-                            if (candidateOpInfo->usedVars.find(definedVar) != candidateOpInfo->usedVars.end()) {
-                                hasDependents = true;
-                                break;
-                            }
-                        }
-
-                        if (hasDependents) 
-                            break;
-                    }
-                }
-                
-                continue;
-            }
-            
-            size_t targetPos = 0;
-            bool foundTarget = false;
-            
-            if (bestPos == loop->lexNext()) {
-                targetPos = 0;
-                
-                for (size_t j = 0; j < currentPos && j < newOrder.size(); j++) {
-                    SgStatement* candidate = newOrder[j];
-                    const OperatorInfo* candidateOpInfo = stmtToOpInfo[candidate];
-                    if (candidateOpInfo) {
-                        bool usesDefinedVar = false;
-                        for (const string& definedVar : opInfo->definedVars) {
-                            if (candidateOpInfo->usedVars.find(definedVar) != candidateOpInfo->usedVars.end()) {
-                                usesDefinedVar = true;
-                                break;
-                            }
-                        }
-
-                        if (usesDefinedVar) {
-                            targetPos = j;
-                            break;
-                        }
-                    }
-                }
-                
-                foundTarget = true;
-                
-                if (currentPos != targetPos && canMoveTo(stmt, bestPos, loop)) {
-                    newOrder.erase(newOrder.begin() + currentPos);
-                    newOrder.insert(newOrder.begin() + targetPos, stmt);
-                    changed = true;
-                }
-            } else {
-                size_t bestPosIdx = 0;
-                bool foundBestPos = false;
-                for (size_t j = 0; j < newOrder.size(); j++) {
-                    if (newOrder[j] == bestPos) {
-                        bestPosIdx = j;
-                        foundBestPos = true;
-                        break;
-                    }
-                }
-                
-                if (foundBestPos) {
-                    targetPos = bestPosIdx + 1;
-                    
-                    for (size_t j = bestPosIdx + 1; j < currentPos && j < newOrder.size(); j++) {
-                        SgStatement* candidate = newOrder[j];
-                        const OperatorInfo* candidateOpInfo = stmtToOpInfo[candidate];
-                        if (candidateOpInfo) {
-                            bool definesUsedVar = false;
-                            for (const string& usedVar : opInfo->usedVars) {
-                                if (candidateOpInfo->definedVars.find(usedVar) != candidateOpInfo->definedVars.end()) {
-                                    definesUsedVar = true;
-                                    break;
-                                }
-                            }
-                            if (definesUsedVar)
-                                targetPos = j + 1;
-                        }
-                    }
-                    
-                    bool wouldBreakDependency = false;
-                    for (size_t j = targetPos; j < currentPos && j < newOrder.size(); j++) {
-                        SgStatement* candidate = newOrder[j];
-                        const OperatorInfo* candidateOpInfo = stmtToOpInfo[candidate];
-                        if (candidateOpInfo) {
-                            for (const string& definedVar : opInfo->definedVars) {
-                                if (candidateOpInfo->usedVars.find(definedVar) != candidateOpInfo->usedVars.end()) {
-                                    wouldBreakDependency = true;
-                                    break;
-                                }
-                            }
-
-                            if (wouldBreakDependency) 
-                                break;
-                        }
-                    }
-                    
-                    if (!wouldBreakDependency && currentPos > targetPos && canMoveTo(stmt, bestPos, loop)) {
-                        newOrder.erase(newOrder.begin() + currentPos);
-                        newOrder.insert(newOrder.begin() + targetPos, stmt);
-                        changed = true;
-                    }
-                }
-            }
-        }
-    }
-    
-    bool dependencyViolation = true;
-    set<pair<SgStatement*, SgStatement*>> triedPairs;
-    
-    while (dependencyViolation) {
-        dependencyViolation = false;
-        triedPairs.clear();
-        
-        for (size_t i = 0; i < newOrder.size(); i++) {
-            SgStatement* stmt = newOrder[i];
-            const OperatorInfo* opInfo = stmtToOpInfo[stmt];
-            if (!opInfo) 
-                continue;
-            
-            for (size_t j = 0; j < i; j++) {
-                SgStatement* prevStmt = newOrder[j];
-                const OperatorInfo* prevOpInfo = stmtToOpInfo[prevStmt];
-                if (!prevOpInfo)
-                    continue;
-                
-                pair<SgStatement*, SgStatement*> key = make_pair(stmt, prevStmt);
-                if (triedPairs.find(key) != triedPairs.end())
-                    continue;
-                
-                bool violation = false;
-                for (const string& definedVar : opInfo->definedVars) {
-                    if (prevOpInfo->usedVars.find(definedVar) != prevOpInfo->usedVars.end()) {
-                        violation = true;
-                        break;
-                    }
-                }
-                
-                if (violation) {
-                    triedPairs.insert(key);
-                    
-                    bool wouldCreateViolation = false;
-                    for (size_t k = j; k < i; k++) {
-                        SgStatement* betweenStmt = newOrder[k];
-                        const OperatorInfo* betweenOpInfo = stmtToOpInfo[betweenStmt];
-
-                        if (!betweenOpInfo)
-                            continue;
-                        
-                        for (const string& usedVar : opInfo->usedVars) {
-                            if (betweenOpInfo->definedVars.find(usedVar) != betweenOpInfo->definedVars.end()) {
-                                wouldCreateViolation = true;
-                                break;
-                            }
-                        }
-
-                        if (wouldCreateViolation)
-                            break;
-                    }
-                    
-                    if (!wouldCreateViolation) {
-                        newOrder.erase(newOrder.begin() + i);
-                        newOrder.insert(newOrder.begin() + j, stmt);
-                        dependencyViolation = true;
-                        break;
-                    }
-                }
-            }
-
-            if (dependencyViolation)
-                break;
-        }
-    }
-    
-    return newOrder;
-}
-
-static bool applyOperatorReordering(SgForStmt* loop, const vector<SgStatement*>& newOrder) {
-    if (!loop || newOrder.empty()) 
-        return false;
-    
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    
-    if (!loopStart || !loopEnd) 
-        return false;
-    
-    vector<SgStatement*> originalOrder;
-    SgStatement* current = loopStart;
-    while (current && current != loopEnd) {
-        if (isSgExecutableStatement(current) && current->variant() == ASSIGN_STAT)
-            originalOrder.push_back(current);
-
-        current = current->lexNext();
-    }
-    
-    bool orderChanged = false;
-    if (originalOrder.size() == newOrder.size()) {
-        for (size_t i = 0; i < originalOrder.size(); i++) {
-            if (originalOrder[i] != newOrder[i]) {
-                orderChanged = true;
-                break;
-            }
-        }
-    } 
-    else
-        orderChanged = true;
-    
-    if (!orderChanged)
-        return false;
-
-    vector<SgStatement*> extractedStatements;
-    vector<char*> savedComments;
-    unordered_set<SgStatement*> extractedSet;
-    map<SgStatement*, int> originalLineNumbers;
-    map<SgStatement*, SgStatement*> stmtToExtracted;
-    
-    for (SgStatement* stmt : newOrder) {
-        if (stmt && stmt != loop && stmt != loopEnd && extractedSet.find(stmt) == extractedSet.end()) {
-            if (control_tags.find(stmt->variant()) != control_tags.end())
-                continue;
-            
-            if (!canSafelyExtract(stmt, loop))
-                continue;
-            
-            bool isMoving = false;
-            for (size_t i = 0; i < originalOrder.size(); i++) {
-                if (originalOrder[i] == stmt) {
-                    for (size_t j = 0; j < newOrder.size(); j++) {
-                        if (newOrder[j] == stmt && i != j) {
-                            isMoving = true;
-                            break;
-                        }
-                    }
-                    break;
-                }
-            }
-            
-            if (!isMoving)
-                continue;
-            
-            originalLineNumbers[stmt] = stmt->lineNumber();
-            savedComments.push_back(stmt->comments() ? strdup(stmt->comments()) : nullptr);
-            SgStatement* extracted = stmt->extractStmt();
-            if (extracted) {
-                extractedStatements.push_back(extracted);
-                extractedSet.insert(stmt);
-                stmtToExtracted[stmt] = extracted;
-            }
-        }
-    }
-    
-    map<SgStatement*, SgStatement*> insertedStatements;
-    
-    for (size_t idx = 0; idx < newOrder.size(); idx++) {
-        SgStatement* stmt = newOrder[idx];
-        
-        if (extractedSet.find(stmt) != extractedSet.end()) {
-            SgStatement* stmtToInsert = stmtToExtracted[stmt];
-
-            if (!stmtToInsert) 
-                continue;
-            
-            SgStatement* insertAfter = loop;
-            
-            for (int i = idx - 1; i >= 0; i--) {
-                SgStatement* prevStmt = newOrder[i];
-                
-                if (extractedSet.find(prevStmt) != extractedSet.end()) {
-                    if (insertedStatements.find(prevStmt) != insertedStatements.end()) {
-                        insertAfter = insertedStatements[prevStmt];
-                        break;
-                    }
-                } else {
-                    SgStatement* search = loop->lexNext();
-                    while (search && search != loopEnd) {
-                        bool skip = false;
-                        for (size_t j = idx; j < newOrder.size(); j++) {
-                            if (extractedSet.find(newOrder[j]) != extractedSet.end() && 
-                                search == newOrder[j]) {
-                                skip = true;
-                                break;
-                            }
-                        }
-                        if (skip) {
-                            search = search->lexNext();
-                            continue;
-                        }
-                        
-                        if (search == prevStmt) {
-                            insertAfter = search;
-                            break;
-                        }
-                        search = search->lexNext();
-                    }
-                    if (insertAfter != loop) break;
-                }
-            }
-            
-            size_t commentIdx = 0;
-            for (size_t i = 0; i < extractedStatements.size(); i++) {
-                if (extractedStatements[i] == stmtToInsert) {
-                    commentIdx = i;
-                    break;
-                }
-            }
-            
-            if (commentIdx < savedComments.size() && savedComments[commentIdx])
-                stmtToInsert->setComments(savedComments[commentIdx]);
-            
-            if (originalLineNumbers.find(stmt) != originalLineNumbers.end())
-                stmtToInsert->setlineNumber(originalLineNumbers[stmt]);
-            
-            SgStatement* controlParent = stmt->controlParent();
-            if (!controlParent)
-                controlParent = loop;
-            
-            insertAfter->insertStmtAfter(*stmtToInsert, *controlParent);
-            insertedStatements[stmt] = stmtToInsert;
-        }
-    }
-    
-    for (char* comment : savedComments) {
-        if (comment)
-            free(comment);
-    }
-    
-    return true;
-}
-
-vector<SAPFOR::BasicBlock*> findFuncBlocksByFuncStatement(SgStatement *st, const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR) {
-    vector<SAPFOR::BasicBlock*> result;
-    Statement* forSt = (Statement*)st;
-
-    for (auto& func: FullIR) {
-        if (func.first->funcPointer->getCurrProcessFile() == forSt->getCurrProcessFile()
-            && func.first->funcPointer->lineNumber() == forSt->lineNumber())
-        {
-            result = func.second;
-        }
-    }
-    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();
-            unordered_set<int> blocks_nums;
-            
-            while (loopBody && loopBody != lastLoopNode) {
-                vector<SAPFOR::IR_Block*> irBlocks = findInstructionsFromOperator(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;
-}
-
-static void processLoopRecursively(SgForStmt* loop, const vector<SAPFOR::BasicBlock*>& blocks, 
-                                   const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR) {
-    if (!loop) 
-        return;
-    
-    SgStatement* loopStart = loop->lexNext();
-    SgStatement* loopEnd = loop->lastNodeOfStmt();
-    if (loopStart && loopEnd) {
-        SgStatement* current = loopStart;
-        while (current && current != loopEnd) {
-            if (current->variant() == FOR_NODE && current != loop) {
-                SgForStmt* nestedLoop = (SgForStmt*)current;
-                processLoopRecursively(nestedLoop, blocks, FullIR);
-                SgStatement* nestedEnd = nestedLoop->lastNodeOfStmt();
-
-                if (nestedEnd)
-                    current = nestedEnd->lexNext();
-                else
-                    current = current->lexNext();
-            } 
-            else
-                current = current->lexNext();
-        }
-    }
-    
-    vector<OperatorInfo> operators = analyzeOperatorsInLoop(loop, blocks, FullIR);
-    if (!operators.empty()) {
-        map<string, vector<SgStatement*>> varDefinitions = findVariableDefinitions(loop, operators);
-        vector<SgStatement*> newOrder = optimizeOperatorOrder(loop, operators, varDefinitions);
-        applyOperatorReordering(loop, newOrder);
-    }
-}
-
-void moveOperators(SgFile *file, map<string, vector<LoopGraph*>>& loopGraph, 
-                   const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, 
-                   int& countOfTransform) {
-    countOfTransform += 1;
-    
-    //cout << "MOVE_OPERATORS Pass Started" << endl;
-
-    const int funcNum = file -> numberOfFunctions();
-    
-    for (int i = 0; i < funcNum; ++i) {
-        SgStatement *st = file -> functions(i);
-        
-        vector<SAPFOR::BasicBlock*> blocks = findFuncBlocksByFuncStatement(st, FullIR);        
-        map<SgForStmt*, vector<SAPFOR::BasicBlock*>> loopsMapping = findAndAnalyzeLoops(st, blocks);
-        
-        for (auto& loopForAnalyze: loopsMapping)
-            processLoopRecursively(loopForAnalyze.first, loopForAnalyze.second, FullIR);
-    }
-    
-    //cout << "MOVE_OPERATORS Pass Completed" << endl;
-}

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, std::map<std::string, std::vector<LoopGraph*>>& loopGraph, 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/Transformations/SwapOperators/swap_operators.cpp

@@ -0,0 +1,422 @@
+#include <map>
+#include <unordered_set>
+#include <vector>
+#include <queue>
+#include <iostream>
+
+#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 "swap_operators.h"
+
+using namespace std;
+
+
+unordered_set<int> loop_tags = {FOR_NODE/*, FORALL_NODE, WHILE_NODE, DO_WHILE_NODE*/};
+unordered_set<int> importantDepsTags = {FOR_NODE, IF_NODE};
+unordered_set<int> importantUpdDepsTags = {ELSEIF_NODE};
+unordered_set<int> importantEndTags = {CONTROL_END};
+
+
+vector<SAPFOR::IR_Block*> findInstructionsFromOperator(SgStatement* st, vector<SAPFOR::BasicBlock*> Blocks)
+{
+    vector<SAPFOR::IR_Block*> result;
+    string filename = st -> fileName();
+    for (auto& block: Blocks)
+    {
+        vector<SAPFOR::IR_Block*> instructionsInBlock = block -> getInstructions();
+        for (auto& instruction: instructionsInBlock)
+        {
+            SgStatement* curOperator = instruction -> getInstruction() -> getOperator();
+            if (curOperator -> lineNumber() == st -> lineNumber())
+                result.push_back(instruction);
+        }
+    }
+    return result;
+}
+
+vector<SAPFOR::BasicBlock*> findFuncBlocksByFuncStatement(SgStatement *st, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
+{
+    vector<SAPFOR::BasicBlock*> result;
+    Statement* forSt = (Statement*)st;
+    for (auto& func: FullIR)
+    {
+        if (func.first -> funcPointer -> getCurrProcessFile() == forSt -> getCurrProcessFile()
+            && func.first -> funcPointer -> lineNumber() == forSt -> lineNumber())
+            result = func.second;
+    }
+    return result;
+}
+
+map<SgForStmt*, vector<SAPFOR::BasicBlock*>> findAndAnalyzeLoops(SgStatement *st, 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())
+        {
+            // part with find statements of loop
+            SgForStmt *forSt = (SgForStmt*)st;
+            SgStatement *loopBody = forSt -> body();
+            SgStatement *lastLoopNode = st->lastNodeOfStmt();
+            // part with find blocks and instructions of loops
+            unordered_set<int> blocks_nums;
+            while (loopBody && loopBody != lastLoopNode)
+            {
+                SAPFOR::IR_Block* IR = findInstructionsFromOperator(loopBody, blocks).front();
+                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();
+            }
+            std::sort(result[forSt].begin(), result[forSt].end());
+        }
+        st = st -> lexNext();
+    }
+    return result;
+}
+
+map<SgStatement*, set<SgStatement*>> AnalyzeLoopAndFindDeps(SgForStmt* forStatement, vector<SAPFOR::BasicBlock*> loopBlocks, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
+{
+    map<SgStatement*, set<SgStatement*>> result;
+    for (SAPFOR::BasicBlock* bb: loopBlocks)
+    {
+        map<SAPFOR::Argument*, set<int>> blockReachingDefinitions = bb -> getRD_In();
+        vector<SAPFOR::IR_Block*> instructions = bb -> getInstructions();
+        for (SAPFOR::IR_Block* irBlock: instructions)
+        {
+            // TODO: Think about what to do with function calls and array references. Because there are also dependencies there that are not reflected in RD, but they must be taken into account
+            SAPFOR::Instruction* instr = irBlock -> getInstruction();
+            result[instr -> getOperator()];
+            // take Argument 1 and it's RD and push operators to final set
+            if (instr -> getArg1() != NULL)
+            {
+                SAPFOR::Argument* arg = instr -> getArg1();
+                set<int> prevInstructionsNumbers = blockReachingDefinitions[arg];
+                for (int i: prevInstructionsNumbers)
+                {
+                    SAPFOR::Instruction* foundInstruction = getInstructionAndBlockByNumber(FullIR, i).first;
+                    if (foundInstruction != NULL)
+                    {
+                        SgStatement* prevOp = foundInstruction -> getOperator();
+                        if (prevOp != forStatement && instr -> getOperator() != forStatement && instr -> getOperator() -> lineNumber() > prevOp -> lineNumber()
+                            && prevOp -> lineNumber() > forStatement -> lineNumber())
+                            result[instr -> getOperator()].insert(prevOp);
+                    }
+                }
+            }
+            // take Argument 2 (if exists) and it's RD and push operators to final set
+            if (instr -> getArg2() != NULL)
+            {
+                SAPFOR::Argument* arg = instr -> getArg2();
+                set<int> prevInstructionsNumbers = blockReachingDefinitions[arg];
+                for (int i: prevInstructionsNumbers)
+                {
+                    SAPFOR::Instruction* foundInstruction = getInstructionAndBlockByNumber(FullIR, i).first;
+                    if (foundInstruction != NULL)
+                    {
+                        SgStatement* prevOp = foundInstruction -> getOperator();
+                        if (prevOp != forStatement && instr -> getOperator() != forStatement&& instr -> getOperator() -> lineNumber() > prevOp -> lineNumber()
+                            && prevOp -> lineNumber() > forStatement -> lineNumber())
+                            result[instr -> getOperator()].insert(prevOp);
+                    }
+                }
+            }
+            // update RD
+            if (instr -> getResult() != NULL)
+                blockReachingDefinitions[instr -> getResult()] = {instr -> getNumber()};
+        }
+    }
+    return result;
+}
+
+void buildAdditionalDeps(SgForStmt* forStatement, map<SgStatement*, set<SgStatement*>>& dependencies)
+{
+    SgStatement* lastNode = forStatement->lastNodeOfStmt();
+    vector<SgStatement*> importantDeps;
+    SgStatement* st = (SgStatement*) forStatement;
+    st = st -> lexNext();
+    SgStatement* logIfOp = NULL;
+    while (st && st != lastNode)
+    {
+        if(importantDeps.size() != 0)
+        {
+            if (st != importantDeps.back())
+            {
+                dependencies[st].insert(importantDeps.back());
+            }
+        }
+        if (logIfOp != NULL)
+        {
+            dependencies[st].insert(logIfOp);
+            logIfOp = NULL;
+        }
+        if (st -> variant() == LOGIF_NODE)
+        {
+            logIfOp = st;
+        }
+        if (importantDepsTags.find(st -> variant()) != importantDepsTags.end())
+        {
+            importantDeps.push_back(st);
+        }
+        if (importantUpdDepsTags.find(st -> variant()) != importantUpdDepsTags.end())
+        {
+            importantDeps.pop_back();
+            importantDeps.push_back(st);
+        }
+        if (importantEndTags.find(st -> variant()) != importantEndTags.end())
+        {
+            if(importantDeps.size() != 0)
+            {
+                importantDeps.pop_back();
+            }
+        }
+        st = st -> lexNext();
+    }
+}
+
+struct ReadyOp {
+    SgStatement* stmt;
+    int degree;
+    size_t arrival;
+    ReadyOp(SgStatement* s, int d, size_t a): stmt(s), degree(d), arrival(a) {}
+};
+
+struct ReadyOpCompare {
+    bool operator()(const ReadyOp& a, const ReadyOp& b) const {
+        if (a.degree != b.degree)
+            return a.degree > b.degree;
+        else
+            return a.arrival > b.arrival;
+    }
+};
+
+vector<SgStatement*> scheduleOperations(const map<SgStatement*, set<SgStatement*>>& dependencies)
+{
+    // get all statements
+    unordered_set<SgStatement*> allStmtsSet;
+    for (const auto& pair : dependencies)
+    {
+        allStmtsSet.insert(pair.first);
+        for (SgStatement* dep : pair.second)
+        {
+            allStmtsSet.insert(dep);
+        }
+    }
+    vector<SgStatement*> allStmts(allStmtsSet.begin(), allStmtsSet.end());
+    // count deps and build reversed graph
+    unordered_map<SgStatement*, vector<SgStatement*>> graph;
+    unordered_map<SgStatement*, int> inDegree;
+    unordered_map<SgStatement*, int> degree;
+    for (auto op : allStmts)
+        inDegree[op] = 0;
+    // find and remember initial dependencies
+    unordered_set<SgStatement*> dependentStmts;
+    for (const auto& pair : dependencies)
+    {
+        SgStatement* op = pair.first;
+        const auto& deps = pair.second;
+        degree[op] = deps.size();
+        inDegree[op] = deps.size();
+        if (!deps.empty())
+            dependentStmts.insert(op);
+        for (auto dep : deps)
+            graph[dep].push_back(op);
+    }
+    for (SgStatement* op : allStmts)
+    {
+        if (!degree.count(op))
+        {
+            degree[op] = 0;
+        }
+    }
+    // build queues
+    using PQ = priority_queue<ReadyOp, vector<ReadyOp>, ReadyOpCompare>;
+    PQ readyDependent;
+    queue<SgStatement*> readyIndependent;
+    size_t arrivalCounter = 0;
+    for (auto op : allStmts)
+    {
+        if (inDegree[op] == 0)
+        {
+            if (dependentStmts.count(op))
+            {
+                readyDependent.emplace(op, degree[op], arrivalCounter++);
+            }
+            else
+            {
+                readyIndependent.push(op);
+            }
+        }
+    }
+    // main sort algorythm
+    vector<SgStatement*> executionOrder;
+    while (!readyDependent.empty() || !readyIndependent.empty())
+    {
+        SgStatement* current = nullptr;
+        if (!readyDependent.empty())
+        {
+            current = readyDependent.top().stmt;
+            readyDependent.pop();
+        }
+        else
+        {
+            current = readyIndependent.front();
+            readyIndependent.pop();
+        }
+        executionOrder.push_back(current);
+        for (SgStatement* neighbor : graph[current])
+        {
+            inDegree[neighbor]--;
+            if (inDegree[neighbor] == 0) {
+                if (dependentStmts.count(neighbor))
+                {
+                    readyDependent.emplace(neighbor, degree[neighbor], arrivalCounter++);
+                }
+                else
+                {
+                    readyIndependent.push(neighbor);
+                }
+            }
+        }
+    }
+    return executionOrder;
+}
+
+static bool buildNewAST(SgStatement* loop, vector<SgStatement*>& newBody)
+{
+    if (!loop) {return false;}   
+    if (newBody.empty()) {return true;}
+    if (loop->variant() != FOR_NODE) {return false;}
+
+    SgStatement* loopStart = loop->lexNext();
+    SgStatement* loopEnd = loop->lastNodeOfStmt();
+    if (!loopStart || !loopEnd) {return false;}
+
+    for (SgStatement* stmt : newBody) {
+        if (stmt && stmt != loop && stmt != loopEnd) {
+            SgStatement* current = loopStart;
+            bool found = false;
+            while (current && current != loopEnd->lexNext()) {
+                if (current == stmt) {
+                    found = true;
+                    break;
+                }
+                current = current->lexNext();
+            }
+            if (!found) {return false;}
+        }
+    }
+
+    vector<SgStatement*> extractedStatements;
+    vector<char*> savedComments;
+    vector<int> savedLineNumbers;
+
+    for (SgStatement* stmt : newBody) {
+        if (stmt && stmt != loop && stmt != loopEnd) {
+            savedComments.push_back(stmt->comments() ? strdup(stmt->comments()) : nullptr);
+            savedLineNumbers.push_back(stmt->lineNumber());
+            SgStatement* extracted = stmt->extractStmt();
+            if (extracted) {extractedStatements.push_back(extracted);}
+        }
+    }
+
+    SgStatement* currentPos = loop;
+    int lineCounter = loop->lineNumber() + 1;
+    
+    for (size_t i = 0; i < extractedStatements.size(); i++) {
+        SgStatement* stmt = extractedStatements[i];
+        if (stmt) {
+            if (i < savedComments.size() && savedComments[i]) {
+                stmt->setComments(savedComments[i]);
+            }
+            stmt->setlineNumber(lineCounter++);
+            currentPos->insertStmtAfter(*stmt, *loop);
+            currentPos = stmt;
+        }
+    }
+
+    for (char* comment : savedComments) {
+        if (comment) {
+            free(comment);
+        }
+    }
+
+    if (currentPos && currentPos->lexNext() != loopEnd) {
+        currentPos->setLexNext(*loopEnd);
+    }
+    
+    return true;
+}
+
+static bool validateNewOrder(SgStatement* loop, const vector<SgStatement*>& newOrder)
+{
+    if (!loop || newOrder.empty()) {
+        return true;
+    }
+    unordered_set<SgStatement*> seen;
+    for (SgStatement* stmt : newOrder) {
+        if (stmt && stmt != loop && stmt != loop->lastNodeOfStmt()) {
+            if (seen.count(stmt)) {
+                return false;
+            }
+            seen.insert(stmt);
+        }
+    }
+    return true;
+}
+
+void runSwapOperators(SgFile *file, std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform)
+{
+    std::cout << "SWAP_OPERATORS Pass" << std::endl;    // to remove
+    countOfTransform += 1;                              // to remove
+
+    const int funcNum = file -> numberOfFunctions();
+    for (int i = 0; i < funcNum; ++i)
+    {
+        SgStatement *st = file -> functions(i);
+        vector<SAPFOR::BasicBlock*> blocks = findFuncBlocksByFuncStatement(st, FullIR);
+        map<SgForStmt*, vector<SAPFOR::BasicBlock*>> loopsMapping = findAndAnalyzeLoops(st, blocks);
+        for (pair<SgForStmt*, vector<SAPFOR::BasicBlock*>> loopForAnalyze: loopsMapping)
+        {
+            map<SgStatement*, set<SgStatement*>> dependencyGraph = AnalyzeLoopAndFindDeps(loopForAnalyze.first, loopForAnalyze.second, FullIR);
+            // TODO: Write a function that will go through the operators and update all dependencies so that there are no mix-ups and splits inside the semantic blocks (for if, do and may be some other cases)
+            buildAdditionalDeps(loopForAnalyze.first, dependencyGraph);
+            cout << endl;
+            int firstLine = loopForAnalyze.first -> lineNumber();
+            int lastLine = loopForAnalyze.first -> lastNodeOfStmt() -> lineNumber();
+            cout << "LOOP ANALYZE FROM " << firstLine << " TO " << lastLine << " RES" << endl;
+            // for (auto &v: dependencyGraph) {
+            //     cout << "OPERATOR: " << v.first -> lineNumber()  << "    " << v.first -> variant() << "\nDEPENDS ON:" << endl;
+            //     if (v.second.size() != 0)
+            //         for (auto vv: v.second)
+            //             cout << vv -> lineNumber() << "  ";
+            //     cout << endl;
+            // }
+            vector<SgStatement*> new_order = scheduleOperations(dependencyGraph);
+            cout << "RESULT ORDER:" << endl;
+            for (auto v: new_order) 
+                if (v -> lineNumber() > firstLine) 
+                    cout << v -> lineNumber() << endl;
+
+            if (validateNewOrder(loopForAnalyze.first, new_order)) {
+                buildNewAST(loopForAnalyze.first, new_order);
+            }
+            st = loopForAnalyze.first -> lexNext();
+            while (st != loopForAnalyze.first -> lastNodeOfStmt())
+            {
+                cout << st -> lineNumber() << "    " << st -> sunparse() << endl;
+                st = st -> lexNext();
+            }
+        }
+    }
+
+    return;
+};

src/Transformations/SwapOperators/swap_operators.h

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

src/Utils/PassManager.h

@@ -206,20 +206,20 @@ 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);
 
     Pass(BUILD_IR) <= Pass(SUBST_EXPR_RD) <= Pass(SUBST_EXPR_RD_AND_UNPARSE);
 
+    list({BUILD_IR, CALL_GRAPH2}) <= Pass(SWAP_OPERATORS);
+
     list({ LOOP_ANALYZER_DATA_DIST_S1, SUBST_EXPR_RD } ) <= Pass(PRIVATE_REMOVING_ANALYSIS);
     list({ PRIVATE_REMOVING_ANALYSIS, REVERT_SUBST_EXPR_RD }) <= Pass(PRIVATE_REMOVING);
 
     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 +229,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 +318,7 @@ 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({ 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);
+    list({ CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS);
 
     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

@@ -934,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());
         }
     }
 }
@@ -959,21 +953,9 @@ DIST::Array* getArrayFromDeclarated(SgStatement *st, const string &arrayName)
         for (auto itSet = it->second.begin(); itSet != it->second.end() && !found; ++itSet)
         {
             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 != declaredArrays.end())
+                if (itD->second.first->GetShortName() == arrayName)
+                    found = itD->second.first;
         }
     }
     return found;
@@ -1282,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)
 {
@@ -1316,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
@@ -1352,7 +1307,6 @@ tuple<int, string, string> getUniqName(const map<string, vector<SgExpression*>>
             if (foundCommon)
             {
                 inCommon = true;
-                symbCommn = getCommonNameOnPos(common.first, commonPos);
                 break;
             }
         }
@@ -1360,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/errors.h

@@ -78,12 +78,7 @@ enum typeMessage { WARR, ERROR, NOTE };
 //   60 "Format misplaced"
 //   61 "Array has declaration area conflict"
 //   62 "need to move common declaration to main for DECLATE"
-//   63 "Failed to initialize libpredict cluster"
-//   64 "Failed to initialize libpredict grid"
-//   65 "Failed to distribute array with libpredict"
-//   66 "Failed to align array with libpredict"
-//   67 "Failed to process shadow_renew with libpredict"
-//
+// 
 // 20xx TRANSFORM GROUP
 //   01 "can not convert array assign to loop"
 //   02 "converted arithmetic IF to simple IF"
@@ -310,7 +305,7 @@ static void printStackTrace() { };
     } \
 } while (0)
 
-// Свободный - R210
+// Свободный - R206
 // Гайд по русификации сообщений: При добавлении нового сообщения, меняется последний сводобный идентификатор.
 // В этом файле остаются только спецификаторы, для которых будет заполнен текст. Полный текст пишется в файле
 // russian_errors_text.txt. Спецификаторы там тоже сохраняются, по ним в визуализаторе будет восстановлен 
@@ -509,18 +504,6 @@ static const wchar_t *R183 = L"R183:";
 static const wchar_t *R184 = L"R184:%s";
 //1062
 static const wchar_t* R205 = L"R205:%s#%s";
-//1063
-static const wchar_t* R206 = L"R206:";
-//1064
-static const wchar_t* R207 = L"R207:";
-//1065
-static const wchar_t* R208 = L"R208:";
-//1066
-static const wchar_t* R209 = L"R209:";
-//1067
-static const wchar_t* R210 = L"R210:";
-//1068
-static const wchar_t* R211 = L"R211:";
 
 //2001
 static const wchar_t *R94 = L"R94:";

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,19 +349,9 @@ 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;
-        }
+        if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
+            altNames[s->identifier()] = s;
     }
 }
 
@@ -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/russian_errors_text.txt

@@ -184,20 +184,8 @@ R182 = "Редукционная операция по элементу масс
 R183 = "Расположение операторов FORMAT не поддерживается, попробуйте применить проход Коррекция стиля кода".
 //1061
 R184 = "Область объявления массива '%s' конфликтует с предыдущей областью. Возможно, это вызвано использованием include-файлов. Попробуйте применить проход 'Подстановка заголовочных файлов'".
-//1062
+//1042
 R205 = "Массив '%s' состоящий в common блоке '%s' должен иметь описание в главной программной единице для объявления в директиве DECLARE"
-//1063
-R206 = "Ошибка инициализации библиотеки libpredict с конфигурацией кластера: %s, код возврата: %d"
-//1064
-R207 = "Ошибка инициализации сетки libpredict с топологией: %zu %zu %zu %zu, код возврата: %d"
-//1065
-R208 = "Ошибка распределения массива '%s' с помощью libpredict, код возврата: %d"
-//1066
-R209 = "Ошибка выравнивания массива '%s' с массивом '%s' с помощью libpredict, код возврата: %d"
-//1067
-R210 = "Ошибка обработки shadow_renew для массива '%s' с помощью libpredict, код возврата: %d"
-//1068
-R211 = "Ошибка инициализации отображения libpredict с processes_per_processor: %zu, код возврата: %d"
 
 //2001
 R94 = "Невозможно автоматически преобразовать данное присваивание к циклу"

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 "2465"
+#define VERSION_SPF "2446"

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)
@@ -950,7 +950,7 @@ int SPF_ModifyArrayDistribution(void*& context, int winHandler, short *options,
 
 extern map<string, PredictorStats> allPredictorStats;
 extern map<string, vector<SpfInterval*>> intervals;
-extern vector<vector<size_t>> topologies;
+extern vector<vector<long>> topologies;
 
 int SPF_CreateParallelVariant(void*& context, int winHandler, short *options, short *projName, short *folderName, int64_t *variants, int *varLen,
                               string &output, string &outputMessage, string &predictorStats)
@@ -1793,22 +1793,6 @@ int SPF_RenameIncludes(void*& context, int winHandler, short* options, short* pr
     return simpleTransformPass(RENAME_INLCUDES, options, projName, folderName, output, outputMessage);
 }
 
-int SPF_InsertPrivateArrayDirectives(void*& context, int winHandler, short* options, short* projName, short* folderName, string& output, string& outputMessage)
-{
-    MessageManager::clearCache();
-    MessageManager::setWinHandler(winHandler);
-    ignoreArrayDistributeState = true;
-    sharedMemoryParallelization = 1;
-    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)
@@ -1823,7 +1807,7 @@ static int inline runModificationPass(passes passName, short* projName, short* f
     runPassesForVisualizer(projName, { passName }, folderName);
 
     //fill data
-    // newFiles: <<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>>
+    // newFiles: <èìåíà ôàéëîâ äëÿ ìîä, ñîäåðæèìîå ôàéëà>
     string newFile;
     
     if (SgFile::switchToFile(outFileName.c_str()) == -1)
@@ -2392,7 +2376,7 @@ const wstring Sapfor_RunAnalysis(const char* analysisName_c, const char* options
             retCode = SPF_GetArrayLinks(context, winHandler, optSh, projSh, result, output, outputMessage);
         else if (whichRun == "SPF_GetMaxMinBlockDistribution")
             retCode = SPF_GetMaxMinBlockDistribution(context, winHandler, optSh, projSh, result, output, outputMessage);
-        else if (whichRun == "SPF_<EFBFBD>hangeDirectory") // russian C
+        else if (whichRun == "SPF_ÑhangeDirectory") // russian C
         {
             if (options_c == NULL)
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -2515,10 +2499,6 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         retCode = SPF_InsertImplicitNone(context, winHandler, optSh, projSh, fold, output, outputMessage);
     else if (whichRun == "SPF_RenameIncludes")
         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;