changes

CMakeLists.txt

@@ -161,11 +161,12 @@ set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp
         src/ParallelizationRegions/expand_extract_reg.cpp
         src/ParallelizationRegions/expand_extract_reg.h
         src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
-        src/ParallelizationRegions/resolve_par_reg_conflicts.h)
+        src/ParallelizationRegions/resolve_par_reg_conflicts.h
+        src/ParallelizationRegions/uniq_name_creator.cpp
+        src/ParallelizationRegions/uniq_name_creator.h)
 
-set(ARRAY_PROP src/ArrayConstantPropagation/propagation.cpp
-	src/ArrayConstantPropagation/propagation.h	
-)
+set(MERGE_REGIONS src/ParallelizationRegions/merge_regions.cpp
+         src/ParallelizationRegions/merge_regions.h)
 
 set(TR_DEAD_CODE src/Transformations/DeadCodeRemoving/dead_code.cpp
         src/Transformations/DeadCodeRemoving/dead_code.h)
@@ -210,6 +211,8 @@ set(TR_RENAME_SYMBOLS  src/Transformations/RenameSymbols/rename_symbols.cpp
         src/Transformations/RenameSymbols/rename_symbols.h)
 SET(TR_MOVE_OPERATORS src/Transformations/MoveOperators/move_operators.cpp
         src/Transformations/MoveOperators/move_operators.h)
+SET(TR_ARR_PROP src/Transformations/ArrayConstantPropagation/propagation.cpp 
+        src/Transformations/ArrayConstantPropagation/propagation.h)
 
 set(TRANSFORMS 
         ${TR_DEAD_CODE}
@@ -233,7 +236,8 @@ set(TRANSFORMS
         ${TR_EXPR_TRANSFORM}
         ${TR_INLINER}
         ${TR_RENAME_SYMBOLS}
-        ${TR_MOVE_OPERATORS})
+        ${TR_MOVE_OPERATORS}
+        ${TR_ARR_PROP})
         
 set(CFG src/CFGraph/IR.cpp
         src/CFGraph/IR.h
@@ -426,8 +430,8 @@ set(SOURCE_EXE
     ${LOOP_ANALYZER}
     ${TRANSFORMS}
     ${PARALLEL_REG}
+    ${MERGE_REGIONS}
     ${PRIV}
-    ${ARRAY_PROP}
     ${FDVM}
     ${OMEGA}
     ${UTILS}
@@ -468,6 +472,7 @@ 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\\ArrayConstantPropagation FILES ${TR_ARR_PROP})
 
 
 source_group (CreateIntervals FILES ${CREATE_INTER_T})
@@ -479,8 +484,8 @@ source_group (GraphCall FILES ${GR_CALL})
 source_group (GraphLoop FILES ${GR_LOOP})
 source_group (LoopAnalyzer FILES ${LOOP_ANALYZER})
 source_group (ParallelizationRegions FILES ${PARALLEL_REG})
+source_group (MergeRegions FILES ${MERGE_REGIONS})
 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

@@ -3,13 +3,29 @@
 #include "../Utils/SgUtils.h"
 
 #include <iostream>
-#include <unordered_map>
-#include <unordered_set>
+#include <functional>
+#include <map>
+#include <set>
 #include <vector>
 
 using namespace std;
 
-static SgStatement* declPlace = NULL;
+namespace {
+
+    struct MyCmp {
+        bool operator()(const SgSymbol* a, const SgSymbol* b) const {
+            return std::strcmp(a->identifier(), b->identifier()) < 0;
+        }
+    };
+
+}
+
+SgStatement* declPlace = NULL;
+set<SgStatement*> changed;
+set<SgSymbol*, MyCmp> variablesToAdd;
+set<SgStatement*> positionsToAdd;
+set<SgStatement*> statementsToRemove;
+map<string, vector<pair<SgStatement*, SgStatement*>>> expToChange;
 
 static bool CheckConstIndexes(SgExpression* exp)
 {
@@ -40,198 +56,194 @@ static SgExpression* CreateVar(int& variableNumber, SgType* type)
     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;
+    SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), *type, *funcStart);
 
-    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);
-    }
+    variablesToAdd.insert(varSymbol);
+    positionsToAdd.insert(declPlace);
 
     return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
 }
 
-static void TransformRightPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber) 
+static SgStatement* FindLastDeclStatement(SgStatement* funcStart)
 {
-    if (!exp)
+    SgStatement* endSt = funcStart->lastNodeOfStmt();
+    SgStatement* cur = funcStart->lexNext();
+    SgStatement* lastDecl = funcStart;
+    const set<int> declVariants = { VAR_DECL, VAR_DECL_90, ALLOCATABLE_STMT, DIM_STAT,
+                                    EXTERN_STAT, COMM_STAT, HPF_TEMPLATE_STAT, DVM_VAR_DECL, STRUCT_DECL };
+
+    while (cur && cur != endSt)
     {
-        return;
+        if (cur->variant() == INTERFACE_STMT)
+            cur = cur->lastNodeOfStmt();
+
+        if (declVariants.find(cur->variant()) != declVariants.end())
+            lastDecl = cur;
+        else if (isSgExecutableStatement(cur))
+            break;
+
+        cur = cur->lexNext();
     }
 
+    return lastDecl;
+}
+
+static void InsertCommonAndDeclsForFunction(SgStatement* funcStart, const set<SgSymbol*, MyCmp>& symbols)
+{
+    if (symbols.empty())
+        return;
+
+    const string commonBlockName = "__propagation_common__";
+
+    SgStatement* funcEnd = funcStart->lastNodeOfStmt();
+    SgStatement* commonStat = NULL;
+    SgExpression* commonList = NULL;
+
+    for (SgStatement* cur = funcStart->lexNext();
+         cur && cur != funcEnd; cur = cur->lexNext())
+    {
+        if (cur->variant() != COMM_STAT)
+            continue;
+
+        for (SgExpression* exp = cur->expr(0); exp; exp = exp->rhs())
+        {
+            if (exp->variant() != COMM_LIST)
+                continue;
+
+            const char* id = exp->symbol() ? exp->symbol()->identifier() : NULL;
+            string existingName = id ? string(id) : string("spf_unnamed");
+            if (existingName == commonBlockName)
+            {
+                commonStat = cur;
+                commonList = exp;
+                break;
+            }
+        }
+        if (commonStat)
+            break;
+    }
+
+    vector<SgExpression*> varRefs;
+    for (SgSymbol* sym : symbols)
+    {
+        if (!sym || sym->variant() != VARIABLE_NAME || string(sym->identifier()) == commonBlockName)
+            continue;
+        SgSymbol* symToAdd = new SgSymbol(VARIABLE_NAME, sym->identifier(), *sym->type(), *funcStart);
+        varRefs.push_back(new SgVarRefExp(symToAdd));
+    }
+    SgExpression* varList = makeExprList(varRefs, false);
+
+    SgStatement* insertAfter = FindLastDeclStatement(funcStart);
+    for (SgSymbol* sym : symbols)
+    {
+        SgStatement* declStmt = sym->makeVarDeclStmt();
+        if (!declStmt)
+            continue;
+
+        if (SgVarDeclStmt* vds = isSgVarDeclStmt(declStmt))
+            vds->setVariant(VAR_DECL_90);
+
+        declStmt->setFileName(funcStart->fileName());
+        declStmt->setFileId(funcStart->getFileId());
+        declStmt->setProject(funcStart->getProject());
+        declStmt->setlineNumber(getNextNegativeLineNumber());
+
+        insertAfter->insertStmtAfter(*declStmt, *funcStart);
+        insertAfter = declStmt;
+        statementsToRemove.insert(declStmt);
+    }
+
+    if (!commonList)
+    {
+        SgSymbol* commonSymbol = new SgSymbol(COMMON_NAME, commonBlockName.c_str());
+        commonList = new SgExpression(COMM_LIST, varList, NULL, commonSymbol);
+
+        commonStat = new SgStatement(COMM_STAT);
+        commonStat->setFileName(funcStart->fileName());
+        commonStat->setFileId(funcStart->getFileId());
+        commonStat->setProject(funcStart->getProject());
+        commonStat->setlineNumber(getNextNegativeLineNumber());
+        commonStat->setExpression(0, commonList);
+
+        SgStatement* lastDecl = FindLastDeclStatement(funcStart);
+        lastDecl->insertStmtAfter(*commonStat, *funcStart);
+        statementsToRemove.insert(commonStat);
+    }
+    else
+    {
+        commonList->setLhs(varList);
+    }
+
+}
+
+static void TransformRightPart(SgStatement* st, SgExpression* exp, 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()))
+    if (isArrayRef(exp) && CheckConstIndexes(exp->lhs()))
     {
-        cout << st->unparse() << endl;
+        expUnparsed = exp->unparse();
         if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
         {
             arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());  
         }
-        st->setExpression(1, arrayToVariable[expUnparsed]->copyPtr());
+        positionsToAdd.insert(declPlace);
+        SgSymbol* builder = arrayToVariable[expUnparsed]->symbol();
+        auto* sym = new SgSymbol(builder->variant(), builder->identifier(), builder->type(), st->controlParent());
+        auto* newVarExp = new SgVarRefExp(sym);
+        expToChange[st->fileName()].push_back({ st , st->copyPtr() });
+        st->setExpression(1, newVarExp);
         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()))
+        if (subnodes[i] && isArrayRef(subnodes[i]) && 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();
+                arrayToVariable[expUnparsed] = CreateVar(variableNumber, subnodes[i]->symbol()->type()->baseType());
+
+            positionsToAdd.insert(declPlace);
+            SgSymbol* builder = arrayToVariable[expUnparsed]->symbol();
+            auto* sym = new SgSymbol(builder->variant(), builder->identifier(), builder->type(), st->controlParent());
+            toAdd = new SgVarRefExp(sym);
             if (toAdd)
             {
                 if (i == 0)
                 {
+                    expToChange[st->fileName()].push_back({ st , st->copyPtr() });;
                     exp->setLhs(toAdd);
                 }
                 else
                 {
+                    expToChange[st->fileName()].push_back({ st , st->copyPtr() });;
                     exp->setRhs(toAdd);
                 }
             }
         }
         else
-        {
             TransformRightPart(st, subnodes[i], arrayToVariable, variableNumber);
-        }
+        
     }
 }
 
-static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+static void TransformLeftPart(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
 {
     if (exp->symbol()->type()->variant() == T_STRING)
         return;
+    if (changed.find(st) != changed.end())
+        return;
     string expUnparsed = exp->unparse();
     if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
     {
         arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
     }
+    positionsToAdd.insert(declPlace);
     SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, arrayToVariable[expUnparsed]->copyPtr(), st->expr(1)->copyPtr(), NULL);
 
     newStatement->setFileId(st->getFileId());
@@ -240,11 +252,64 @@ static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<
     newStatement->setlineNumber(getNextNegativeLineNumber());
     newStatement->setLocalLineNumber(st->lineNumber());
     st->insertStmtBefore(*newStatement, *st->controlParent());
+    changed.insert(st);
+    statementsToRemove.insert(newStatement);
 }
 
-void ArrayConstantPropagation(SgProject& project) 
+static void TransformBorder(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
 {
-    unordered_map<string, SgExpression*> arrayToVariable;
+    SgStatement* firstStatement = declPlace->lexPrev();
+    st = st->lexPrev();
+    string array = exp->unparse();
+    if (arrayToVariable.find(array) == arrayToVariable.end())
+        arrayToVariable[array] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
+    while (st != firstStatement)
+    {
+        if (st->variant() == ASSIGN_STAT && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+        {
+            if (st->expr(1))
+            {
+                TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+            }
+            if (st->expr(0) && isArrayRef(st->expr(0)) && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+        }
+        st = st->lexPrev();
+    }
+}
+
+static void CheckVariable(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    SgStatement* firstStatement = declPlace->lexPrev();
+    st = st->lexPrev();
+    string varName = exp->unparse();
+    while (st != firstStatement)
+    {
+        if (st->variant() == ASSIGN_STAT && st->expr(0)->symbol() == exp->symbol())
+        {
+            TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+            positionsToAdd.insert(declPlace);
+        }
+        if (st->variant() == ASSIGN_STAT && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+        {
+            if (st->expr(1))
+            {
+                TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+                positionsToAdd.insert(declPlace);
+            }
+            if (st->expr(0) && isArrayRef(st->expr(0)) && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+            {
+                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+                positionsToAdd.insert(declPlace);
+            }
+        }
+        st = st->lexPrev();
+    }
+}
+
+void arrayConstantPropagation(SgProject& project) 
+{
+    map<string, SgExpression*> arrayToVariable;
     int variableNumber = 0;
     for (int i = 0; i < project.numberOfFiles(); i++) 
     {
@@ -252,7 +317,7 @@ void ArrayConstantPropagation(SgProject& project)
 
         if (!file)
             continue;
-
+        SgFile::switchToFile(file->filename());
         const int funcNum = file->numberOfFunctions();
         for (int i = 0; i < funcNum; ++i)
         {
@@ -262,40 +327,48 @@ void ArrayConstantPropagation(SgProject& project)
 
             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)
+                if (st->variant() == FOR_NODE)
                 {
                     SgExpression* lowerBound = st->expr(0)->lhs();
                     SgExpression* upperBound = st->expr(0)->rhs();
+                    SgStatement* boundCopy = NULL;
                     string lowerBoundUnparsed = lowerBound->unparse(), upperBoundUnparsed = upperBound->unparse();
-                    if (upperBound->variant() == ARRAY_REF && upperBound->symbol()->type()->baseType() && CheckConstIndexes(upperBound->lhs()))
+                    if (isArrayRef(upperBound) && upperBound->symbol()->type()->baseType() && CheckConstIndexes(upperBound->lhs()))
                     {
-                        if (arrayToVariable.find(upperBoundUnparsed) == arrayToVariable.end())
-                        {
-                            arrayToVariable[upperBoundUnparsed] = CreateVar(variableNumber, upperBound->symbol()->type()->baseType());
-                        }
+                        boundCopy = st->copyPtr();
+                        TransformBorder(st, upperBound, arrayToVariable, variableNumber);
                         st->expr(0)->setRhs(arrayToVariable[upperBoundUnparsed]->copyPtr());
+                        expToChange[st->fileName()].push_back({ st ,boundCopy });;
+                        positionsToAdd.insert(declPlace);
                     }
-                    if (lowerBound->variant() == ARRAY_REF && lowerBound->symbol()->type()->baseType() && CheckConstIndexes(lowerBound->lhs()))
+                    else if (upperBound->variant() == VAR_REF)
+                        CheckVariable(st, upperBound, arrayToVariable, variableNumber);
+
+                    if (isArrayRef(lowerBound) && lowerBound->symbol()->type()->baseType() && CheckConstIndexes(lowerBound->lhs()))
                     {
-                        if (arrayToVariable.find(lowerBoundUnparsed) == arrayToVariable.end())
-                        {
-                            arrayToVariable[lowerBoundUnparsed] = CreateVar(variableNumber, lowerBound->symbol()->type()->baseType());
-                        }
+                        boundCopy = st->copyPtr();
+                        TransformBorder(st, lowerBound, arrayToVariable, variableNumber);
                         st->expr(0)->setLhs(arrayToVariable[lowerBoundUnparsed]->copyPtr());
+                        expToChange[st->fileName()].push_back({ st , boundCopy });;
+                        positionsToAdd.insert(declPlace);
+                    }
+                    else if (lowerBound->variant() == VAR_REF)
+                        CheckVariable(st, lowerBound, arrayToVariable, variableNumber);
                 }
             }
         }
     }
+    set<SgStatement*> funcStarts;
+    for (SgStatement* st : positionsToAdd)
+    {
+        SgFile::switchToFile(st->fileName());
+        SgStatement* scope = st->controlParent();
+        if (scope)
+            funcStarts.insert(scope);
+    }
+    for (const auto& st : funcStarts)
+    {
+        SgFile::switchToFile(st->fileName());
+        InsertCommonAndDeclsForFunction(st, variablesToAdd);
     }
 }

src/ArrayConstantPropagation/propagation.h

@@ -1,4 +1,20 @@
 #pragma once
 #include "../Utils/SgUtils.h"
 
-void ArrayConstantPropagation(SgProject& project);
+#include <string>
+#include <vector>
+
+using namespace std;
+
+struct ExprRestoreEntry
+{
+    enum Kind { kStatementExpr, kExprChild };
+    Kind kind;
+    SgStatement* stmt;
+    int stmtExprIndex;
+    SgExpression* parent;
+    bool childIsRhs;
+    SgExpression* savedCopy;
+};
+
+void arrayConstantPropagation(SgProject& project);

src/CFGraph/RD_subst.cpp

@@ -56,7 +56,7 @@ static void setSubstitutionsApplied(bool new_state)
     substitutions_applied = new_state;
 }
 
-static map<string, map<SgStatement*, vector<SgExpression*>>> oldExpressionsInFile;
+map<string, map<SgStatement*, vector<SgExpression*>>> oldExpressionsInFile;
 static map<string, map<SgStatement*, vector<SgExpression*>>> replacementsInFiles;
 static int substitution_counter = 0;
 

src/DirectiveProcessing/spf_directive_preproc.cpp

@@ -1933,6 +1933,17 @@ static inline bool processStat(SgStatement *st, const string &currFile,
                     retVal = false;
                 }
             }
+
+            //MERGE_ARRAYS
+            if (isSPF_OP(attributeStatement, SPF_MERGE_ARRAYS_OP))
+            {
+                attributeStatement->setLocalLineNumber(-1);
+                /*if (st->variant() != FOR_NODE)
+                {
+                    BAD_POSITION_FULL(ERROR, "", "", "before", RR1_1, "DO statement", RR1_3, attributeStatement->lineNumber());
+                    retVal = false;
+                }*/
+            }
         }
         else if (type == SPF_CHECKPOINT_DIR)
         {

src/DvmhRegions/DvmhRegionInserter.cpp

@@ -1289,6 +1289,9 @@ static set<DIST::Array*>
 
             SgStatement* declStat = NULL;
 
+            if (realArray->GetLocation().first == DIST::l_PARAMETER)
+                continue;
+
             if (realArray->GetLocation().first == DIST::l_COMMON)
             {
                 commonArrays.insert(realArray);

src/GraphCall/graph_calls.cpp

@@ -723,7 +723,7 @@ static void fillIn(FuncInfo *currF, SgExpression *ex, const map<string, int> &pa
 {
     if (ex)
     {
-        if (!isInFuncPar && (ex->variant() == VAR_REF || isArrayRef(ex)))
+        if (!isInFuncPar && (ex->variant() == VAR_REF || ex->variant() == ARRAY_REF))
         {
             const char *name = ex->symbol()->identifier();
             if (name && name != string(""))
@@ -800,20 +800,47 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
 
     static map<string, vector<int>> supportedKeyWordArg = { {"system_clock", { OUT_BIT, OUT_BIT, OUT_BIT } } };
 
-    map<string, int> parNames;
+    map<string, int> parNamesMain;
+    map<string, int> parNamesContains;
 
     for (int i = 0; i < currF->funcParams.identificators.size(); ++i)
-        parNames[currF->funcParams.identificators[i]] = i;
+        parNamesMain[currF->funcParams.identificators[i]] = i;
 
+    map<string, int>& parNames = parNamesMain;
+
+    bool isContainsFunctions = false;
     for (auto st = start; st != last; st = st->lexNext())
     {
-        if (st->variant() == CONTAINS_STMT)
-            break;
+        if (st->variant() == CONTAINS_STMT) {
+            isContainsFunctions = true;
+            continue;
+        }
+
+        if (isContainsFunctions) {
+            if (st->variant() == PROC_HEDR || st->variant() == FUNC_HEDR) {
+                parNamesContains = parNamesMain;
+                
+                SgProgHedrStmt* hedr = (SgProgHedrStmt*)st;
+
+                int numOfParams = hedr->numberOfParameters();
+                if (numOfParams > 0)
+                {
+                    for (int i = 0; i < numOfParams; ++i)
+                    {
+                        auto it = parNamesContains.find(hedr->parameter(i)->identifier());
+                        if (it != parNamesContains.end())
+                            parNamesContains.erase(it);
+                    }
+                }
+                parNames = parNamesContains;
+            }
+        }
 
         if (st->variant() == ENTRY_STAT)
             continue;
         
         if (isSgExecutableStatement(st) == NULL) {
+            if (!isContainsFunctions)
                 checkInTypeDescription(st->expr(0), currF, parNames);
             continue;
         }
@@ -821,8 +848,10 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
         if (st->lineNumber() <= 0)
             continue;
 
-        if (activeOps.size() && activeOps.find(st) == activeOps.end())
-            continue;
+        //XXX: use parameters removing in block ... isContainsFunctions ...
+        //TODO need to use IR for parameters checking
+        /*if (activeOps.size() && activeOps.find(st) == activeOps.end())
+            continue; */
 
         if (st->variant() == ASSIGN_STAT)
         {
@@ -851,7 +880,7 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
             for (auto ex = read->itemList(); ex; ex = ex->rhs())
             {
                 SgExpression* item = ex->lhs();
-                if (item->variant() == VAR_REF || isArrayRef(item))
+                if (item && (item->variant() == VAR_REF || item->variant() == ARRAY_REF))
                 {
                     string symb = "";
                     if (item->symbol())
@@ -872,7 +901,7 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
                         if (item->rhs())
                             queue.push(item->rhs());
 
-                        if (item->variant() == VAR_REF || isArrayRef(item))
+                        if (item->variant() == VAR_REF || item->variant() == ARRAY_REF)
                         {
                             string symb = "";
                             if (item->symbol())

src/GraphLoop/graph_loops_base.cpp

@@ -6,14 +6,12 @@
 #include <cstdint>
 
 #include <map>
-#include <unordered_map>
 #include <vector>
 #include <set>
 #include <string>
 
 using std::vector;
 using std::map;
-using std::unordered_map;
 using std::tuple;
 using std::set;
 using std::string;

src/ParallelizationRegions/ParRegions.cpp

@@ -24,6 +24,7 @@ using std::make_pair;
 using std::map;
 using std::set;
 using std::wstring;
+using std::tuple;
 
 extern void createMapLoopGraph(map<int, LoopGraph*> &sortedLoopGraph, const vector<LoopGraph*> *loopGraph);
 
@@ -955,3 +956,64 @@ void calculateLinesOfCode(vector<ParallelRegion*> &allRegions)
         __spf_print(1, "  Count of lines in region '%s' = %d\n", elem->GetName().c_str(), lineCounter);
     }
 }
+
+void propagateRegionInfo(map<tuple<int, string, string>, pair<DIST::Array*, DIST::ArrayAccessInfo*>>& declaredArrays,
+                         const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls,
+                         const vector<ParallelRegion*> &parallelRegions)
+{
+    bool modified = true;
+    while (modified)
+    {
+        modified = false;
+        
+        for (auto &array_pair: declaredArrays)
+        {
+            auto array = array_pair.second.first;
+            if (array->GetLocation().first == DIST::l_PARAMETER)
+            {
+                set<DIST::Array*> realArrayRef;
+                getAllArrayRefs(array, array, realArrayRef, arrayLinksByFuncCalls);
+
+                auto regs = array->GetRegionsName();
+                for (auto& ref : realArrayRef)
+                {
+                    auto regsRef = ref->GetRegionsName();
+                    for (auto& reg : regsRef)
+                    {
+                        if (regs.count(reg) == 0)
+                        {
+                            array->SetRegionPlace(reg);
+                            modified = true;
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    bool hasNonDefaultReg = false;
+    for (auto& elem : parallelRegions)
+    {
+        string regName = elem->GetName();
+        convertToLower(regName);
+        if (regName != "default")
+            hasNonDefaultReg = true;
+    }
+
+    if (hasNonDefaultReg)
+    {
+        for (auto array : declaredArrays)
+        {
+            if (array.second.first->GetRegionsName().size() == 0)
+                array.second.first->SetDistributeFlag(DIST::NO_DISTR);
+            else if (array.second.first->GetRegionsName().size() == 1)
+            {
+                string regName = *array.second.first->GetRegionsName().begin();
+                convertToLower(regName);
+                if (regName == "default")
+                    array.second.first->SetDistributeFlag(DIST::NO_DISTR);
+            }
+        }
+    }
+}

src/ParallelizationRegions/ParRegions_func.h

@@ -10,3 +10,7 @@ int printParalleRegions(const char *fileName, std::vector<ParallelRegion*> &regi
 bool buildGraphFromUserDirectives(const std::vector<Statement*> &userDvmAlignDirs, DIST::GraphCSR<int, double, attrType> &G, DIST::Arrays<int> &allArrays, const std::map<DIST::Array*, std::set<DIST::Array*>> &arrayLinksByFuncCalls, const std::set<DIST::Array*>& alignedArrays, std::set<DIST::Array*>& addedArrays, const std::map<std::string, std::vector<FuncInfo*>>& funcsByFile);
 void clearRegionStaticData();
 void calculateLinesOfCode(std::vector<ParallelRegion*> &allRegions);
+
+void propagateRegionInfo(std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>>& declaredArrays,
+                         const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCall,
+                         const std::vector<ParallelRegion*>& parallelRegions);

src/ParallelizationRegions/merge_regions.cpp

@@ -0,0 +1,624 @@
+#include "leak_detector.h"
+
+#include <set>
+#include <map>
+#include "merge_regions.h"
+
+using std::map;
+using std::set;
+using std::pair;
+using std::string;
+using std::vector;
+
+//TODO: need to create new clause!!
+static void parseMergeDirective(const char *comment,
+                                vector<pair<string, string>> &parsed_mapping)
+{
+    while (comment)
+    {
+        auto *line_end = strchr(comment, '\n');
+
+        static const char prefix[] = "!!spf transform(merge_arrays(";
+        static const auto compare_chars = sizeof(prefix) - 1;
+
+        if (strlen(comment) >= compare_chars)
+        {
+            std::string comment_cmp(comment, compare_chars);
+            convertToLower(comment_cmp);
+
+            if (comment_cmp == prefix)
+            {
+                auto* pair_start = comment + compare_chars;
+                auto* comma = strchr(pair_start, ',');
+                if (comma)
+                {
+                    auto* close_br = strchr(comma + 1, ')');
+                    if (close_br)
+                    {
+                        parsed_mapping.emplace_back(
+                            string(pair_start, comma - pair_start),
+                            string(comma + 1, close_br - comma - 1));
+                    }
+                }
+            }
+        }
+
+        comment = line_end;
+
+        if (comment)
+            comment++;
+    }
+}
+
+static string getNonDefaultRegion(DIST::Array *a)
+{
+    string result;
+
+    if (!a)
+        return result;
+
+    for (const auto &reg_name : a->GetRegionsName())
+    {
+        if (reg_name != "default")
+        {
+            if (!result.empty())
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            result = reg_name;
+        }
+    }
+
+    return result;
+}
+
+static bool hasSameSizes(DIST::Array *a, DIST::Array *b)
+{
+    for (auto *array : {a, b})
+    {
+        for (const auto &p : array->GetSizes())
+        {
+            if (p.first < 0 || p.second < 0)
+                return false;
+        }
+    }
+
+    return a->GetSizes() == b->GetSizes() && a->GetTypeSize() == b->GetTypeSize();
+}
+
+static bool checkSimilarTemplates(vector<ParallelRegion *> &regions,
+                                  const map<string, string> &new_region_mapping)
+{
+    // new region -> old regions
+    map<string, set<string>> new_region_inverse_mapping;
+    for (const auto &p : new_region_mapping)
+        new_region_inverse_mapping[p.second].insert(p.first);
+
+    for (const auto &new_reg : new_region_inverse_mapping)
+    {
+        DIST::Array *template_array = nullptr;
+        string first_reg_name;
+
+        for (const auto &old_region_name : new_reg.second)
+        {
+            auto *old_reg = getRegionByName(regions, old_region_name);
+
+            if (!old_reg)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            const auto &distr_rules = old_reg->GetDataDir().GetDistrRules();
+            if (distr_rules.size() != 1)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            auto *current_template = distr_rules.front().first;
+
+            if (template_array)
+            {
+                if (!hasSameSizes(template_array, current_template))
+                {
+                    __spf_print(1, "Templates of %s and %s has different sizes\n",
+                                first_reg_name.c_str(),
+                                old_region_name.c_str());
+
+                    return false;
+                }
+                // else everything OK
+            }
+            else
+            {
+                template_array = current_template;
+                first_reg_name = old_region_name;
+            }
+        }
+    }
+
+    return true;
+}
+
+static bool hasSameAlignment(const std::set<const AlignRule *> &align_a,
+                             const std::set<const AlignRule *> &align_b)
+{
+    if (align_a.size() != 1 || align_b.size() != 1)
+        return false;
+
+    const auto *rule_a = *align_a.begin();
+    const auto *rule_b = *align_b.begin();
+
+    if (rule_a->alignRule != rule_b->alignRule)
+        return false;
+
+    return true;
+}
+
+static void printExpr(SgExpression *e, string pad)
+{
+    if (!e)
+        return;
+
+    __spf_print(1, "%s%d: %s\n", pad.c_str(), e->variant(), e->unparse());
+
+    printExpr(e->lhs(), pad + "  ");
+    printExpr(e->rhs(), pad + "  ");
+}
+
+static pair<vector<SgStatement *>, SgSymbol *> generateDeclaration(const string &array_name, const string &common_block_name,
+                                                                   const vector<pair<int, int>> &sizes, SgType *type, SgStatement *scope)
+{
+    auto *array_symbol = new SgSymbol(VARIABLE_NAME, array_name.c_str(), new SgType(T_ARRAY), scope);
+
+    auto *decl = new SgDeclarationStatement(VAR_DECL);
+
+    decl->setExpression(1, new SgTypeExp(*type));
+
+    SgExpression *subs = new SgExprListExp();
+
+    auto *array_ref = new SgArrayRefExp(*array_symbol, *subs);
+
+    for (int i = 0; i < sizes.size(); i++)
+    {
+        const auto &p = sizes[i];
+        auto *d = new SgExpression(DDOT, new SgValueExp(p.first), new SgValueExp(p.second));
+        subs->setLhs(d);
+
+        if (i + 1 < sizes.size())
+        {
+            subs->setRhs(new SgExprListExp());
+            subs = subs->rhs();
+        }
+    }
+
+    decl->setExpression(0, array_ref);
+
+    auto comm = new SgStatement(COMM_STAT);
+
+    comm->setExpression(0, new SgExpression(COMM_LIST,
+                                            new SgVarRefExp(array_symbol),
+                                            NULL,
+                                            new SgSymbol(COMMON_NAME, common_block_name.c_str())));
+
+    return {{decl, comm}, array_symbol};
+}
+
+static SgExpression* findExprWithVariant(SgExpression* exp, int variant)
+{
+    if (exp)
+    {
+        if (exp->variant() == variant)
+            return exp;
+
+        auto *l = findExprWithVariant(exp->lhs(), variant);
+        if (l)
+            return l;
+
+        auto *r = findExprWithVariant(exp->rhs(), variant);
+        if (r)
+            return r;
+    }
+
+    return NULL;
+}
+
+SgType* GetArrayType(DIST::Array *array)
+{
+    if (!array)
+        return NULL;
+
+    for (const auto& decl_place : array->GetDeclInfo())
+    {
+        if (SgFile::switchToFile(decl_place.first) != -1)
+        {
+            auto* decl = SgStatement::getStatementByFileAndLine(decl_place.first, decl_place.second);
+            if (decl)
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    auto* found_type = isSgTypeExp(findExprWithVariant(decl->expr(i), TYPE_OP));
+                    if (found_type)
+                        return found_type->type();
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+SgSymbol *insertDeclIfNeeded(const string &array_name,
+                             const string &common_block_name,
+                             DIST::Array *example_array,
+                             FuncInfo *dest,
+                             map<FuncInfo *, map<string, SgSymbol *>> &inserted_arrays)
+{
+    auto *type = GetArrayType(example_array);
+
+    if (!type)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    if (SgFile::switchToFile(dest->fileName) == -1)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    auto &by_func = inserted_arrays[dest];
+    auto it = by_func.find(array_name);
+
+    if (it != by_func.end())
+        return it->second;
+
+    SgStatement *st = dest->funcPointer;
+
+    auto *end = st->lastNodeOfStmt();
+
+    st = st->lexNext();
+
+    while (st != end && !isSgExecutableStatement(st))
+    {
+        st = st->lexNext();
+    }
+
+    auto generated = generateDeclaration(array_name, common_block_name,
+                                         example_array->GetSizes(),
+                                         type, dest->funcPointer);
+    for (auto *new_stmt : generated.first)
+        st->insertStmtBefore(*new_stmt, *dest->funcPointer);
+
+    by_func[array_name] = generated.second;
+
+    return generated.second;
+}
+
+static pair<string, string> createNewArray(DIST::Array *example_array, const string &base_name,
+                                           const map<string, vector<FuncInfo *>> &allFuncInfo,
+                                           map<FuncInfo *, map<string, SgSymbol *>> &inserted_arrays)
+{
+    auto common_block_name = base_name + "_merge_r";
+    auto array_name = base_name;
+
+    for (const auto &by_file : allFuncInfo)
+    {
+        for (auto *func_info : by_file.second)
+        {
+            if (func_info->isMain)
+            {
+                insertDeclIfNeeded(
+                    array_name,
+                    common_block_name,
+                    example_array,
+                    func_info,
+                    inserted_arrays);
+            }
+        }
+    }
+
+    return std::make_pair(array_name, common_block_name);
+}
+
+static void replaceArrayRec(SgExpression *e,
+                            const set<string> &arrays_to_replace,
+                            SgSymbol **func_symbol_hint,
+                            const pair<string, string> &replace_by,
+                            DIST::Array *example_array,
+                            FuncInfo *func,
+                            map<FuncInfo *, map<string, SgSymbol *>> &inserted_arrays)
+{
+    if (!e)
+        return;
+
+    if (isArrayRef(e) && arrays_to_replace.find(e->symbol()->identifier()) != arrays_to_replace.end())
+    {
+        if (!(*func_symbol_hint))
+        {
+            *func_symbol_hint = insertDeclIfNeeded(
+                replace_by.first, replace_by.second,
+                example_array,
+                func,
+                inserted_arrays);
+        }
+
+        e->setSymbol(*func_symbol_hint);
+    }
+
+    replaceArrayRec(
+        e->lhs(),
+        arrays_to_replace,
+        func_symbol_hint,
+        replace_by,
+        example_array,
+        func,
+        inserted_arrays);
+
+    replaceArrayRec(
+        e->rhs(),
+        arrays_to_replace,
+        func_symbol_hint,
+        replace_by,
+        example_array,
+        func,
+        inserted_arrays);
+}
+
+static void replaceRegion(SgStatement* st, const map<string, string> &new_region_mapping)
+{
+    if (!st)
+        return;
+
+    if(isSPF_stat(st) && st->variant() == SPF_PARALLEL_REG_DIR)
+    {
+        auto it = new_region_mapping.find(st->symbol()->identifier());
+
+        if (it != new_region_mapping.end())
+            st->setSymbol(*(new SgSymbol(CONST_NAME, it->second.c_str())));
+    }
+}
+
+void mergeRegions(vector<ParallelRegion *> &regions, const map<string, vector<FuncInfo *>> &allFuncInfo)
+{
+    for (const auto *region : regions)
+    {
+        __spf_print(1, "region %s\n", region->GetName().c_str());
+
+        const auto &dirs = region->GetDataDir();
+
+        __spf_print(1, "  distr rules: %d\n", dirs.distrRules.size());
+
+        const auto &currentVariant = region->GetCurrentVariant();
+
+        int distr_idx = 0;
+        for (const auto &distr : dirs.distrRules)
+        {
+            const auto &dist_rule = distr.second.back().distRule;
+
+            string sizes;
+            for (const auto &p : distr.first->GetSizes())
+            {
+                if (!sizes.empty())
+                    sizes.push_back(',');
+
+                sizes += std::to_string(p.first) + ":" + std::to_string(p.second);
+            }
+
+            __spf_print(1, "      DIST %s(%s)", distr.first->GetName().c_str(), sizes.c_str());
+            for (const auto &dim : dist_rule)
+                __spf_print(1, " %c", dim == dist::BLOCK ? 'B' : '*');
+
+            __spf_print(1, "\n");
+            distr_idx++;
+        }
+
+        __spf_print(1, "  align rules: %d\n", dirs.alignRules.size());
+
+        for (const auto &align : dirs.alignRules)
+        {
+            string sub_a, sub_b;
+
+            int i = 0;
+            for (const auto coefs : align.alignRule)
+            {
+                if (!sub_a.empty())
+                    sub_a.push_back(',');
+
+                sub_a += std::to_string(coefs.first) + "*i" +
+                         std::to_string(i) + "+" + std::to_string(coefs.second);
+
+                i++;
+            }
+
+            for (const auto coefs : align.alignRuleWith)
+            {
+                if (!sub_b.empty())
+                    sub_b.push_back(',');
+
+                sub_b += std::to_string(coefs.second.first) + "*i" +
+                         std::to_string(coefs.first) + "+" + std::to_string(coefs.second.second);
+            }
+
+            __spf_print(1, "      ALIGN %s(%s) WITH %s(%s)\n",
+                        align.alignArray->GetName().c_str(), sub_a.c_str(),
+                        align.alignWith->GetName().c_str(), sub_b.c_str());
+        }
+    }
+
+    // parse directives
+
+    // new array name -> current arrays
+    map<string, set<DIST::Array *>> arrays_to_merge;
+    map<DIST::Array *, set<const AlignRule *>> array_alignment;
+
+    for (const auto &by_file : allFuncInfo)
+    {
+        const auto current_file_name = by_file.first;
+
+        if (SgFile::switchToFile(current_file_name) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        for (auto *func_info : by_file.second)
+        {
+            SgStatement *curr_stmt = func_info->funcPointer;
+            if (!curr_stmt)
+                continue;
+
+            auto *stmt_end = curr_stmt->lastDeclaration();
+            if (!stmt_end)
+                continue;
+
+            stmt_end = stmt_end->lexNext();
+
+            for (; curr_stmt && curr_stmt != stmt_end; curr_stmt = curr_stmt->lexNext())
+            {
+                if (curr_stmt->comments())
+                {
+                    vector<pair<string, string>> parsed_mapping;
+                    parseMergeDirective(curr_stmt->comments(), parsed_mapping);
+
+                    for (const auto &p : parsed_mapping)
+                    {
+                        auto *found_array = getArrayFromDeclarated(curr_stmt, p.first);
+                        if (found_array)
+                        {
+                            arrays_to_merge[p.second].insert(found_array);
+                            array_alignment[found_array] = {};
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // find alignment rules for array
+
+    for (const auto *region : regions)
+    {
+        const auto &dirs = region->GetDataDir();
+
+        for (const auto &align : dirs.alignRules)
+        {
+            auto it = array_alignment.find(align.alignArray);
+
+            if (it != array_alignment.end())
+                it->second.insert(&align);
+        }
+    }
+
+    // old region -> new region
+    map<string, string> new_region_mapping;
+
+    // new array -> new region
+    map<string, string> arrays_new_region_mapping;
+    vector<string> created_region_names;
+
+    for (const auto &by_new_array : arrays_to_merge)
+    {
+        string new_region_name;
+        for (auto *current_array : by_new_array.second)
+        {
+            auto current_array_region = getNonDefaultRegion(current_array);
+            auto it = new_region_mapping.find(current_array_region);
+            if (it != new_region_mapping.end())
+            {
+                if (new_region_name.empty())
+                    new_region_name = it->second;
+                else if (new_region_name != it->second)
+                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+            }
+        }
+
+        if (new_region_name.empty())
+        {
+            new_region_name = "merged_reg_" + std::to_string(created_region_names.size());
+            created_region_names.push_back(new_region_name);
+        }
+
+        for (auto *current_array : by_new_array.second)
+        {
+            auto current_array_region = getNonDefaultRegion(current_array);
+            new_region_mapping[current_array_region] = new_region_name;
+        }
+
+        arrays_new_region_mapping[by_new_array.first] = new_region_name;
+    }
+
+    if (!checkSimilarTemplates(regions, new_region_mapping))
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    map<FuncInfo *, map<string, SgSymbol *>> inserted_arrays;
+
+    for (const auto &by_dest_array : arrays_to_merge)
+    {
+        const auto &copy_arrays = by_dest_array.second;
+
+        if (copy_arrays.empty())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        auto *first_element = *copy_arrays.begin();
+        auto first_elem_rules_it = array_alignment.find(first_element);
+
+        if (first_elem_rules_it == array_alignment.end())
+            continue;
+
+        const auto &first_elem_rules = first_elem_rules_it->second;
+
+        for (auto *array_to_merge : copy_arrays)
+        {
+            auto array_rules_it = array_alignment.find(array_to_merge);
+
+            if (array_rules_it == array_alignment.end())
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            const auto &array_rules = array_rules_it->second;
+
+            if (!hasSameSizes(array_to_merge, first_element) || !hasSameAlignment(first_elem_rules, array_rules))
+            {
+                __spf_print(1, "Arrays %s and %s has different sizes or align rules\n",
+                            array_to_merge->GetName().c_str(),
+                            first_element->GetName().c_str());
+
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+            }
+        }
+
+        __spf_print(1, "merge into %s (%s):\n", by_dest_array.first.c_str(), arrays_new_region_mapping[by_dest_array.first].c_str());
+        for (auto *array_to_merge : copy_arrays)
+            __spf_print(1, "%s\n", array_to_merge->GetName().c_str());
+
+        auto created_array_info = createNewArray(first_element, by_dest_array.first, allFuncInfo, inserted_arrays);
+
+        set<string> arrays_to_replace;
+        for (auto *array_to_merge : copy_arrays)
+            arrays_to_replace.insert(array_to_merge->GetShortName());
+
+        for (const auto &by_file : allFuncInfo)
+        {
+            if (SgFile::switchToFile(by_file.first) == -1)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            for (auto *func_info : by_file.second)
+            {
+                SgSymbol *func_symbol_hint = nullptr;
+                SgStatement *st = func_info->funcPointer;
+
+                auto *func_end = st->lastNodeOfStmt();
+
+                st = st->lexNext();
+
+                while (st && !isSgExecutableStatement(st) && st != func_end)
+                    st = st->lexNext();
+
+                while (st && st != func_end)
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        replaceArrayRec(
+                            st->expr(i),
+                            arrays_to_replace,
+                            &func_symbol_hint,
+                            created_array_info,
+                            first_element,
+                            func_info,
+                            inserted_arrays);
+                    }
+
+                    replaceRegion(st, new_region_mapping);
+
+                    st = st->lexNext();
+                }
+            }
+        }
+    }
+}

src/ParallelizationRegions/merge_regions.h

@@ -0,0 +1,8 @@
+#include "../GraphCall/graph_calls.h"
+#include "ParRegions.h"
+
+#include <string>
+#include <vector>
+#include <map>
+
+void mergeRegions(std::vector<ParallelRegion*> &regions, const std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo);

src/ParallelizationRegions/resolve_par_reg_conflicts.cpp

@@ -19,6 +19,7 @@
 #include "SgUtils.h"
 #include "expr_transform.h"
 #include "FunctionPurifying/function_purifying.h"
+#include "uniq_name_creator.h"
 
 using std::map;
 using std::pair;
@@ -71,7 +72,7 @@ static bool isSPF_reg(SgStatement *st)
     return st->variant() == SPF_PARALLEL_REG_DIR || st->variant() == SPF_END_PARALLEL_REG_DIR;
 }
 
-static const vector<const Variable*> getArraySynonyms(DIST::Array *array)
+const vector<const Variable*> getArraySynonyms(DIST::Array *array)
 {
     auto arrayBlock = allUsedCommonArrays.find(array);
     if (arrayBlock == allUsedCommonArrays.end())
@@ -127,15 +128,16 @@ static string getStringDeclaration(SgSymbol *symb)
     return decl;
 }
 
-static void insertStringDeclarations(SgStatement *insertPlace, DIST::Array *array)
+static void insertStringDeclarations(SgStatement *insertPlace, DIST::Array *array, UniqueNameCreator& unique_name_creator)
 {
     auto varsOnPos = getArraySynonyms(array);
     if (varsOnPos.size() && varsOnPos[0]->getName() == array->GetShortName())
     {
+        string newArrName, commName;
+        unique_name_creator.GetUniqueName(array, newArrName, commName);
         SgSymbol *varSymb = varsOnPos[0]->getSymbol();
         string varName = varSymb->identifier();
-        string newName = varName + "_c";
-        varSymb->changeName(newName.c_str());
+        varSymb->changeName(newArrName.c_str());
         string decl = getStringDeclaration(varsOnPos[0]->getSymbol());
         varSymb->changeName(varName.c_str());
         insertPlace->addComment(decl.c_str());
@@ -662,12 +664,11 @@ static void replaceFuncCalls(const ParallelRegionLines &lines, const map<string,
 static map<string, map<DIST::Array*, SgStatement*>> createdCommonBlocks; // file -> array -> new common statement
 static map<string, map<DIST::Array*, pair<SgSymbol*, SgSymbol*>>> createdCommonArrays; // file -> array -> (orig, copy)
 
-static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array)
+static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array, UniqueNameCreator& unique_name_creator)
 {
-    auto varsOnPos = getArraySynonyms(array);
-    if (!varsOnPos.size())
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    string newArrName, commBlockName;
 
+    unique_name_creator.GetUniqueName(array, newArrName, commBlockName);
     string fileName = file->filename();
 
     if (SgFile::switchToFile(fileName) != -1)
@@ -683,7 +684,6 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array)
             // creating new common-block statement
             //TODO: consistence with declaration
             //string commBlockName = checkSymbNameAndCorrect(array->GetShortName() + "_r");
-            string commBlockName = array->GetShortName() + "_r";
             SgStatement *commDecl = new SgStatement(COMM_STAT);
 
             SgSymbol *commSymb = new SgSymbol(VARIABLE_NAME, commBlockName.c_str());
@@ -705,7 +705,6 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array)
             {
                 //TODO: consistence with declaration
                 //string newArrName = checkSymbNameAndCorrect(varsOnPos[0]->getName() + "_c");
-                string newArrName = varsOnPos[0]->getName() + "_c";
 
                 newArrSymb = new SgSymbol(VARIABLE_NAME, newArrName.c_str(), file->firstStatement());
                 SgType *type = new SgType(T_ARRAY);
@@ -751,7 +750,7 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array)
 // func -> arrays; funcs where new common statement inserted
 static map<FuncInfo*, set<DIST::Array*>> insertedCommonBlocks;
 
-static void insertCommonBlock(FuncInfo *func, DIST::Array *array)
+static void insertCommonBlock(FuncInfo *func, DIST::Array *array, UniqueNameCreator& unique_name_creator)
 {
     SgFile *file = func->funcPointer->GetOriginal()->getFile();
     SgStatement *insertPlace = NULL;
@@ -767,7 +766,7 @@ static void insertCommonBlock(FuncInfo *func, DIST::Array *array)
     if (!insertPlace)
         insertPlace = func->funcPointer->GetOriginal();
 
-    SgStatement *commDecl = createCommonBlock(file, array);
+    SgStatement *commDecl = createCommonBlock(file, array, unique_name_creator);
     SgStatement *copyDecl = commDecl->copyPtr();
 
     auto st = insertPlace->controlParent();
@@ -779,7 +778,7 @@ static void insertCommonBlock(FuncInfo *func, DIST::Array *array)
     insertPlace->lexNext()->setlineNumber(nextLine);
 
     // create declaration via comment
-    insertStringDeclarations(insertPlace->lexNext(), array);
+    insertStringDeclarations(insertPlace->lexNext(), array, unique_name_creator);
 }
 
 // file -> lines -> arrays; lines where arrays copying is inserted
@@ -1097,6 +1096,7 @@ pair<SgSymbol*, SgSymbol*> copyArray(const pair<string, int> &place,
 static void copyFunction(ParallelRegion *region,
                          FuncInfo *func,
                          const map<string, FuncInfo*> &funcMap,
+                         UniqueNameCreator& unique_name_creator,
                          const string &suffix = "")
 {
     if (SgFile::switchToFile(func->fileName) != -1)
@@ -1146,14 +1146,14 @@ static void copyFunction(ParallelRegion *region,
             if (origStat->variant() == COMM_STAT)
             {
                 for (auto &arrayBlock : allUsedCommonArrays)
-                    createCommonBlock(file, arrayBlock.first);
+                    createCommonBlock(file, arrayBlock.first, unique_name_creator);
 
                 auto usedCommonArrays = region->GetUsedCommonArrays().find(func);
                 if (usedCommonArrays != region->GetUsedCommonArrays().end())
                 {
                     for (auto &arrayLines : usedCommonArrays->second)
                     {
-                        SgStatement *commDecl = createCommonBlock(file, arrayLines.first);
+                        SgStatement *commDecl = createCommonBlock(file, arrayLines.first, unique_name_creator);
                         SgStatement *copyDecl = commDecl->copyPtr();
 
                         while (!isSgExecutableStatement(copyStat) || isSPF_stat(copyStat))
@@ -1163,7 +1163,7 @@ static void copyFunction(ParallelRegion *region,
                         copyStat->insertStmtAfter(*copyDecl, *copyStat->controlParent());
 
                         // making declaration of new common array symbol via comment through files
-                        insertStringDeclarations(copyStat->lexNext(), arrayLines.first);
+                        insertStringDeclarations(copyStat->lexNext(), arrayLines.first, unique_name_creator);
                     }
 
                     auto it = createdCommonArrays.find(file->filename());
@@ -1619,6 +1619,8 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
     map<string, FuncInfo*> funcMap;
     createMapOfFunc(allFuncInfo, funcMap);
 
+    UniqueNameCreator unique_name_creator(allFuncInfo);
+
     if (sharedMemoryParallelization == 0)
     {
         map<string, map<int, set<string>>> copied;
@@ -1688,7 +1690,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                                 if (itt == it->second.end() && arrayBlock.first->GetShortName() == varsOnPos[0]->getName())
                                 {
                                     // need to insert common-block
-                                    insertCommonBlock(func, arrayBlock.first);
+                                    insertCommonBlock(func, arrayBlock.first, unique_name_creator);
                                     it->second.insert(arrayBlock.first);
                                 }
                             }
@@ -1781,7 +1783,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                         if (itt == it->second.end() && arrayBlock.first->GetShortName() == varsOnPos[0]->getName())
                         {
                             // need to insert common-block
-                            insertCommonBlock(func, arrayBlock.first);
+                            insertCommonBlock(func, arrayBlock.first, unique_name_creator);
                             it->second.insert(arrayBlock.first);
                         }
                     }
@@ -1813,7 +1815,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                     if (usedCommonArrays != region->GetUsedCommonArrays().end())
                     {
                         for (auto &arrayBlock : allUsedCommonArrays)
-                            createCommonBlock(file, arrayBlock.first);
+                            createCommonBlock(file, arrayBlock.first, unique_name_creator);
 
                         auto it = insertedCommonBlocks.find(func);
                         if (it == insertedCommonBlocks.end())
@@ -1825,7 +1827,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                             if (itt == it->second.end())
                             {
                                 // need to insert common-block
-                                insertCommonBlock(func, arrayLines.first);
+                                insertCommonBlock(func, arrayLines.first, unique_name_creator);
                                 it->second.insert(arrayLines.first);
 
                                 // replace common arrays to new common arrays in executable code section
@@ -1858,7 +1860,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                     // need copy function for every region, the exeption is defalut region
                     for (auto &regionId : func->callRegions)
                         if (regionId)
-                            copyFunction(getRegionById(regions, regionId), func, funcMap, string("_r") + to_string(regionId));
+                            copyFunction(getRegionById(regions, regionId), func, funcMap, unique_name_creator, string("_r") + to_string(regionId));
                 }
             }
         }

src/ParallelizationRegions/resolve_par_reg_conflicts.h

@@ -22,3 +22,5 @@ std::pair<SgSymbol*, SgSymbol*> copyArray(const std::pair<std::string, int>& pla
                                           std::string& filename,
                                           std::map<std::string, std::map<int, std::set<std::string>>>& newDeclsToInclude,
                                           std::map<std::string, std::map<int, std::set<std::string>>>& copied);
+
+const std::vector<const Variable*> getArraySynonyms(DIST::Array* array);

src/ParallelizationRegions/uniq_name_creator.cpp

@@ -0,0 +1,98 @@
+#include "leak_detector.h"
+
+#include <set>
+#include <map>
+#include <string>
+
+#include "SgUtils.h"
+#include "uniq_name_creator.h"
+#include "resolve_par_reg_conflicts.h"
+
+using namespace::std;
+
+static const string COMMON_ARRAY_SUFFIX = "_c";
+static const string COMMON_BLOCK_SUFFIX = "_r";
+
+void UniqueNameCreator::GetSymbolsRec(SgExpression* exp, set<string>& add_to)
+{
+    if (!exp)
+        return;
+
+    if (isArrayRef(exp) && exp->symbol() && exp->symbol()->identifier())
+        add_to.emplace(exp->symbol()->identifier());
+
+    GetSymbolsRec(exp->lhs(), add_to);
+    GetSymbolsRec(exp->rhs(), add_to);
+}
+
+void UniqueNameCreator::FillDeclarations()
+{
+    allDeclarations.clear();
+    auto* file_before = current_file;
+
+    for (const auto& by_file : funcInfo)
+    {
+        if (SgFile::switchToFile(by_file.first) != -1)
+        {
+            for (const auto* by_func : by_file.second)
+            {
+                SgStatement* st = by_func->funcPointer;
+
+                if (st)
+                    st = st->lexNext();
+
+                while (st)
+                {
+                    for (int i = 0; i < 3; i++)
+                        GetSymbolsRec(st->expr(i), allDeclarations);
+
+                    st = st->lexNext();
+                }
+            }
+        }
+        else
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    SgFile::switchToFile(file_before->filename());
+    declarationsAnalyzed = true;
+}
+
+void UniqueNameCreator::GetUniqueName(DIST::Array* array, string& array_name, string& common_block_name)
+{
+    auto varsOnPos = getArraySynonyms(array);
+    if (!varsOnPos.size())
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    auto array_plain_name = varsOnPos[0]->getName();
+
+    auto it = generatedNames.find(array);
+    if (it != generatedNames.end())
+    {
+        array_name.assign(it->second.first);
+        common_block_name.assign(it->second.second);
+        return;
+    }
+
+    if (!declarationsAnalyzed)
+        FillDeclarations();
+
+    int v = 1;
+    auto created_array_name = array_plain_name + COMMON_ARRAY_SUFFIX;
+    auto created_common_name = array_plain_name + COMMON_BLOCK_SUFFIX;
+
+    while (allDeclarations.find(created_array_name) != allDeclarations.end() ||
+        allDeclarations.find(created_common_name) != allDeclarations.end())
+    {
+        created_array_name = array_plain_name + "_v" + std::to_string(v) + COMMON_ARRAY_SUFFIX;
+        created_common_name = array_plain_name + "_v" + std::to_string(v) + COMMON_BLOCK_SUFFIX;
+        v++;
+    }
+
+    allDeclarations.insert(created_array_name);
+    allDeclarations.insert(created_common_name);
+    generatedNames.emplace(array, std::make_pair(created_array_name, created_common_name));
+
+    array_name.assign(created_array_name);
+    common_block_name.assign(created_common_name);
+}

src/ParallelizationRegions/uniq_name_creator.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <map>
+#include <set>
+#include <string>
+#include "GraphCall/graph_calls.h"
+
+class UniqueNameCreator
+{
+    std::map<std::string, std::vector<FuncInfo*>> funcInfo;
+    std::set<std::string> allDeclarations;
+    bool declarationsAnalyzed = false;
+    std::map<const DIST::Array*, std::pair<std::string, std::string>> generatedNames;
+
+    static void GetSymbolsRec(SgExpression* exp, std::set<std::string>& add_to);
+    void FillDeclarations();
+
+public:
+    UniqueNameCreator(const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo)
+    {
+        declarationsAnalyzed = false;
+        funcInfo = allFuncInfo;
+    }
+
+    void GetUniqueName(DIST::Array* array, std::string& array_name, std::string& common_block_name);
+};

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -1,28 +1,37 @@
 #include <algorithm>
 #include <map>
-#include <unordered_set>
-#include <unordered_map>
+#include <set>
 #include <vector>
 #include <queue>
 #include <numeric>
 #include <iostream>
 
+#include "CFGraph/CFGraph.h"
+#include "Distribution/Array.h"
+#include "errors.h"
+#include "graph_loops.h"
 #include "private_arrays_search.h"
 #include "range_structures.h"
 #include "region.h"
 #include "SgUtils.h"
-#include "graph_loops.h"
-#include "CFGraph/CFGraph.h"
+#include "Transformations/ArrayConstantPropagation/propagation.h"
 #include "utils.h"
+#include "Utils/AstWrapper.h"
 
 using namespace std;
 
-static unordered_set<Region*> collapsed;
+extern map<string, map<SgStatement*, SgStatement*>> expToChange;
+extern map<string, map<SgStatement*, vector<SgExpression*>>> oldExpressionsInFile;
+extern map<string, vector<Messages>> SPF_messages;
+extern set<SgStatement*> statementsToRemove;
+extern std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>> declaredArrays;
+
+static set<Region*> collapsed;
 
 static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
 {
     ArrayAccessingIndexes resultContainer;
-    unordered_set<string> toRemove;
+    set<string> toRemove;
 
     for (auto& [arrayName, accessingSet] : container)
     {
@@ -33,10 +42,9 @@ static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
                 points.push_back(arrayPoint);
         }
 
-        if (points.size() < accessingSet.GetElements().size() && !points.empty())
+        if (!points.empty())
             resultContainer[arrayName] = points;
-
-        if (points.empty())
+        else
             toRemove.insert(arrayName);
     }
 
@@ -53,6 +61,7 @@ static void Collapse(Region* region)
         return;
 
     bool firstRegion = true;
+    int blockCount = 0;
     for (Region* basickBlock : region->getBasickBlocks())
     {
         if (basickBlock->getNextRegions().empty())
@@ -64,7 +73,7 @@ static void Collapse(Region* region)
             }
             else
             {
-                unordered_set<string> toErease;
+                set<string> toErease;
                 for (auto& [arrayName, arrayRanges] : region->array_def)
                 {
                     if (basickBlock->array_out.find(arrayName) != basickBlock->array_out.end())
@@ -84,11 +93,15 @@ static void Collapse(Region* region)
     RegionInstruction instruction;
     instruction.def = move(region->array_def);
 
-
+    ArrayAccessingIndexes recursivePriv;
     for (auto& byBlock : region->getBasickBlocks())
     {
+        if (!byBlock->array_priv.empty())
+            recursivePriv = byBlock->array_priv;
         for (auto& instruction : byBlock->instructions)
         {
+            if (!instruction.def.empty() || !instruction.use.empty())
+                blockCount++;
             for (auto& [arrayName, _] : instruction.use)
             {
                 AccessingSet diff = instruction.use[arrayName].Diff(instruction.in[arrayName]);
@@ -120,67 +133,8 @@ static void Collapse(Region* region)
         region->addNextRegion(nextBlock);
     }
     region->instructions.push_back(instruction);
-
-}
-
-static void SolveDataFlowIteratively(Region* DFG)
-{
-    auto blocks = DFG->getBasickBlocks();
-    std::unordered_set<Region*> worklist(blocks.begin(), blocks.end());
-    do
-    {
-        Region* b = *worklist.begin();
-        ArrayAccessingIndexes newIn;
-        bool flagFirst = true;
-        for (Region* prevBlock : b->getPrevRegions())
-        {
-            if (flagFirst)
-            {
-                newIn = prevBlock->array_out;
-                flagFirst = false;
-            }
-            else
-            {
-                if (prevBlock->array_out.empty())
-                {
-                    newIn.clear();
-                    break;
-                }
-
-                for (const auto& [arrayName, accessSet] : prevBlock->array_out)
-                {
-                    if (newIn.find(arrayName) != newIn.end())
-                        newIn[arrayName] = newIn[arrayName].Intersect(accessSet);
-                    else
-                        newIn[arrayName] = AccessingSet();
-                }
-            }
-        }
-
-        b->array_in = move(newIn);
-        ArrayAccessingIndexes newOut;
-
-        if (b->array_def.empty())
-            newOut = b->array_in;
-        else if (b->array_in.empty())
-            newOut = b->array_def;
-        else
-        {
-            for (auto& [arrayName, accessSet] : b->array_def)
-            {
-                if (newOut.find(arrayName) != newOut.end())
-                    newOut[arrayName] = b->array_def[arrayName].Union(b->array_in[arrayName]);
-                else
-                    newOut[arrayName] = accessSet;
-            }
-        }
-
-        /* can not differ */
-        if (newOut != b->array_out)
-            b->array_out = newOut;
-        else
-            worklist.erase(b);
-    } while (!worklist.empty());
+    if (blockCount == 1 && !recursivePriv.empty())
+        region->array_priv = move(recursivePriv);
 }
 
 static void SolveForBasickBlock(Region* block)
@@ -281,7 +235,6 @@ static void SolveDataFlow(Region* DFG)
 
 static bool getArrayDeclaredDimensions(SgArrayRefExp* arrayRef, vector<uint64_t>& declaredDims)
 {
-    declaredDims.clear();
     if (!arrayRef || !arrayRef->symbol() || !isSgArrayType(arrayRef->symbol()->type()))
         return false;
     SgArrayType* arrayType = (SgArrayType*)arrayRef->symbol()->type();
@@ -290,42 +243,82 @@ static bool getArrayDeclaredDimensions(SgArrayRefExp* arrayRef, vector<uint64_t>
     {
         SgExpression* sizeExpr = arrayType->sizeInDim(i);
         SgConstantSymb* constValSymb = isSgConstantSymb(sizeExpr->symbol());
-        string strDimLength;
+        SgSubscriptExp* subscriptExpr = isSgSubscriptExp(sizeExpr);
+        uint64_t dimLength;
         if (sizeExpr && sizeExpr->variant() == INT_VAL)
-            strDimLength = sizeExpr->unparse();
+            dimLength = stol(sizeExpr->unparse());
         else if (constValSymb)
-            strDimLength = constValSymb->constantValue()->unparse();
+            dimLength = stol(constValSymb->constantValue()->unparse());
+        else if (subscriptExpr)
+        {
+            dimLength = stol(subscriptExpr->rhs()->unparse()) - stol(subscriptExpr->lhs()->unparse());
+        }
         else
             return false;
 
-        if (strDimLength == "0")
+        if (dimLength == 0)
             return false;
-        declaredDims.push_back((uint64_t)stoi(strDimLength));
+        declaredDims.push_back(dimLength);
     }
     return true;
 }
 
+static DIST::Array* getDistArrayBySymbol(SgSymbol* arrSym)
+{
+    if (!arrSym)
+        return nullptr;
+    for (auto& [key, val] : declaredArrays)
+    {
+        DIST::Array* distArr = val.first;
+        if (!distArr)
+            continue;
+        Symbol* declSym = distArr->GetDeclSymbol();
+        if (!declSym)
+            continue;
+        SgSymbol* sgDecl = declSym->GetOriginal();
+        if (sgDecl && isEqSymbols(sgDecl, arrSym))
+            return distArr;
+    }
+    return nullptr;
+}
+
 static bool CheckDimensionLength(const AccessingSet& array)
 {
     if (array.GetElements().empty())
         return false;
     size_t dimCount = array.GetElements()[0].size();
     SgArrayRefExp* arrayRef = array.GetElements()[0][0].array;
-    if (!arrayRef)
-        return false;
-    vector<uint64_t> declaredDims(dimCount);
-    if (!getArrayDeclaredDimensions(arrayRef, declaredDims))
+    if (!arrayRef || !arrayRef->symbol())
         return false;
+
+    vector<uint64_t> declaredDims;
+    declaredDims.reserve(dimCount);
+
+    DIST::Array* distArr = getDistArrayBySymbol(arrayRef->symbol());
+    if (distArr && distArr->GetDimSize() == (int)dimCount)
+    {
+        const auto& sizes = distArr->GetSizes();
+        bool valid = true;
+        for (size_t i = 0; i < dimCount && valid; ++i)
+        {
+            int lo = sizes[i].first;
+            int hi = sizes[i].second;
+            if (lo > hi)
+                valid = false;
+            else
+                declaredDims.push_back((uint64_t)(hi - lo + 1));
+        }
+        if (valid && declaredDims.size() == dimCount)
+        {
             vector<ArrayDimension> testArray(dimCount);
             for (size_t i = 0; i < dimCount; i++)
-    {
                 testArray[i] = { 1, 1, declaredDims[i], nullptr };
+            return AccessingSet({ testArray }).Diff(array).GetElements().empty();
         }
-    AccessingSet diff = AccessingSet({ testArray }).Diff(array);
-
-    return diff.GetElements().empty();
     }
 
+    return false;
+}
 
 static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
 {
@@ -334,10 +327,26 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
     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& [arrayName, accessingSet] : privates)
     {
+        int idx = arrayName.find('%');
+        string name = (idx != -1 ? arrayName.substr(idx+1) : arrayName);
         if (!CheckDimensionLength(accessingSet))
+        {
+            wstring messageE, messageR;
+            __spf_printToLongBuf(
+                messageE,
+                L"Private array '%s' was skipped because dimension lengths are inconsistent",
+                to_wstring(name).c_str());
+            __spf_printToLongBuf(
+                messageR,
+                R159,
+                to_wstring("array " + name + " has inconsistent dimension lengths").c_str());
+            SPF_messages[loop->loop->fileName()].push_back(
+                Messages(WARR, loop->loop->lineNumber(), messageR, messageE, 1029));
             continue;
+        }
+
         for (const auto& arrayElement : accessingSet.GetElements())
         {
             if (arrayElement.empty())
@@ -372,7 +381,7 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes&
     }
 }
 
-void FindPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, set<SgStatement*>& insertedPrivates)
+void findPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, set<SgStatement*>& insertedPrivates)
 {
     map<LoopGraph*, ArrayAccessingIndexes> result;
     for (const auto& [fileName, loops] : loopGraph)
@@ -391,7 +400,15 @@ void FindPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*
             {
                 if (funcInfo->fileName == fileName && funcInfo->funcPointer->GetOriginal() == search_func)
                 {
-                    Region* loopRegion = new Region(loop, blocks);
+                    Region* loopRegion;
+                    try
+                    {
+                        loopRegion = new Region(loop, blocks);
+                    }
+                    catch (...)
+                    {
+                        continue;
+                    }
                     if (loopRegion->getBasickBlocks().size() <= 1)
                     {
                         delete(loopRegion);
@@ -403,9 +420,32 @@ void FindPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*
                     delete(loopRegion);
                 }
             }
-
             if (result.find(loop) != result.end() && !result[loop].empty())
                 AddPrivateArraysToLoop(loop, result[loop], insertedPrivates);
         }
     }
+
+    for (auto& [filename, statements] : expToChange)
+    {
+        if (SgFile::switchToFile(filename) == -1)
+            continue;
+        for (auto& [statement, statementCopy] : statements) 
+        {
+            if (statement && statementCopy)
+            {
+                oldExpressionsInFile[filename][statement].resize(3);
+                for (int i = 0; i < 3; i++)
+                {
+                    oldExpressionsInFile[filename][statement][i] = statementCopy->expr(i);
+                }
+
+            }
+        }
+    }
+
+    for (SgStatement* st : statementsToRemove)
+    {
+        SgFile::switchToFile(st->fileName());
+        st->deleteStmt();
+    }
 }

src/PrivateAnalyzer/private_arrays_search.h

@@ -3,11 +3,10 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <unordered_set>
+#include <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::pair<SAPFOR::BasicBlock*, std::unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector<SAPFOR::BasicBlock*> blocks);
+void findPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, std::set<SgStatement*>& insertedPrivates);

src/PrivateAnalyzer/range_structures.cpp

@@ -1,6 +1,6 @@
 #include <vector>
 #include <map>
-#include <unordered_set>
+#include <set>
 #include <string>
 
 #include "utils.h"

src/PrivateAnalyzer/range_structures.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <map>
-#include <unordered_set>
+#include <set>
 #include <string>
 #include <cstdint>
 

src/PrivateAnalyzer/region.cpp

@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <vector>
 #include <map>
-#include <unordered_set>
-#include <unordered_map>
+#include <set>
+#include <map>
 #include <string>
 #include <numeric>
 #include <iostream>
@@ -23,9 +23,9 @@ static bool isParentStmt(SgStatement* stmt, SgStatement* parent)
 }
 
 /*returns head block and loop*/
-pair<SAPFOR::BasicBlock*, unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const vector<SAPFOR::BasicBlock*> blocks)
+pair<SAPFOR::BasicBlock*, set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const vector<SAPFOR::BasicBlock*> blocks)
 {
-    unordered_set<SAPFOR::BasicBlock*> block_loop;
+    set<SAPFOR::BasicBlock*> block_loop;
     SAPFOR::BasicBlock* head_block = nullptr;
     auto loop_operator = loop->loop->GetOriginal();
     for (const auto& block : blocks)
@@ -51,16 +51,16 @@ pair<SAPFOR::BasicBlock*, unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForL
     return { head_block, block_loop };
 }
 
-static void BuildLoopIndex(map<string, LoopGraph*>& loopForIndex, LoopGraph* loop) {
+static void BuildLoopIndex(map<SgStatement*, LoopGraph*>& loopForIndex, LoopGraph* loop) {
     string index = loop->loopSymbol();
-    loopForIndex[index] = loop;
+    loopForIndex[loop->loop->GetOriginal()] = loop;
 
     for (const auto& childLoop : loop->children)
         BuildLoopIndex(loopForIndex, childLoop);
 }
 
 static string FindIndexName(int pos, SAPFOR::BasicBlock* block, map<string, LoopGraph*>& loopForIndex) {
-    unordered_set<SAPFOR::Argument*> args = { block->getInstructions()[pos]->getInstruction()->getArg1() };
+    set<SAPFOR::Argument*> args = { block->getInstructions()[pos]->getInstruction()->getArg1() };
 
     for (int i = pos - 1; i >= 0; i--)
     {
@@ -95,7 +95,7 @@ static string FindIndexName(int pos, SAPFOR::BasicBlock* block, map<string, Loop
 
 static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAccessingIndexes& def, ArrayAccessingIndexes& use, Region* region) {
     auto instructions = block->getInstructions();
-    map<string, LoopGraph*> loopForIndex;
+    map<SgStatement*, LoopGraph*> loopForIndex;
     BuildLoopIndex(loopForIndex, loop);
     for (int i = 0; i < instructions.size(); i++)
     {
@@ -136,7 +136,6 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
             vector<SAPFOR::Argument*> index_vars;
             vector<int> refPos;
             string array_name = instruction->getInstruction()->getArg1()->getValue();
-
             int j = i - 1;
             while (j >= 0 && instructions[j]->getInstruction()->getOperation() == SAPFOR::CFG_OP::REF)
             {
@@ -150,6 +149,8 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
             vector<ArrayDimension> accessPoint(n);
 
             auto* ref = isSgArrayRefExp(instruction->getInstruction()->getExpression());
+            if (!ref)
+                continue;
             int fillCount = 0;
 
             vector<pair<int, int>> coeffsForDims;
@@ -178,25 +179,16 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                     string name, full_name = var->getValue();
                     int pos = full_name.find('%');
                     LoopGraph* currentLoop;
-                    if (pos != -1)
-                    {
-                        name = full_name.substr(pos + 1);
-                        if (loopForIndex.find(name) != loopForIndex.end())
-                            currentLoop = loopForIndex[name];
-                        else
-                            return -1;
-                    }
-                    else
-                    {
-                        name = FindIndexName(currentVarPos, block, loopForIndex);
-                        if (name == "")
-                            return -1;
 
-                        if (loopForIndex.find(name) != loopForIndex.end())
-                            currentLoop = loopForIndex[name];
+                    auto serachInstr = instruction->getInstruction()->getOperator();
+                    while (serachInstr && serachInstr->variant() != FOR_NODE)
+                        serachInstr = serachInstr->controlParent();
+
+                    name = full_name.substr(pos + 1);
+                    if (loopForIndex.find(serachInstr) != loopForIndex.end())
+                        currentLoop = loopForIndex[serachInstr];
                     else
                         return -1;
-                    }
 
                     uint64_t start = coeffsForDims.back().second * currentLoop->startVal + coeffsForDims.back().first;
                     uint64_t step = currentLoop->stepVal;
@@ -204,7 +196,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                     current_dim = { start, step, iters, ref };
                 }
 
-                if (current_dim.start != 0 && current_dim.step != 0 && current_dim.tripCount != 0)
+                if (current_dim.step != 0 && current_dim.tripCount != 0)
                 {
                     accessPoint[n - index_vars.size()] = current_dim;
                     fillCount++;
@@ -241,7 +233,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
 
 }
 
-static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const unordered_set<SAPFOR::BasicBlock*>& blockSet, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const set<SAPFOR::BasicBlock*>& blockSet, map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
     {
@@ -257,26 +249,59 @@ static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const unordered_s
     }
 }
 
-static void DFS(Region* block, vector<Region*>& result, unordered_set<Region*> cycleBlocks)
+static bool DFS(Region* block,
+    vector<Region*>& result,
+    const set<Region*>& cycleBlocks,
+    map<Region*, int>& color)
 {
+    auto it = color.find(block);
+    if (it != color.end())
+    {
+        if (it->second == 0)
+            return false;
+        if (it->second == 1)
+            return true;
+    }
+    color[block] = 0;
     for (Region* nextBlock : block->getNextRegions())
     {
-        if (cycleBlocks.find(nextBlock) != cycleBlocks.end())
-            DFS(nextBlock, result, cycleBlocks);
+        if (cycleBlocks.find(nextBlock) == cycleBlocks.end())
+            continue;
+        if (!DFS(nextBlock, result, cycleBlocks, color))
+            return false;
     }
+    color[block] = 1;
     result.push_back(block);
+    return true;
 }
 
-void TopologySort(std::vector<Region*>& basikBlocks, Region* header)
+bool HasCycle(Region* block, const std::set<Region*>& cycleBlocks, std::set<Region*>& visitedBlocks)
 {
-    vector<Region*> result;
-    unordered_set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
-    DFS(header, result, cycleBlocks);
-    reverse(result.begin(), result.end());
-    basikBlocks = result;
+    return false;
+    if (visitedBlocks.find(block) != visitedBlocks.end())
+        return true;
+    visitedBlocks.insert(block);
+    for (Region* nextBlock : block->getNextRegions())
+    {
+        if (cycleBlocks.find(nextBlock) != cycleBlocks.end() && HasCycle(nextBlock, cycleBlocks, visitedBlocks))
+            return true;
+    }
+    return false;
 }
 
-static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const unordered_set<SAPFOR::BasicBlock*>& blockSet)
+bool TopologySort(std::vector<Region*>& basikBlocks, Region* header)
+{
+    set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
+    vector<Region*> result;
+    map<Region*, int> color;
+    if (!DFS(header, result, cycleBlocks, color))
+        return false;
+    reverse(result.begin(), result.end());
+    basikBlocks = move(result);
+    return true;
+}
+
+static void SetConnections(map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const set<SAPFOR::BasicBlock*>& blockSet)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
     {
@@ -290,7 +315,7 @@ static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegi
     }
 }
 
-static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     Region* region = new Region;
     auto [header, blockSet] = GetBasicBlocksForLoop(loop, Blocks);
@@ -313,14 +338,15 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
             continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    TopologySort(region->getBasickBlocks(), region->getHeader());
+    if (!TopologySort(region->getBasickBlocks(), region->getHeader()))
+        throw std::runtime_error("Unnoticed cycle");
     return region;
 }
 
 Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
 {
     auto [header, blockSet] = GetBasicBlocksForLoop(loop, Blocks);
-    unordered_map<SAPFOR::BasicBlock*, Region*> bbToRegion;
+    map<SAPFOR::BasicBlock*, Region*> bbToRegion;
     for (auto poiner : blockSet)
     {
         bbToRegion[poiner] = new Region(*poiner);
@@ -338,5 +364,6 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
             continue;
         subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
         }
-    TopologySort(basickBlocks, this->header);
+    if (!TopologySort(basickBlocks, this->header))
+        throw std::runtime_error("Unnoticed cycle");
 }

src/PrivateAnalyzer/region.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <map>
-#include <unordered_set>
+#include <set>
 #include <string>
 
 #include "graph_loops.h"
@@ -29,9 +29,9 @@ public:
 
     void addBasickBlocks(Region* region) { basickBlocks.push_back(region); }
 
-    const std::unordered_set<Region*>& getPrevRegions() { return prevRegions; }
+    const std::set<Region*>& getPrevRegions() { return prevRegions; }
 
-    std::unordered_set<Region*>& getNextRegions() { return nextRegions; }
+    std::set<Region*>& getNextRegions() { return nextRegions; }
 
     void removeNextRegion(Region* region)
     {
@@ -61,7 +61,7 @@ public:
         nextRegions.insert(source);
     }
 
-    std::unordered_set<Region*> getSubRegions() { return subRegions; }
+    std::set<Region*> getSubRegions() { return subRegions; }
 
     void addSubRegions(Region* region) { subRegions.insert(region); }
 
@@ -71,12 +71,14 @@ public:
 
 private:
     std::vector<Region*> basickBlocks;
-    std::unordered_set<Region*> subRegions;
+    std::set<Region*> subRegions;
     /*next Region which is BB for current BB Region*/
-    std::unordered_set<Region*> nextRegions;
+    std::set<Region*> nextRegions;
     /*prev Regions which is BBs for current BB Region*/
-    std::unordered_set<Region*> prevRegions;
+    std::set<Region*> prevRegions;
     Region* header;
 };
 
-void TopologySort(std::vector<Region*>& basikBlocks, Region* header);
+bool HasCycle(Region* block, const std::set<Region*>& cycleBlocks, std::set<Region*>& visitedBlocks);
+
+bool TopologySort(std::vector<Region*>& basikBlocks, Region* header);

src/Sapfor.cpp

@@ -1,4 +1,4 @@
-#include "Utils/leak_detector.h"
+#include "Utils/leak_detector.h"
 
 #pragma comment(linker, "/STACK:536870912") // 512 МБ
 
@@ -23,6 +23,7 @@
 #include "ParallelizationRegions/ParRegions_func.h"
 #include "ParallelizationRegions/resolve_par_reg_conflicts.h"
 #include "ParallelizationRegions/expand_extract_reg.h"
+#include "ParallelizationRegions/merge_regions.h"
 
 #include "Distribution/Distribution.h"
 #include "Distribution/GraphCSR.h"
@@ -741,7 +742,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         else if (curr_regime == LOOP_DATA_DEPENDENCIES)
             doDependenceAnalysisOnTheFullFile(file, 1, 1, 1);
         else if (curr_regime == REMOVE_DVM_DIRS || curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS || curr_regime == REMOVE_SPF_DIRS) {
-            bool removeDvm = (curr_regime == REMOVE_DVM_DIRS || curr_regime == REMOVE_DVM_DIRS);
+            bool removeDvm = (curr_regime == REMOVE_DVM_DIRS);
             bool removeSpf = (curr_regime == REMOVE_SPF_DIRS);
             bool toComment = (curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS);
             removeDvmSpfDirectives(file, removeDvm, removeSpf, toComment);
@@ -1264,6 +1265,8 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
 
         moveAllocatesInterproc(arrayLinksByFuncCalls);
 
+        propagateRegionInfo(declaredArrays, arrayLinksByFuncCalls, subs_parallelRegions);
+
         removeDistrStateFromDeadFunctions(allFuncInfo, declaredArrays);
         propagateArrayFlags(arrayLinksByFuncCalls, declaredArrays, SPF_messages);
     }
@@ -1681,31 +1684,12 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         findDeadFunctionsAndFillCalls(allFuncInfo_IR, SPF_messages, true);
     else if (curr_regime == GET_ALL_ARRAY_DECL)
     {
-        bool hasNonDefaultReg = false;
-        for (auto &elem : subs_parallelRegions)
-            if (elem->GetName() != "DEFAULT")
-                hasNonDefaultReg = true;
-
-        if (hasNonDefaultReg)
-        {
-            for (auto array : declaredArrays)
-            {
-                if (array.second.first->GetRegionsName().size() == 0)
-                    array.second.first->SetDistributeFlag(DIST::NO_DISTR);
-                else if (array.second.first->GetRegionsName().size() == 1)
-                {
-                    string regName = *array.second.first->GetRegionsName().begin();
-                    convertToLower(regName);
-                    if (regName == "default")
-                        array.second.first->SetDistributeFlag(DIST::NO_DISTR);
-                }
-            }
-        }
-
         if (ignoreArrayDistributeState) 
+        {
             for (auto array : declaredArrays)
                 array.second.first->SetDistributeFlag(DIST::NO_DISTR);
         }
+    }
     else if (curr_regime == GCOV_PARSER)
     {
         parseTimesDvmStatisticFile((consoleMode == 1) ? string("statistic.txt") : string(VISUALIZER_DATA_PATH) + "/statistic/statistic.txt", intervals);
@@ -1921,10 +1905,11 @@ 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);
-
+        findPrivateArrays(loopGraph, fullIR, insertedPrivates);
+    else if (curr_regime == MERGE_REGIONS)
+        mergeRegions(parallelRegions, allFuncInfo);
     else if (curr_regime == ARRAY_PROPAGATION)
-        ArrayConstantPropagation(project);
+        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.;
@@ -2379,16 +2364,27 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
     case FIX_COMMON_BLOCKS:
     case TEST_PASS:
     case SET_IMPLICIT_NONE:
+    case MERGE_REGIONS:
         runAnalysis(*project, curr_regime, false);
     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
             __spf_print(1, "can not run UNPARSE_FILE - folder name is null\n");
         break;
+    case FIND_PRIVATE_ARRAYS:
+        if (folderName)
+        {
+            //if (!insertedPrivates.empty())
+                runAnalysis(*project, UNPARSE_FILE, true, "", folderName);
+           /* else
+                __spf_print(1, "skip UNPARSE_FILE after FIND_PRIVATE_ARRAYS: no inserted directives\n");*/
+        }
+        else
+            __spf_print(1, "can not run UNPARSE_FILE - folder name is null\n");
+        break;
     case ADD_TEMPL_TO_USE_ONLY:
         runAnalysis(*project, curr_regime, false, "", folderName);
         break;

src/Sapfor.h

@@ -88,6 +88,8 @@ enum passes {
     REMOVE_DVM_INTERVALS,
     VERIFY_DVM_DIRS,
 
+    MERGE_REGIONS,
+
     REMOVE_DIST_ARRAYS_FROM_IO,
 
     SUBST_EXPR,
@@ -273,6 +275,7 @@ static void setPassValues()
     passNames[VERIFY_DVM_DIRS] = "VERIFY_DVM_DIRS";
     passNames[REMOVE_DVM_DIRS_TO_COMMENTS] = "REMOVE_DVM_DIRS_TO_COMMENTS";
     passNames[REMOVE_SPF_DIRS] = "REMOVE_SPF_DIRS";
+    passNames[MERGE_REGIONS] = "MERGE_REGIONS";
     passNames[REMOVE_DIST_ARRAYS_FROM_IO] = "REMOVE_DIST_ARRAYS_FROM_IO";
     passNames[SUBST_EXPR] = "SUBST_EXPR";
     passNames[SUBST_EXPR_RD] = "SUBST_EXPR_RD";
@@ -382,6 +385,8 @@ static void setPassValues()
     passNames[TRANSFORM_ASSUMED_SIZE_PARAMETERS] = "TRANSFORM_ASSUMED_SIZE_PARAMETERS";
     passNames[ARRAY_PROPAGATION] = "ARRAY_PROPAGATION";
 
+    passNames[ARRAY_PROPAGATION] = "ARRAY_PROPAGATION";
+
     passNames[TEST_PASS] = "TEST_PASS";
 }
 

src/Transformations/ArrayConstantPropagation/propagation.cpp

@@ -0,0 +1,604 @@
+#include "propagation.h"
+
+#include "../Utils/SgUtils.h"
+
+#include <functional>
+#include <iostream>
+#include <map>
+#include <set>
+#include <vector>
+
+using namespace std;
+
+static SgStatement* declPlace = NULL;
+static set<SgStatement*> changed;
+static map<string, SgSymbol*> variablesToAdd;
+static map<string, set<SgStatement*>> positionsToAdd; 
+static map<string, string> arrayToName;
+set<SgStatement*> statementsToRemove;
+map<string, map<SgStatement*, SgStatement*>> expToChange;
+
+static bool CheckConstIndexes(SgExpression* exp)
+{
+    if (!exp)
+    {
+        return false;
+    }
+    SgExpression* lhs = exp->lhs();
+    SgExpression* rhs = exp->rhs();
+    do
+    {
+        if (lhs && 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++;
+
+    SgStatement* funcStart = declPlace->controlParent();
+    SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), SgTypeInt(), funcStart);
+
+    variablesToAdd[name] = varSymbol;
+    positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+
+    return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
+}
+
+static SgStatement* FindLastDeclStatement(SgStatement* funcStart)
+{
+    if (!funcStart)
+        return NULL;
+    SgStatement* endSt = funcStart->lastNodeOfStmt();
+    SgStatement* cur = funcStart->lexNext();
+    SgStatement* lastDecl = funcStart;
+    const set<int> declVariants = { VAR_DECL, VAR_DECL_90, ALLOCATABLE_STMT, DIM_STAT,
+                                    EXTERN_STAT, COMM_STAT, HPF_TEMPLATE_STAT, DVM_VAR_DECL, STRUCT_DECL };
+
+    while (cur && cur != endSt)
+    {
+        if (cur->variant() == INTERFACE_STMT)
+            cur = cur->lastNodeOfStmt();
+
+        if (declVariants.find(cur->variant()) != declVariants.end())
+            lastDecl = cur;
+        else if (isSgExecutableStatement(cur))
+            break;
+
+        cur = cur->lexNext();
+    }
+
+    return lastDecl;
+}
+
+static void InsertCommonAndDeclsForFunction(SgStatement* funcStart, const map<string, SgSymbol*>& symbols)
+{
+    if (symbols.empty())
+        return;
+
+    if (!funcStart)
+        return;
+
+    const string commonBlockName = "propagation_common__";
+
+    SgStatement* funcEnd = funcStart->lastNodeOfStmt();
+    SgStatement* commonStat = NULL;
+    SgExpression* commonList = NULL;
+
+    for (SgStatement* cur = funcStart->lexNext();
+        cur && cur != funcEnd; cur = cur->lexNext())
+    {
+        if (cur->variant() != COMM_STAT)
+            continue;
+
+        for (SgExpression* exp = cur->expr(0); exp; exp = exp->rhs())
+        {
+            if (exp->variant() != COMM_LIST)
+                continue;
+
+            const char* id = exp->symbol() ? exp->symbol()->identifier() : NULL;
+            string existingName = id ? string(id) : string("spf_unnamed");
+            if (existingName == commonBlockName)
+            {
+                commonStat = cur;
+                commonList = exp;
+                break;
+            }
+        }
+        if (commonStat)
+            break;
+    }
+
+    vector<SgExpression*> varRefs;
+    for (const auto& [name, sym] : symbols)
+    {
+        if (!sym || sym->variant() != VARIABLE_NAME || string(sym->identifier()) == commonBlockName)
+            continue;
+        SgSymbol* symToAdd = new SgSymbol(VARIABLE_NAME, name.c_str(),  SgTypeInt(), funcStart);
+        varRefs.push_back(new SgVarRefExp(symToAdd));
+    }
+    SgExpression* varList = makeExprList(varRefs, false);
+
+    SgStatement* insertAfter = FindLastDeclStatement(funcStart);
+    for (const auto& [name, sym] : symbols)
+    {
+        if (!sym)
+            continue;
+        SgStatement* declStmt = sym->makeVarDeclStmt();
+        if (!declStmt)
+            continue;
+
+        if (SgVarDeclStmt* vds = isSgVarDeclStmt(declStmt))
+            vds->setVariant(VAR_DECL_90);
+
+        declStmt->setFileName(funcStart->fileName());
+        declStmt->setFileId(funcStart->getFileId());
+        declStmt->setProject(funcStart->getProject());
+        declStmt->setlineNumber(getNextNegativeLineNumber());
+
+        insertAfter->insertStmtAfter(*declStmt, *funcStart);
+        insertAfter = declStmt;
+        statementsToRemove.insert(declStmt);
+    }
+
+    if (!commonList)
+    {
+        SgSymbol* commonSymbol = new SgSymbol(COMMON_NAME, commonBlockName.c_str());
+        commonList = new SgExpression(COMM_LIST, varList, NULL, commonSymbol);
+
+        commonStat = new SgStatement(COMM_STAT);
+        commonStat->setFileName(funcStart->fileName());
+        commonStat->setFileId(funcStart->getFileId());
+        commonStat->setProject(funcStart->getProject());
+        commonStat->setlineNumber(getNextNegativeLineNumber());
+        commonStat->setExpression(0, commonList);
+
+        SgStatement* lastDecl = FindLastDeclStatement(funcStart);
+        lastDecl->insertStmtAfter(*commonStat, *funcStart);
+        statementsToRemove.insert(commonStat);
+    }
+    else
+    {
+        commonList->setLhs(varList);
+    }
+
+}
+
+static void copyStatement(SgStatement* st)
+{
+    if (!st)
+        return;
+    if (expToChange[st->fileName()].find(st) == expToChange[st->fileName()].end())
+    {
+        SgStatement* boundCopy = st->copyPtr();
+
+        for (int i = 0; i < 3; i++)
+        {
+            SgExpression* expCopy = st->expr(i);
+            if (expCopy)
+                boundCopy->setExpression(i, expCopy->copyPtr());
+            else
+                boundCopy->setExpression(i, NULL);
+        }
+        expToChange[st->fileName()][st] = boundCopy;
+    }
+}
+
+static bool TransformRightPart(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    if (!exp)
+        return false;
+    bool isChanged = false;
+    vector<SgExpression*> subnodes = { exp->lhs(), exp->rhs() };
+
+    string expUnparsed;
+    SgExpression* toAdd = NULL;
+    if (isArrayRef(exp) && CheckConstIndexes(exp->lhs()))
+    {
+        expUnparsed = exp->unparse();
+        if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp && exp->symbol() && 
+            exp->symbol()->type() && exp->symbol()->type()->baseType())
+        {
+            arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
+            arrayToName[expUnparsed] = arrayToVariable[expUnparsed]->unparse();
+        }
+        positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+        auto* sym = new SgSymbol(VARIABLE_NAME, arrayToName[expUnparsed].c_str(), SgTypeInt(), declPlace->controlParent());
+        auto* newVarExp = new SgVarRefExp(sym);
+        copyStatement(st);
+        st->setExpression(1, newVarExp);
+        return true;
+    }
+    for (int i = 0; i < 2; i++)
+    {
+        if (subnodes[i] && isArrayRef(subnodes[i]) && subnodes[i]->symbol() && subnodes[i]->symbol()->type() && 
+            subnodes[i]->symbol()->type()->baseType() && CheckConstIndexes(subnodes[i]->lhs()))
+        {
+            isChanged = true;
+            expUnparsed = subnodes[i]->unparse();
+            if (arrayToVariable.find(expUnparsed) == arrayToVariable.end())
+            {
+                arrayToVariable[expUnparsed] = CreateVar(variableNumber, subnodes[i]->symbol()->type()->baseType());
+                arrayToName[expUnparsed] = arrayToVariable[expUnparsed]->unparse();
+            }
+            positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+            SgSymbol* builder = arrayToVariable[expUnparsed]->symbol();
+            auto* sym = new SgSymbol(VARIABLE_NAME, arrayToName[expUnparsed].c_str(), SgTypeInt(), declPlace->controlParent());
+            toAdd = new SgVarRefExp(sym);
+            if (toAdd)
+            {
+                copyStatement(st);
+                if (i == 0)
+                    exp->setLhs(toAdd);
+                else
+                    exp->setRhs(toAdd);
+            }
+        }
+        else
+            isChanged = isChanged || TransformRightPart(st, subnodes[i], arrayToVariable, variableNumber);
+
+    }
+    return isChanged;
+}
+
+static void TransformLeftPart(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    if (!st || !st->expr(1))
+        return;
+    if (!exp || !exp->symbol() || !exp->symbol()->type() || !exp->symbol()->type()->baseType())
+        return;
+    if (exp->symbol()->type()->variant() == T_STRING)
+        return;
+    if (changed.find(st) != changed.end())
+        return;
+    string expUnparsed = exp->unparse();
+    if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
+    {
+        arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
+        arrayToName[expUnparsed] = arrayToVariable[expUnparsed]->unparse();
+    }
+    positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+    auto* sym = new SgSymbol(VARIABLE_NAME, arrayToName[expUnparsed].c_str(), SgTypeInt(), declPlace->controlParent());
+    auto* newVarExp = new SgVarRefExp(sym); 
+    SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, newVarExp, st->expr(1)->copyPtr(), NULL);
+
+    newStatement->setFileId(st->getFileId());
+    newStatement->setProject(st->getProject());
+
+    st->insertStmtBefore(*newStatement, *st->controlParent());
+
+    newStatement->setlineNumber(getNextNegativeLineNumber());
+    newStatement->setLocalLineNumber(st->lineNumber());
+    
+    changed.insert(st);
+    statementsToRemove.insert(newStatement);
+}
+
+static void TransformBorder(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    if (!st || !exp)
+        return;
+    SgStatement* firstStatement = declPlace->lexPrev();
+    positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+    TransformRightPart(st, exp, arrayToVariable, variableNumber);
+    st = st->lexPrev();
+    while (st &&st != firstStatement)
+    {
+        if (st->variant() == ASSIGN_STAT)
+        {
+            if (st->expr(1))
+            {
+                TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+            }
+            if (st->expr(0) && isArrayRef(st->expr(0)) && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+        }
+        st = st->lexPrev();
+    }
+}
+
+static void CheckVariable(SgStatement* st, SgExpression* exp, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    SgStatement* firstStatement = declPlace->lexPrev();
+    st = st->lexPrev();
+    while (st != firstStatement)
+    {
+        if (st->variant() == ASSIGN_STAT && st->expr(0)->symbol() == exp->symbol())
+        {
+            if (TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber))
+            {
+                positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+            }
+        }
+        if (st->variant() == ASSIGN_STAT && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+        {
+            if (st->expr(1))
+            {
+                if(TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber))
+                {
+                    positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+                }
+            }
+            if (st->expr(0) && isArrayRef(st->expr(0)) && CheckConstIndexes(st->expr(0)->lhs()) && arrayToVariable.find(st->expr(0)->unparse()) != arrayToVariable.end())
+            {
+                TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+                positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+            }
+        }
+        st = st->lexPrev();
+    }
+}
+
+static void findConstValues(
+    SgProject& project, 
+    const map<string, map<string, SgStatement*>>& borderVars,
+    const map<string, SgExpression*>& arrayToVariable,
+    map<string, int>& hitCount,
+    map<string, map<SgStatement*, vector<pair<string, string>>>>& result)
+{
+    for (int i = 0; i < project.numberOfFiles(); i++)
+    {
+        SgFile* file = &(project.file(i));
+        if (!file)
+            continue;
+
+        SgFile::switchToFile(file->filename());
+        const int funcNum = file->numberOfFunctions();
+        for (int i = 0; i < funcNum; ++i)
+        {
+            SgStatement* st = file->functions(i);
+            SgStatement* lastNode = st->lastNodeOfStmt();
+            if (!st)
+                continue;
+            for (; st != lastNode; st = st->lexNext())
+            {
+                if (st && st->variant() == ASSIGN_STAT)
+                {
+                    if (!st->expr(0) || !st->expr(1))
+                        continue;
+                    SgExpression* lhs = st->expr(0);
+                    SgExpression* rhs = st->expr(1);
+                    auto varIt = arrayToVariable.find(lhs->unparse());
+                    string varName = (varIt != arrayToVariable.end()) ? varIt->second->unparse() : lhs->unparse();
+                    if (rhs->variant() == INT_VAL)
+                        hitCount[string(lhs->unparse())]++;
+                    for (const auto& [filename, names] : borderVars) 
+                    {
+                        if(names.find(string(lhs->unparse())) != names.end() && rhs->variant() == INT_VAL) 
+                            result[filename][names.at(lhs->unparse())].push_back({ varName, rhs->unparse()});
+                    }
+                }
+            }
+        }
+    }
+}
+
+static void insertDefinition(map<string, map<SgStatement*, vector<pair<string, string>>>>& definitions, map<string, int>& hitCount)
+{
+    for (const auto& [filename, variables] : definitions)
+    {
+        if (SgFile::switchToFile(filename) == -1)
+            continue;
+
+        for (const auto& [statement, values] : variables)
+        {
+            if (!statement)
+                continue;
+            
+            SgStatement* insertBefore = statement, *st = statement;
+            
+            while (st && !isSgExecutableStatement(st))
+            {
+                st = st->lexNext();
+                insertBefore = st;
+            }
+
+            for (const auto& [varName, value] : values)
+            { 
+                if (hitCount.find(varName) == hitCount.end() || hitCount[varName] > 1)
+                    continue;
+                SgSymbol* sym = new SgSymbol(VARIABLE_NAME, varName.c_str(), SgTypeInt(), statement);
+                SgExpression* lhs = new SgVarRefExp(sym);
+
+                SgExpression* rhs = new SgValueExp(stoi(value));
+
+                SgStatement* asg = new SgStatement(ASSIGN_STAT, NULL, NULL, lhs, rhs, NULL);
+                asg->setFileName(statement->fileName());
+                asg->setFileId(statement->getFileId());
+                asg->setProject(statement->getProject());
+                asg->setlineNumber(getNextNegativeLineNumber());
+                
+                if (insertBefore && insertBefore->controlParent())
+                {
+                    insertBefore->insertStmtBefore(*asg, *insertBefore->controlParent());
+                    statementsToRemove.insert(asg);
+                }
+            }
+        }
+    }
+}
+
+static void applyLeftPartForUnchangedAssignments(SgProject& project, map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    for (int fi = 0; fi < project.numberOfFiles(); ++fi)
+    {
+        SgFile* file = &(project.file(fi));
+        if (!file)
+            continue;
+
+        const string fileName = file->filename();
+        if (SgFile::switchToFile(fileName) == -1)
+            continue;
+
+        const int funcNum = file->numberOfFunctions();
+        for (int fni = 0; fni < funcNum; ++fni)
+        {
+            SgStatement* funcStart = file->functions(fni);
+            if (!funcStart)
+                continue;
+
+            declPlace = funcStart;
+            positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+            SgStatement* endSt = funcStart->lastNodeOfStmt();
+
+            for (SgStatement* st = funcStart; st && st != endSt; st = st->lexNext())
+            {
+                if (st->variant() != ASSIGN_STAT)
+                    continue;
+                if (!st->expr(0) || !st->expr(1))
+                    continue;
+                if (changed.find(st) != changed.end())
+                    continue;
+
+                SgExpression* lhs = st->expr(0);
+                if (!isArrayRef(lhs))
+                    continue;
+                if (!lhs->symbol() || !lhs->symbol()->type())
+                    continue;
+                if (!lhs->symbol()->type()->baseType())
+                    continue;
+                if (!CheckConstIndexes(lhs->lhs()))
+                    continue;
+
+                const string lhsUnparsed = lhs->unparse();
+                if (arrayToVariable.find(lhsUnparsed) == arrayToVariable.end())
+                    continue;
+
+                TransformLeftPart(st, lhs, arrayToVariable, variableNumber);
+            }
+        }
+    }
+}
+
+static bool ContainsArrayRefRecursive(SgExpression* exp)
+{
+    if (!exp)
+        return false;
+
+    if (isArrayRef(exp) && CheckConstIndexes(exp->lhs()))
+        return true;
+
+    return ContainsArrayRefRecursive(exp->lhs()) || ContainsArrayRefRecursive(exp->rhs());
+}
+
+static void getBorderVars(SgExpression* exp, const string& filename, map<string, map<string, SgStatement*>>& borderVars)
+{
+    if (!exp)
+        return;
+
+    if ((isArrayRef(exp) && CheckConstIndexes(exp->lhs())) || exp->variant() == VAR_REF)
+        borderVars[filename][string(exp->unparse())] = declPlace;
+
+    getBorderVars(exp->lhs(), filename, borderVars);
+    getBorderVars(exp->rhs(), filename, borderVars);
+}
+
+static void processLoopBound(
+    SgStatement* st,
+    SgExpression* bound,
+    const string& boundUnparsed,
+    bool isUpperBound,
+    map<string, SgExpression*>& arrayToVariable,
+    map<string, map<string, SgStatement*>>& borderVars,
+    int& variableNumber)
+{
+    if (!bound || !st)
+        return;
+
+    SgExpression* exp = isUpperBound ? bound->rhs() : bound->lhs();
+
+    getBorderVars(exp, st->fileName(), borderVars);
+
+    if (ContainsArrayRefRecursive(exp), borderVars, st->fileName())
+    {
+        copyStatement(st);
+
+        TransformBorder(st, bound, arrayToVariable, variableNumber);
+
+        positionsToAdd[string(declPlace->fileName())].insert(declPlace);
+    }
+    else if (bound->variant() == VAR_REF)
+        CheckVariable(st, bound, arrayToVariable, variableNumber);
+}
+
+void arrayConstantPropagation(SgProject& project)
+{
+    map<string, SgExpression*> arrayToVariable;
+    map<string, map<string, SgStatement*>> borderVars;
+    int variableNumber = 0;
+    for (int i = 0; i < project.numberOfFiles(); i++)
+    {
+        SgFile* file = &(project.file(i));
+
+        if (!file)
+            continue;
+        SgFile::switchToFile(file->filename());
+        const int funcNum = file->numberOfFunctions();
+        for (int i = 0; i < funcNum; ++i)
+        {
+            SgStatement* st = file->functions(i);
+            if (!st)
+                continue;
+            declPlace = st;
+            SgStatement* lastNode = st->lastNodeOfStmt();
+
+            for (; st != lastNode; st = st->lexNext())
+            {
+                if (st && st->variant() == FOR_NODE)
+                {
+                    if (!st->expr(0))
+                        continue;
+                    if (!st->expr(0)->lhs() || !st->expr(0)->rhs())
+                        continue;
+                    SgExpression* lowerBound = st->expr(0)->lhs();
+                    SgExpression* upperBound = st->expr(0)->rhs();
+                    
+
+                    string lowerBoundUnparsed = lowerBound->unparse();
+                    string upperBoundUnparsed = upperBound->unparse();
+                    
+                    processLoopBound(st, st->expr(0), upperBoundUnparsed, true,  arrayToVariable, borderVars, variableNumber);
+                    processLoopBound(st, st->expr(0), lowerBoundUnparsed, false, arrayToVariable, borderVars, variableNumber);
+                       
+                }
+            }
+        }
+    }
+    applyLeftPartForUnchangedAssignments(project, arrayToVariable, variableNumber);
+    map<string, set<SgStatement*>> funcStarts;
+    for (const auto& [fileName, statements] : positionsToAdd)
+    {
+        int res = SgFile::switchToFile(fileName);
+        if (res == -1)
+            continue;
+        for (SgStatement* st : statements)
+        {
+            SgStatement* scope = isSgProgHedrStmt(st) ? st : st->controlParent();
+            if (scope)
+                funcStarts[fileName].insert(scope);
+        }
+    }
+    for (const auto& [fileName, statements] : funcStarts)
+    {
+        SgFile::switchToFile(fileName);
+        for (SgStatement* st : statements)
+        {
+            InsertCommonAndDeclsForFunction(st, variablesToAdd);
+        }
+    }
+    map<string, map<SgStatement*, vector<pair<string, string>>>> result;
+    map<string, int> hitCount;
+    findConstValues(project, borderVars, arrayToVariable, hitCount, result);
+    insertDefinition(result, hitCount);
+}

src/Transformations/ArrayConstantPropagation/propagation.h

@@ -0,0 +1,10 @@
+#pragma once
+#include "../Utils/SgUtils.h"
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+
+void arrayConstantPropagation(SgProject& project);

src/Transformations/FunctionPurifying/function_purifying.cpp

@@ -234,9 +234,8 @@ static bool hasDvmParallel(SgStatement *func)
     return false;
 }
 
-void transformAssumedSizeParameters(const map<string, vector<FuncInfo*>>& allFuncInfo)
-{
-    map<string, vector<int>> assumedSizeArraysByFunc;
+static map<FuncInfo*, bool> createDvmParallelInfo(const map<string, vector<FuncInfo*>>& allFuncInfo) {
+    map<FuncInfo*, bool> hasDvmParallelMap;
 
     for (auto& funcByFile : allFuncInfo)
     {
@@ -249,7 +248,63 @@ void transformAssumedSizeParameters(const map<string, vector<FuncInfo*>>& allFun
             if (prog == NULL)
                 continue;
 
-            if (!hasDvmParallel(prog))
+            hasDvmParallelMap[func] = hasDvmParallel(prog);
+        }
+    }
+
+    bool changed = true;
+    while (changed) 
+    {
+        changed = false;
+
+        for (auto& funcByFile : allFuncInfo)
+        {
+            for (auto& func : funcByFile.second)
+            {
+                if (!hasDvmParallelMap[func]) 
+                {
+                    bool hasParallel = false;
+                    for (auto& callF : func->callsFromV)
+                    {
+                        if (hasDvmParallelMap[callF]) 
+                        {
+                            hasParallel = true;
+                            break;
+                        }
+                    }
+
+                    if (hasParallel)
+                    {
+                        changed = true;
+                        hasDvmParallelMap[func] = true;
+                    }
+
+                }
+            }
+        }
+    }
+
+    return hasDvmParallelMap;
+}
+
+
+void transformAssumedSizeParameters(const map<string, vector<FuncInfo*>>& allFuncInfo)
+{
+    map<string, vector<int>> assumedSizeArraysByFunc;
+    const map<FuncInfo*, bool> hasDvmParallelMap = createDvmParallelInfo(allFuncInfo);
+    
+    for (auto& funcByFile : allFuncInfo)
+    {
+        if (SgFile::switchToFile(funcByFile.first) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        for (auto& func : funcByFile.second)
+        {
+            SgProgHedrStmt* prog = isSgProgHedrStmt(func->funcPointer->GetOriginal());
+            if (prog == NULL)
+                continue;
+
+            if (!hasDvmParallelMap.at(func))
                 continue;
 
             vector<SgSymbol*> parNames;
@@ -259,7 +314,8 @@ void transformAssumedSizeParameters(const map<string, vector<FuncInfo*>>& allFun
             bool hasRefs = false;
             for (int z = 0; z < func->funcParams.countOfPars; ++z)
             {
-                if (func->funcParams.parametersT[z] == ARRAY_T)
+                if (func->funcParams.parametersT[z] == ARRAY_T ||
+                    func->funcParams.parametersT[z] == STRING_ARRAY_T)
                 {
                     auto s = prog->parameter(z);
                     const string name = s->identifier();

src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp

@@ -504,7 +504,7 @@ static void replaceArrayInFragment(SgSymbol* replace_symb,
     }
 }
 
-static bool ioReginBorder(SgStatement* stat, SgStatement* last_io_bound)
+static bool ioRegionBorder(SgStatement* stat, SgStatement* last_io_bound)
 {
     auto var = stat->variant();
 
@@ -535,14 +535,24 @@ static bool ioReginBorder(SgStatement* stat, SgStatement* last_io_bound)
     if (last_io_bound && last_io_bound->lastNodeOfStmt() && last_io_bound->lastNodeOfStmt() == stat)
         return true;
 
-    int parent_var;
-
     if (var == CONTROL_END && border_stats.find(stat->controlParent()->variant()) != border_stats.end())
         return true;
 
     return false;
 }
 
+FuncInfo* getCurrentFuncInfo(const vector<FuncInfo*>& fileFuncInfo, int line)
+{
+    for (auto* func : fileFuncInfo)
+    {
+        if (func->linesNum.first <= line && line <= func->linesNum.second)
+            return func;
+    }
+
+    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    return NULL;
+}
+
 void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
                                   const map<string, vector<FuncInfo*>>& allFuncInfo,
                                   map<string, vector<Messages>>& SPF_messages,
@@ -562,6 +572,8 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
             if (SgFile::switchToFile(current_file_name) == -1)
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
+            FuncInfo *current_func_info = NULL;
+
             auto func_info_it = allFuncInfo.find(current_file_name);
             if (func_info_it == allFuncInfo.end())
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -588,13 +600,12 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
                 {
                     curr_stmt = lines.stats.first->GetOriginal();
                     end = lines.stats.second->GetOriginal()->lexNext();
+                    current_func_info = getCurrentFuncInfo(func_info_it->second, curr_stmt->lineNumber());
                 }
 
                 map<SgSymbol*, set<SgStatement*>> need_replace;
                 SgStatement* last_io_bound = NULL;
 
-                FuncInfo *current_func_info = NULL;
-
                 while (curr_stmt != end)
                 {
                     if (!curr_stmt)
@@ -604,18 +615,7 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
 
                     if (var == PROC_HEDR || var == PROG_HEDR || var == FUNC_HEDR)
                     {
-                        current_func_info = NULL;
-                        for (auto *func_info : func_info_it->second)
-                        {
-                            if (func_info->funcName == curr_stmt->symbol()->identifier())
-                            {
-                                current_func_info = func_info;
-                                break;
-                            }
-                        }
-
-                        if (!current_func_info)
-                            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+                        current_func_info = getCurrentFuncInfo(func_info_it->second, curr_stmt->lineNumber());
 
                         curr_stmt = curr_stmt->lexNext();
                         while (curr_stmt && !isSgExecutableStatement(curr_stmt))
@@ -628,7 +628,7 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
                             break;
                     }
 
-                    if (ioReginBorder(curr_stmt, last_io_bound))
+                    if (ioRegionBorder(curr_stmt, last_io_bound))
                     {
                         for (const auto& by_array_to_copy : need_replace)
                         {

src/Utils/PassManager.h

@@ -318,10 +318,11 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     list({ VERIFY_INCLUDES, CORRECT_VAR_DECL }) <= Pass(SET_IMPLICIT_NONE);
 
-    list({ CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS_ANALYSIS);
+    list({ ARRAY_PROPAGATION, CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS_ANALYSIS);
     list({ FIND_PRIVATE_ARRAYS_ANALYSIS, CONVERT_LOOP_TO_ASSIGN, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(FIND_PRIVATE_ARRAYS);
 
     list({ BUILD_IR, CALL_GRAPH2, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(MOVE_OPERATORS);
+    Pass(CREATE_TEMPLATE_LINKS) <= Pass(MERGE_REGIONS);
 
     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

@@ -658,7 +658,7 @@ string removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, const ch
 
                 if (wasDeleted)
                 {
-                    if (str.size() || str.back() != '\n')
+                    if (str.size() && str.back() != '\n')
                         str += '\n';
                     st->setComments(str.c_str());
                 }

src/Utils/version.h

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

src/VisualizerCalls/get_information.cpp

@@ -1809,6 +1809,13 @@ int SPF_MoveOperators(void*& context, int winHandler, short* options, short* pro
     return simpleTransformPass(MOVE_OPERATORS, options, projName, folderName, output, outputMessage);
 }
 
+int SPF_MergeRegions(void*& context, int winHandler, short* options, short* projName, short* folderName, string& output, string& outputMessage)
+{
+    MessageManager::clearCache();
+    MessageManager::setWinHandler(winHandler);
+    return simpleTransformPass(MERGE_REGIONS, options, projName, folderName, output, outputMessage);
+}
+
 static inline void convertBackSlash(char *str, int strL)
 {
     for (int z = 0; z < strL; ++z)
@@ -2519,6 +2526,8 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         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_MergeRegions")
+        retCode = SPF_MergeRegions(context, winHandler, optSh, projSh, fold, output, outputMessage);
     else if (whichRun == "SPF_CreateParallelVariant")
     {
         vector<string> splited;