Add swith to file usage

CMakeLists.txt

@@ -161,12 +161,11 @@ 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(MERGE_REGIONS src/ParallelizationRegions/merge_regions.cpp
+set(ARRAY_PROP src/ArrayConstantPropagation/propagation.cpp
-         src/ParallelizationRegions/merge_regions.h)
+	src/ArrayConstantPropagation/propagation.h	
+)
 
 set(TR_DEAD_CODE src/Transformations/DeadCodeRemoving/dead_code.cpp
         src/Transformations/DeadCodeRemoving/dead_code.h)
@@ -211,8 +210,6 @@ 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}
@@ -236,8 +233,7 @@ 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
@@ -430,8 +426,8 @@ set(SOURCE_EXE
     ${LOOP_ANALYZER}
     ${TRANSFORMS}
     ${PARALLEL_REG}
-    ${MERGE_REGIONS}
     ${PRIV}
+    ${ARRAY_PROP}
     ${FDVM}
     ${OMEGA}
     ${UTILS}
@@ -472,7 +468,6 @@ 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})
@@ -484,8 +479,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

@@ -0,0 +1,301 @@
+#include "propagation.h"
+
+#include "../Utils/SgUtils.h"
+
+#include <iostream>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+using namespace std;
+
+static SgStatement* declPlace = NULL;
+
+static bool CheckConstIndexes(SgExpression* exp)
+{
+    if (!exp)
+    {
+        return true;
+    }
+    SgExpression* lhs = exp->lhs();
+    SgExpression* rhs = exp->rhs();
+    do
+    {
+        if (lhs->variant() != INT_VAL)
+        {
+            return false;
+        }
+        if (rhs)
+        {
+            lhs = rhs->lhs();
+            rhs = rhs->rhs();
+        }
+    } while (rhs);
+    return true;
+}
+
+static SgExpression* CreateVar(int& variableNumber, SgType* type)
+{
+    string varName = "__tmp_prop_var";
+    string name = varName + std::to_string(variableNumber) + "__";
+    variableNumber++;
+
+    SgSymbol* varSymbol = new SgSymbol(VARIABLE_NAME, name.c_str(), *type, *declPlace->controlParent());
+
+    const string commonBlockName = "__propagation_common__";
+
+    SgStatement* funcStart = declPlace->controlParent();
+    SgStatement* commonStat = NULL;
+    SgExpression* commonList = NULL;
+
+    SgStatement* funcEnd = funcStart->lastNodeOfStmt();
+    SgStatement* current = funcStart->lexNext();
+
+    while (current != funcEnd && current)
+    {
+        if (current->variant() == COMM_STAT)
+        {
+            for (SgExpression* exp = current->expr(0); exp; exp = exp->rhs())
+            {
+                if (exp->variant() == COMM_LIST)
+                {
+                    string existingName = exp->symbol() ?
+                        string(exp->symbol()->identifier()) :
+                        string("spf_unnamed");
+                    if (existingName == commonBlockName)
+                    {
+                        commonStat = current;
+                        commonList = exp;
+                        break;
+                    }
+                }
+            }
+            if (commonStat)
+                break;
+        }
+        current = current->lexNext();
+    }
+
+    vector<SgExpression*> varRefs;
+    if (commonList)
+    {
+        SgExpression* varList = commonList->lhs();
+        if (varList)
+        {
+            auto extractSymbol = [](SgExpression* exp) -> SgSymbol* {
+                if (!exp) 
+                    return NULL;
+                if (exp->symbol()) 
+                    return exp->symbol();
+                if (exp->lhs() && exp->lhs()->symbol())
+                    return exp->lhs()->symbol();
+                return NULL;
+                };
+            if (varList->variant() == EXPR_LIST)
+            {
+                for (SgExpression* exp = varList; exp; exp = exp->rhs())
+                {
+                    SgExpression* varExp = exp->lhs();
+                    SgSymbol* sym = extractSymbol(varExp);
+                    if (sym)
+                    {
+                        varRefs.push_back(new SgVarRefExp(sym));
+                    }
+                }
+            }
+            else
+            {
+                for (SgExpression* varExp = varList; varExp; varExp = varExp->rhs())
+                {
+                    SgSymbol* sym = extractSymbol(varExp);
+                    if (sym)
+                    {
+                        varRefs.push_back(new SgVarRefExp(sym));
+                    }
+                }
+            }
+        }
+    }
+
+    if (!commonList)
+    {
+        current = funcStart->lexNext();
+        while (current != funcEnd && current)
+        {
+            if (current->variant() == COMM_STAT)
+            {
+                commonStat = current;
+                break;
+            }
+            current = current->lexNext();
+        }
+
+        SgSymbol* commonSymbol = new SgSymbol(COMMON_NAME, commonBlockName.c_str());
+        commonList = new SgExpression(COMM_LIST, NULL, NULL, commonSymbol);
+
+        if (commonStat)
+        {
+            SgExpression* lastCommList = commonStat->expr(0);
+            if (lastCommList)
+            {
+                while (lastCommList->rhs())
+                    lastCommList = lastCommList->rhs();
+                lastCommList->setRhs(commonList);
+            }
+            else
+            {
+                commonStat->setExpression(0, commonList);
+            }
+        }
+        else
+        {
+            commonStat = new SgStatement(COMM_STAT);
+            commonStat->setFileName(declPlace->fileName());
+            commonStat->setFileId(declPlace->getFileId());
+            commonStat->setProject(declPlace->getProject());
+            commonStat->setlineNumber(getNextNegativeLineNumber());
+            commonStat->setExpression(0, commonList);
+
+            declPlace->insertStmtBefore(*commonStat, *declPlace->controlParent());
+        }
+
+    }
+    varRefs.push_back(new SgVarRefExp(varSymbol));
+
+    if (varRefs.size() > 0)
+    {
+        std::reverse(varRefs.begin(), varRefs.end());
+        SgExpression* varList = makeExprList(varRefs, false);
+
+        commonList->setLhs(varList);
+    }
+
+    return new SgExpression(VAR_REF, NULL, NULL, varSymbol, type->copyPtr());
+}
+
+static void TransformRightPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber) 
+{
+    if (!exp)
+    {
+        return;
+    }
+
+    vector<SgExpression*> subnodes = { exp->lhs(), exp->rhs() };
+
+    string expUnparsed;
+    SgExpression* toAdd = NULL;
+    if (exp->variant() == ARRAY_REF && CheckConstIndexes(exp->lhs()))
+    {
+        cout << st->unparse() << endl;
+        if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
+        {
+            arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());  
+        }
+        st->setExpression(1, arrayToVariable[expUnparsed]->copyPtr());
+        return;
+    }
+    for (int i = 0; i < 2; i++)
+    {
+        if (subnodes[i] && subnodes[i]->variant() == ARRAY_REF && subnodes[i]->symbol()->type()->baseType() && CheckConstIndexes(subnodes[i]->lhs()))
+        {
+            expUnparsed = subnodes[i]->unparse();
+            if (arrayToVariable.find(expUnparsed) == arrayToVariable.end())
+            {                
+                arrayToVariable[expUnparsed] = CreateVar(variableNumber, subnodes[i]->symbol()->type()->baseType());;
+            }
+            toAdd = arrayToVariable[expUnparsed]->copyPtr();
+            if (toAdd)
+            {
+                if (i == 0)
+                {
+                    exp->setLhs(toAdd);
+                }
+                else
+                {
+                    exp->setRhs(toAdd);
+                }
+            }
+        }
+        else
+        {
+            TransformRightPart(st, subnodes[i], arrayToVariable, variableNumber);
+        }
+    }
+}
+
+static void TransformLeftPart(SgStatement* st, SgExpression* exp, unordered_map<string, SgExpression*>& arrayToVariable, int& variableNumber)
+{
+    if (exp->symbol()->type()->variant() == T_STRING)
+        return;
+    string expUnparsed = exp->unparse();
+    if (arrayToVariable.find(expUnparsed) == arrayToVariable.end() && exp->symbol()->type()->baseType())
+    {
+        arrayToVariable[expUnparsed] = CreateVar(variableNumber, exp->symbol()->type()->baseType());
+    }
+    SgStatement* newStatement = new SgStatement(ASSIGN_STAT, NULL, NULL, arrayToVariable[expUnparsed]->copyPtr(), st->expr(1)->copyPtr(), NULL);
+
+    newStatement->setFileId(st->getFileId());
+    newStatement->setProject(st->getProject()); 
+
+    newStatement->setlineNumber(getNextNegativeLineNumber());
+    newStatement->setLocalLineNumber(st->lineNumber());
+    st->insertStmtBefore(*newStatement, *st->controlParent());
+}
+
+void ArrayConstantPropagation(SgProject& project) 
+{
+    unordered_map<string, SgExpression*> arrayToVariable;
+    int variableNumber = 0;
+    for (int i = 0; i < project.numberOfFiles(); i++) 
+    {
+        SgFile* file = &(project.file(i));
+
+        if (!file)
+            continue;
+
+        const int funcNum = file->numberOfFunctions();
+        for (int i = 0; i < funcNum; ++i)
+        {
+            SgStatement* st = file->functions(i);
+            declPlace = st->lexNext();
+            SgStatement* lastNode = st->lastNodeOfStmt();
+
+            for (; st != lastNode; st = st->lexNext())
+            {
+                if (st->variant() == ASSIGN_STAT)
+                {
+                    if (st->expr(1))
+                    {
+                        TransformRightPart(st, st->expr(1), arrayToVariable, variableNumber);
+                    }
+                    if (st->expr(0) && st->expr(0)->variant() == ARRAY_REF && CheckConstIndexes(st->expr(0)->lhs()))
+                    {
+                        TransformLeftPart(st, st->expr(0), arrayToVariable, variableNumber);
+                    }
+                }
+                else if (st->variant() == FOR_NODE)
+                {
+                    SgExpression* lowerBound = st->expr(0)->lhs();
+                    SgExpression* upperBound = st->expr(0)->rhs();
+                    string lowerBoundUnparsed = lowerBound->unparse(), upperBoundUnparsed = upperBound->unparse();
+                    if (upperBound->variant() == ARRAY_REF && upperBound->symbol()->type()->baseType() && CheckConstIndexes(upperBound->lhs()))
+                    {
+                        if (arrayToVariable.find(upperBoundUnparsed) == arrayToVariable.end())
+                        {
+                            arrayToVariable[upperBoundUnparsed] = CreateVar(variableNumber, upperBound->symbol()->type()->baseType());
+                        }
+                        st->expr(0)->setRhs(arrayToVariable[upperBoundUnparsed]->copyPtr());
+                    }
+                    if (lowerBound->variant() == ARRAY_REF && lowerBound->symbol()->type()->baseType() && CheckConstIndexes(lowerBound->lhs()))
+                    {
+                        if (arrayToVariable.find(lowerBoundUnparsed) == arrayToVariable.end())
+                        {
+                            arrayToVariable[lowerBoundUnparsed] = CreateVar(variableNumber, lowerBound->symbol()->type()->baseType());
+                        }
+                        st->expr(0)->setLhs(arrayToVariable[lowerBoundUnparsed]->copyPtr());
+                    }
+                }
+            }
+        }
+    }
+}

src/ArrayConstantPropagation/propagation.h

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

src/CFGraph/RD_subst.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <unordered_map>
+#include<unordered_map>
 
 #include "SgUtils.h"
 #include "CommonBlock.h"

src/DirectiveProcessing/spf_directive_preproc.cpp

@@ -1933,17 +1933,6 @@ 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,9 +1289,6 @@ 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 || ex->variant() == ARRAY_REF))
+        if (!isInFuncPar && (ex->variant() == VAR_REF || isArrayRef(ex)))
         {
             const char *name = ex->symbol()->identifier();
             if (name && name != string(""))
@@ -800,47 +800,20 @@ 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> parNamesMain;
+    map<string, int> parNames;
-    map<string, int> parNamesContains;
 
     for (int i = 0; i < currF->funcParams.identificators.size(); ++i)
-        parNamesMain[currF->funcParams.identificators[i]] = i;
+        parNames[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) {
+        if (st->variant() == CONTAINS_STMT)
-            isContainsFunctions = true;
+            break;
-            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;
         }
@@ -848,10 +821,8 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
         if (st->lineNumber() <= 0)
             continue;
 
-        //XXX: use parameters removing in block ... isContainsFunctions ...
+        if (activeOps.size() && activeOps.find(st) == activeOps.end())
-        //TODO need to use IR for parameters checking
+            continue;
-        /*if (activeOps.size() && activeOps.find(st) == activeOps.end())
-            continue; */
 
         if (st->variant() == ASSIGN_STAT)
         {
@@ -880,7 +851,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 && (item->variant() == VAR_REF || item->variant() == ARRAY_REF))
+                if (item->variant() == VAR_REF || isArrayRef(item))
                 {
                     string symb = "";
                     if (item->symbol())
@@ -901,7 +872,7 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
                         if (item->rhs())
                             queue.push(item->rhs());
 
-                        if (item->variant() == VAR_REF || item->variant() == ARRAY_REF)
+                        if (item->variant() == VAR_REF || isArrayRef(item))
                         {
                             string symb = "";
                             if (item->symbol())

src/GraphLoop/graph_loops_base.cpp

@@ -6,12 +6,14 @@
 #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,7 +24,6 @@ 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);
 
@@ -956,64 +955,3 @@ 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,7 +10,3 @@ 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

@@ -1,624 +0,0 @@
-#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

@@ -1,8 +0,0 @@
-#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,7 +19,6 @@
 #include "SgUtils.h"
 #include "expr_transform.h"
 #include "FunctionPurifying/function_purifying.h"
-#include "uniq_name_creator.h"
 
 using std::map;
 using std::pair;
@@ -72,7 +71,7 @@ static bool isSPF_reg(SgStatement *st)
     return st->variant() == SPF_PARALLEL_REG_DIR || st->variant() == SPF_END_PARALLEL_REG_DIR;
 }
 
-const vector<const Variable*> getArraySynonyms(DIST::Array *array)
+static const vector<const Variable*> getArraySynonyms(DIST::Array *array)
 {
     auto arrayBlock = allUsedCommonArrays.find(array);
     if (arrayBlock == allUsedCommonArrays.end())
@@ -128,16 +127,15 @@ static string getStringDeclaration(SgSymbol *symb)
     return decl;
 }
 
-static void insertStringDeclarations(SgStatement *insertPlace, DIST::Array *array, UniqueNameCreator& unique_name_creator)
+static void insertStringDeclarations(SgStatement *insertPlace, DIST::Array *array)
 {
     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();
-        varSymb->changeName(newArrName.c_str());
+        string newName = varName + "_c";
+        varSymb->changeName(newName.c_str());
         string decl = getStringDeclaration(varsOnPos[0]->getSymbol());
         varSymb->changeName(varName.c_str());
         insertPlace->addComment(decl.c_str());
@@ -664,11 +662,12 @@ 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, UniqueNameCreator& unique_name_creator)
+static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array)
 {
-    string newArrName, commBlockName;
+    auto varsOnPos = getArraySynonyms(array);
+    if (!varsOnPos.size())
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    unique_name_creator.GetUniqueName(array, newArrName, commBlockName);
     string fileName = file->filename();
 
     if (SgFile::switchToFile(fileName) != -1)
@@ -684,6 +683,7 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array, UniqueNa
             // 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,6 +705,7 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array, UniqueNa
             {
                 //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);
@@ -750,7 +751,7 @@ static SgStatement* createCommonBlock(SgFile *file, DIST::Array *array, UniqueNa
 // func -> arrays; funcs where new common statement inserted
 static map<FuncInfo*, set<DIST::Array*>> insertedCommonBlocks;
 
-static void insertCommonBlock(FuncInfo *func, DIST::Array *array, UniqueNameCreator& unique_name_creator)
+static void insertCommonBlock(FuncInfo *func, DIST::Array *array)
 {
     SgFile *file = func->funcPointer->GetOriginal()->getFile();
     SgStatement *insertPlace = NULL;
@@ -766,7 +767,7 @@ static void insertCommonBlock(FuncInfo *func, DIST::Array *array, UniqueNameCrea
     if (!insertPlace)
         insertPlace = func->funcPointer->GetOriginal();
 
-    SgStatement *commDecl = createCommonBlock(file, array, unique_name_creator);
+    SgStatement *commDecl = createCommonBlock(file, array);
     SgStatement *copyDecl = commDecl->copyPtr();
 
     auto st = insertPlace->controlParent();
@@ -778,7 +779,7 @@ static void insertCommonBlock(FuncInfo *func, DIST::Array *array, UniqueNameCrea
     insertPlace->lexNext()->setlineNumber(nextLine);
 
     // create declaration via comment
-    insertStringDeclarations(insertPlace->lexNext(), array, unique_name_creator);
+    insertStringDeclarations(insertPlace->lexNext(), array);
 }
 
 // file -> lines -> arrays; lines where arrays copying is inserted
@@ -1096,7 +1097,6 @@ 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, unique_name_creator);
+                    createCommonBlock(file, arrayBlock.first);
 
                 auto usedCommonArrays = region->GetUsedCommonArrays().find(func);
                 if (usedCommonArrays != region->GetUsedCommonArrays().end())
                 {
                     for (auto &arrayLines : usedCommonArrays->second)
                     {
-                        SgStatement *commDecl = createCommonBlock(file, arrayLines.first, unique_name_creator);
+                        SgStatement *commDecl = createCommonBlock(file, arrayLines.first);
                         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, unique_name_creator);
+                        insertStringDeclarations(copyStat->lexNext(), arrayLines.first);
                     }
 
                     auto it = createdCommonArrays.find(file->filename());
@@ -1619,8 +1619,6 @@ 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;
@@ -1690,7 +1688,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, unique_name_creator);
+                                    insertCommonBlock(func, arrayBlock.first);
                                     it->second.insert(arrayBlock.first);
                                 }
                             }
@@ -1783,7 +1781,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, unique_name_creator);
+                            insertCommonBlock(func, arrayBlock.first);
                             it->second.insert(arrayBlock.first);
                         }
                     }
@@ -1815,7 +1813,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                     if (usedCommonArrays != region->GetUsedCommonArrays().end())
                     {
                         for (auto &arrayBlock : allUsedCommonArrays)
-                            createCommonBlock(file, arrayBlock.first, unique_name_creator);
+                            createCommonBlock(file, arrayBlock.first);
 
                         auto it = insertedCommonBlocks.find(func);
                         if (it == insertedCommonBlocks.end())
@@ -1827,7 +1825,7 @@ int resolveParRegions(vector<ParallelRegion*> &regions, const map<string, vector
                             if (itt == it->second.end())
                             {
                                 // need to insert common-block
-                                insertCommonBlock(func, arrayLines.first, unique_name_creator);
+                                insertCommonBlock(func, arrayLines.first);
                                 it->second.insert(arrayLines.first);
 
                                 // replace common arrays to new common arrays in executable code section
@@ -1860,7 +1858,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, unique_name_creator, string("_r") + to_string(regionId));
+                            copyFunction(getRegionById(regions, regionId), func, funcMap, string("_r") + to_string(regionId));
                 }
             }
         }

src/ParallelizationRegions/resolve_par_reg_conflicts.h

@@ -22,5 +22,3 @@ 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

@@ -1,98 +0,0 @@
-#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

@@ -1,26 +0,0 @@
-#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,34 +1,28 @@
 #include <algorithm>
 #include <map>
-#include <set>
+#include <unordered_set>
+#include <unordered_map>
 #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 "Transformations/ArrayConstantPropagation/propagation.h"
+#include "graph_loops.h"
+#include "CFGraph/CFGraph.h"
 #include "utils.h"
-#include "Utils/AstWrapper.h"
 
 using namespace std;
 
-extern std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>> declaredArrays;
+static unordered_set<Region*> collapsed;
-extern map<string, vector<Messages>> SPF_messages;
-
-static set<Region*> collapsed;
 
 static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
 {
     ArrayAccessingIndexes resultContainer;
-    set<string> toRemove;
+    unordered_set<string> toRemove;
 
     for (auto& [arrayName, accessingSet] : container)
     {
@@ -39,9 +33,10 @@ static void RemoveEmptyPoints(ArrayAccessingIndexes& container)
                 points.push_back(arrayPoint);
         }
 
-        if (!points.empty())
+        if (points.size() < accessingSet.GetElements().size() && !points.empty())
             resultContainer[arrayName] = points;
-        else
+
+        if (points.empty())
             toRemove.insert(arrayName);
     }
 
@@ -58,7 +53,6 @@ static void Collapse(Region* region)
         return;
 
     bool firstRegion = true;
-    int blockCount = 0;
     for (Region* basickBlock : region->getBasickBlocks())
     {
         if (basickBlock->getNextRegions().empty())
@@ -70,7 +64,7 @@ static void Collapse(Region* region)
             }
             else
             {
-                set<string> toErease;
+                unordered_set<string> toErease;
                 for (auto& [arrayName, arrayRanges] : region->array_def)
                 {
                     if (basickBlock->array_out.find(arrayName) != basickBlock->array_out.end())
@@ -90,15 +84,11 @@ 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]);
@@ -130,8 +120,67 @@ static void Collapse(Region* region)
         region->addNextRegion(nextBlock);
     }
     region->instructions.push_back(instruction);
-    if (blockCount == 1 && !recursivePriv.empty())
+
-        region->array_priv = move(recursivePriv);
+}
+
+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());
 }
 
 static void SolveForBasickBlock(Region* block)
@@ -232,6 +281,7 @@ 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();
@@ -240,83 +290,43 @@ static bool getArrayDeclaredDimensions(SgArrayRefExp* arrayRef, vector<uint64_t>
     {
         SgExpression* sizeExpr = arrayType->sizeInDim(i);
         SgConstantSymb* constValSymb = isSgConstantSymb(sizeExpr->symbol());
-        SgSubscriptExp* subscriptExpr = isSgSubscriptExp(sizeExpr);
+        string strDimLength;
-        uint64_t dimLength;
         if (sizeExpr && sizeExpr->variant() == INT_VAL)
-            dimLength = stol(sizeExpr->unparse());
+            strDimLength = sizeExpr->unparse();
         else if (constValSymb)
-            dimLength = stol(constValSymb->constantValue()->unparse());
+            strDimLength = constValSymb->constantValue()->unparse();
-        else if (subscriptExpr)
-        {
-            dimLength = stol(subscriptExpr->rhs()->unparse()) - stol(subscriptExpr->lhs()->unparse());
-        }
         else
             return false;
 
-        if (dimLength == 0)
+        if (strDimLength == "0")
             return false;
-        declaredDims.push_back(dimLength);
+        declaredDims.push_back((uint64_t)stoi(strDimLength));
     }
     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 || !arrayRef->symbol())
+    if (!arrayRef)
+        return false;
+    vector<uint64_t> declaredDims(dimCount);
+    if (!getArrayDeclaredDimensions(arrayRef, declaredDims))
         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 false;
+    return diff.GetElements().empty();
 }
 
+
 static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& privates, set<SgStatement*>& insertedPrivates)
 {
     SgStatement* spfStat = new SgStatement(SPF_ANALYSIS_DIR);
@@ -324,26 +334,10 @@ 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& [arrayName, accessingSet] : privates)
+    for (const auto& [_, 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())
@@ -378,7 +372,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)
@@ -397,15 +391,7 @@ void findPrivateArrays(map<string, vector<LoopGraph*>>& loopGraph, map<FuncInfo*
             {
                 if (funcInfo->fileName == fileName && funcInfo->funcPointer->GetOriginal() == search_func)
                 {
-                    Region* loopRegion;
+                    Region* loopRegion = new Region(loop, blocks);
-                    try
-                    {
-                        loopRegion = new Region(loop, blocks);
-                    }
-                    catch (...)
-                    {
-                        continue;
-                    }
                     if (loopRegion->getBasickBlocks().size() <= 1)
                     {
                         delete(loopRegion);
@@ -417,6 +403,7 @@ 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);
         }

src/PrivateAnalyzer/private_arrays_search.h

@@ -3,10 +3,11 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <set>
+#include <unordered_set>
 
 #include "range_structures.h"
 #include "graph_loops.h"
 #include "CFGraph/CFGraph.h"
 
-void findPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, std::set<SgStatement*>& insertedPrivates);
+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);

src/PrivateAnalyzer/range_structures.cpp

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

src/PrivateAnalyzer/range_structures.h

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

src/PrivateAnalyzer/region.cpp

@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <vector>
 #include <map>
-#include <set>
+#include <unordered_set>
-#include <map>
+#include <unordered_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*, set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const vector<SAPFOR::BasicBlock*> blocks)
+pair<SAPFOR::BasicBlock*, unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const vector<SAPFOR::BasicBlock*> blocks)
 {
-    set<SAPFOR::BasicBlock*> block_loop;
+    unordered_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*, set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const
     return { head_block, block_loop };
 }
 
-static void BuildLoopIndex(map<SgStatement*, LoopGraph*>& loopForIndex, LoopGraph* loop) {
+static void BuildLoopIndex(map<string, LoopGraph*>& loopForIndex, LoopGraph* loop) {
     string index = loop->loopSymbol();
-    loopForIndex[loop->loop->GetOriginal()] = loop;
+    loopForIndex[index] = loop;
 
     for (const auto& childLoop : loop->children)
         BuildLoopIndex(loopForIndex, childLoop);
 }
 
 static string FindIndexName(int pos, SAPFOR::BasicBlock* block, map<string, LoopGraph*>& loopForIndex) {
-    set<SAPFOR::Argument*> args = { block->getInstructions()[pos]->getInstruction()->getArg1() };
+    unordered_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<SgStatement*, LoopGraph*> loopForIndex;
+    map<string, LoopGraph*> loopForIndex;
     BuildLoopIndex(loopForIndex, loop);
     for (int i = 0; i < instructions.size(); i++)
     {
@@ -136,6 +136,7 @@ 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)
             {
@@ -149,8 +150,6 @@ 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;
@@ -179,16 +178,25 @@ 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)
-                    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())
+                        if (loopForIndex.find(name) != loopForIndex.end())
-                        currentLoop = loopForIndex[serachInstr];
+                            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];
+                        else
+                            return -1;
+                    }
 
                     uint64_t start = coeffsForDims.back().second * currentLoop->startVal + coeffsForDims.back().first;
                     uint64_t step = currentLoop->stepVal;
@@ -196,7 +204,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
                     current_dim = { start, step, iters, ref };
                 }
 
-                if (current_dim.step != 0 && current_dim.tripCount != 0)
+                if (current_dim.start != 0 && current_dim.step != 0 && current_dim.tripCount != 0)
                 {
                     accessPoint[n - index_vars.size()] = current_dim;
                     fillCount++;
@@ -233,7 +241,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
 
 }
 
-static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const set<SAPFOR::BasicBlock*>& blockSet, map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const unordered_set<SAPFOR::BasicBlock*>& blockSet, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
     {
@@ -249,59 +257,26 @@ static void RemoveHeaderConnection(SAPFOR::BasicBlock* header, const set<SAPFOR:
     }
 }
 
-static bool DFS(Region* block,
+static void DFS(Region* block, vector<Region*>& result, unordered_set<Region*> cycleBlocks)
-    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())
+        if (cycleBlocks.find(nextBlock) != cycleBlocks.end())
-            continue;
+            DFS(nextBlock, result, cycleBlocks);
-        if (!DFS(nextBlock, result, cycleBlocks, color))
-            return false;
     }
-    color[block] = 1;
     result.push_back(block);
-    return true;
 }
 
-bool HasCycle(Region* block, const std::set<Region*>& cycleBlocks, std::set<Region*>& visitedBlocks)
+void TopologySort(std::vector<Region*>& basikBlocks, Region* header)
 {
-    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;
-}
-
-bool TopologySort(std::vector<Region*>& basikBlocks, Region* header)
-{
-    set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
     vector<Region*> result;
-    map<Region*, int> color;
+    unordered_set<Region*> cycleBlocks(basikBlocks.begin(), basikBlocks.end());
-    if (!DFS(header, result, cycleBlocks, color))
+    DFS(header, result, cycleBlocks);
-        return false;
     reverse(result.begin(), result.end());
-    basikBlocks = move(result);
+    basikBlocks = result;
-    return true;
 }
 
-static void SetConnections(map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const set<SAPFOR::BasicBlock*>& blockSet)
+static void SetConnections(unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const unordered_set<SAPFOR::BasicBlock*>& blockSet)
 {
     for (SAPFOR::BasicBlock* block : blockSet)
     {
@@ -315,7 +290,7 @@ static void SetConnections(map<SAPFOR::BasicBlock*, Region*>& bbToRegion, const
     }
 }
 
-static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
+static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks, unordered_map<SAPFOR::BasicBlock*, Region*>& bbToRegion)
 {
     Region* region = new Region;
     auto [header, blockSet] = GetBasicBlocksForLoop(loop, Blocks);
@@ -338,15 +313,14 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
             continue;
         region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    if (!TopologySort(region->getBasickBlocks(), region->getHeader()))
+    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);
-    map<SAPFOR::BasicBlock*, Region*> bbToRegion;
+    unordered_map<SAPFOR::BasicBlock*, Region*> bbToRegion;
     for (auto poiner : blockSet)
     {
         bbToRegion[poiner] = new Region(*poiner);
@@ -364,6 +338,5 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
             continue;
         subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
     }
-    if (!TopologySort(basickBlocks, this->header))
+    TopologySort(basickBlocks, this->header);
-        throw std::runtime_error("Unnoticed cycle");
 }

src/PrivateAnalyzer/region.h

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

src/Sapfor.cpp

@@ -23,7 +23,6 @@
 #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"
@@ -742,7 +741,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);
+            bool removeDvm = (curr_regime == REMOVE_DVM_DIRS || 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);
@@ -944,7 +943,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
             }
         }
         else if (curr_regime == MOVE_OPERATORS)        
-            moveOperators(file, fullIR, countOfTransform);
+            moveOperators(file, loopGraph, fullIR, countOfTransform);        
         else if (curr_regime == PRIVATE_REMOVING_ANALYSIS)
         {
             auto itFound = loopGraph.find(file->filename());
@@ -1265,8 +1264,6 @@ 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);
     }
@@ -1684,12 +1681,31 @@ 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)
     {
-        if (ignoreArrayDistributeState) 
+        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);
@@ -1905,13 +1921,10 @@ 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);
-    else if (curr_regime == ARRAY_PROPAGATION_RESTORE)
-        restoreArrays();
 
     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.;
@@ -2366,7 +2379,6 @@ 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:

src/Sapfor.h

@@ -88,8 +88,6 @@ enum passes {
     REMOVE_DVM_INTERVALS,
     VERIFY_DVM_DIRS,
 
-    MERGE_REGIONS,
-
     REMOVE_DIST_ARRAYS_FROM_IO,
 
     SUBST_EXPR,
@@ -192,7 +190,6 @@ enum passes {
 
     TRANSFORM_ASSUMED_SIZE_PARAMETERS,
     ARRAY_PROPAGATION,
-    ARRAY_PROPAGATION_RESTORE,
 
     TEST_PASS,
     EMPTY_PASS
@@ -276,7 +273,6 @@ 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";
@@ -385,7 +381,7 @@ static void setPassValues()
 
     passNames[TRANSFORM_ASSUMED_SIZE_PARAMETERS] = "TRANSFORM_ASSUMED_SIZE_PARAMETERS";
     passNames[ARRAY_PROPAGATION] = "ARRAY_PROPAGATION";
-    passNames[ARRAY_PROPAGATION_RESTORE] = "ARRAY_PROPAGATION_RESTORE";
+
     passNames[TEST_PASS] = "TEST_PASS";
 }
 

src/Transformations/ArrayConstantPropagation/propagation.cpp

@@ -1,630 +0,0 @@
-#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;
-static set<SgStatement*> statementsToRemove;
-static 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);
-}
-
-void restoreArrays()
-{
-    for (auto& [filename, statements] : expToChange)
-    {
-        if (SgFile::switchToFile(filename) == -1)
-            continue;
-        for (auto& [statement, statementCopy] : statements)
-        {
-            if (statement && statementCopy)
-            {
-                for (int i = 0; i < 3; i++)
-                {
-                    statement->setExpression(i, statementCopy->expr(i));
-                }
-
-            }
-        }
-    }
-
-    for (SgStatement* st : statementsToRemove)
-    {
-        SgFile::switchToFile(st->fileName());
-        st->deleteStmt();
-    }
-}

src/Transformations/ArrayConstantPropagation/propagation.h

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

src/Transformations/FunctionInlining/inliner.cpp

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

src/Transformations/FunctionPurifying/function_purifying.cpp

@@ -234,64 +234,9 @@ static bool hasDvmParallel(SgStatement *func)
     return false;
 }
 
-static map<FuncInfo*, bool> createDvmParallelInfo(const map<string, vector<FuncInfo*>>& allFuncInfo) {
-    map<FuncInfo*, bool> hasDvmParallelMap;
-
-    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;
-
-            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)
     {
@@ -304,7 +249,7 @@ void transformAssumedSizeParameters(const map<string, vector<FuncInfo*>>& allFun
             if (prog == NULL)
                 continue;
 
-            if (!hasDvmParallelMap.at(func))
+            if (!hasDvmParallel(prog))
                 continue;
 
             vector<SgSymbol*> parNames;
@@ -314,8 +259,7 @@ 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/MoveOperators/move_operators.cpp

@@ -17,6 +17,10 @@
 
 using namespace std;
 
+// Provided by Sage runtime (declared in libSage++.h)
+extern SgFile *current_file;
+
+
 set<int> loop_tags = {FOR_NODE};
 set<int> control_tags = {IF_NODE, ELSEIF_NODE, DO_WHILE_NODE, WHILE_NODE, LOGIF_NODE};
 set<int> control_end_tags = {CONTROL_END};
@@ -52,25 +56,13 @@ static vector<SAPFOR::IR_Block*> findInstructionsFromStatement(SgStatement* st,
 
 vector<SAPFOR::BasicBlock*> findFuncBlocksByFuncStatement(SgStatement *st, const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR) {
     vector<SAPFOR::BasicBlock*> result;
-    if (!st)
-        return result;
-
     Statement* forSt = (Statement*)st;
-    const string stmtFile = st->fileName();
-    const int stmtLine = st->lineNumber();
 
     for (auto& func: FullIR) {
-        if (!func.first || !func.first->funcPointer)
+        if (func.first->funcPointer->getCurrProcessFile() == forSt->getCurrProcessFile()
-            continue;
+            && func.first->funcPointer->lineNumber() == forSt->lineNumber())
-
-        const string funcFile = func.first->fileName;
-        const int funcLine = func.first->funcPointer->lineNumber();
-
-        // Important: select CFG blocks only for the same file and function header.
-        if (funcFile == stmtFile && funcLine == stmtLine)
         {
             result = func.second;
-            break;
         }
     }
     return result;
@@ -171,60 +163,40 @@ static map<SgStatement*, vector<SgStatement*>> analyzeBasicBlockIntraDependencie
         if (!instr)
             return string();
         SgExpression* ex = instr->getExpression();
-        if (!ex)
+        if (!ex || !ex->unparse())
             return string();
+        auto normalizeExprText = [](const string& raw) -> string
+        {
+            string t;
+            t.reserve(raw.size());
+            for (unsigned char c : raw)
+                if (!std::isspace(c))
+                    t.push_back((char)c);
 
-        auto exprKey = [&](auto&& self, SgExpression* e) -> string
+            auto stripOneLayer = [](const string& x) -> string
             {
-            if (!e)
+                if (x.size() < 2 || x.front() != '(' || x.back() != ')')
-                return string("_");
+                    return x;
-
+                int bal = 0;
-            if (auto* ar = isSgArrayRefExp(e))
+                for (size_t i = 0; i + 1 < x.size(); ++i)
                 {
-                SgSymbol* sym = ar->symbol() ? OriginalSymbol(ar->symbol()) : nullptr;
+                    if (x[i] == '(') bal++;
-                string key = string("A(") + (sym ? sym->identifier() : "?");
+                    else if (x[i] == ')') bal--;
-                const int n = ar->numberOfSubscripts();
+                    if (bal == 0 && i + 1 < x.size() - 1)
-                for (int i = 0; i < n; ++i)
+                        return x;
-                {
-                    key += ",";
-                    key += self(self, ar->subscript(i));
                 }
-                key += ")";
+                return x.substr(1, x.size() - 2);
-                return key;
-            }
-
-            if (e->variant() == VAR_REF || e->variant() == CONST_REF)
-            {
-                SgSymbol* sym = e->symbol() ? OriginalSymbol(e->symbol()) : nullptr;
-                return string((e->variant() == VAR_REF) ? "V(" : "C(") + (sym ? sym->identifier() : "?") + ")";
-            }
-
-            if (auto* v = isSgValueExp(e))
-            {
-                if (e->variant() == INT_VAL)
-                    return string("I(") + to_string(v->intValue()) + ")";
-                if (e->variant() == BOOL_VAL)
-                    return string("B(") + (v->boolValue() ? "1" : "0") + ")";
-                if (e->variant() == CHAR_VAL)
-                    return string("CH(") + string(1, v->charValue()) + ")";
-                if (e->variant() == FLOAT_VAL)
-                    return string("F(") + (v->floatValue() ? v->floatValue() : "") + ")";
-                if (e->variant() == DOUBLE_VAL)
-                    return string("D(") + (v->doubleValue() ? v->doubleValue() : "") + ")";
-                if (e->variant() == STRING_VAL)
-                    return string("S(") + (v->stringValue() ? v->stringValue() : "") + ")";
-            }
-
-            string key = string("N(") + to_string(e->variant());
-            if (e->lhs())
-                key += ",L=" + self(self, e->lhs());
-            if (e->rhs())
-                key += ",R=" + self(self, e->rhs());
-            key += ")";
-            return key;
             };
-
+            while (true)
-        return "MEMEX#" + exprKey(exprKey, ex);
+            {
+                const string stripped = stripOneLayer(t);
+                if (stripped == t)
+                    break;
+                t = stripped;
+            }
+            return t;
+        };
+        return "MEMEX#" + normalizeExprText(ex->unparse());
     };
 
     auto isBarrier = [&](const SAPFOR::Instruction* instr) -> bool
@@ -327,9 +299,6 @@ static map<SgStatement*, vector<SgStatement*>> analyzeBasicBlockIntraDependencie
 
         addDep(instr->getArg1());
         addDep(instr->getArg2());
-        if (instr->getOperation() == SAPFOR::CFG_OP::RANGE)
-            addDep(instr->getResult());
-
         if (instr->getOperation() == SAPFOR::CFG_OP::STORE || instr->getOperation() == SAPFOR::CFG_OP::REC_REF_STORE)
             addDep(instr->getResult());
 
@@ -377,7 +346,7 @@ static map<SgStatement*, vector<SgStatement*>> analyzeBasicBlockIntraDependencie
     return result;
 }
 
-static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb, const char* expectedFile)
+static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb)
 {
     if (!bb)
         return false;
@@ -407,18 +376,6 @@ static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb, const
     if (ops.size() < 2)
         return false;
 
-    // Check that analyzed BB is in the same file as the expected file
-    const char* bbFile = ops.front()->fileName();
-    if (!bbFile)
-        bbFile = "(unknown)";
-    if (expectedFile && strcmp(expectedFile, bbFile) != 0)
-        return false;
-    for (auto* st : ops)
-    {
-        if (!st || !st->fileName() || strcmp(st->fileName(), bbFile) != 0)
-            return false;
-    }
-
     SgStatement* parent = ops.front()->controlParent();
     if (!parent)
         return false;
@@ -471,45 +428,59 @@ static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb, const
     const auto depsMap = analyzeBasicBlockIntraDependencies(bb);
     vector<SgStatement*> order = ops;
 
-    auto indexIn = [](const vector<SgStatement*>& v, SgStatement* s) -> int
+    auto buildPos = [&](const vector<SgStatement*>& v)
     {
+        map<SgStatement*, int> pos;
         for (int i = 0; i < (int)v.size(); ++i)
-            if (v[i] == s)
+            pos[v[i]] = i;
-                return i;
+        return pos;
-        return -1;
     };
 
-    for (SgStatement* s : ops)
+    const int maxIterations = (int)order.size() * (int)order.size() + 10;
+    bool anyMove = false;
+    for (int iter = 0; iter < maxIterations; ++iter)
     {
-        auto itDeps = depsMap.find(s);
+        bool movedThisIter = false;
-        if (itDeps == depsMap.end() || itDeps->second.empty())
+        const auto pos = buildPos(order);
-            continue;
 
-        int posS = indexIn(order, s);
+        for (int i = 0; i < (int)order.size(); ++i)
-        if (posS < 0)
+        {
+            SgStatement* curSt = order[i];
+            auto it = depsMap.find(curSt);
+            if (it == depsMap.end() || it->second.empty())
                 continue;
 
             int lastDepIdx = -1;
-        for (SgStatement* dep : itDeps->second)
+            for (SgStatement* dep : it->second)
             {
-            const int j = indexIn(order, dep);
+                auto itP = pos.find(dep);
-            if (j >= 0)
+                if (itP != pos.end())
-                lastDepIdx = max(lastDepIdx, j);
+                    lastDepIdx = max(lastDepIdx, itP->second);
             }
             if (lastDepIdx < 0)
                 continue;
 
-        if (posS == lastDepIdx + 1)
+            int target = lastDepIdx + 1;
+            if (target == i)
                 continue;
 
-        order.erase(order.begin() + posS);
+            SgStatement* moved = order[i];
+            order.erase(order.begin() + i);
+            if (target > i)
+                target -= 1;
+            if (target < 0)
+                target = 0;
+            if (target > (int)order.size())
+                target = (int)order.size();
+            order.insert(order.begin() + target, moved);
 
-        int lp = lastDepIdx;
+            movedThisIter = true;
-        if (posS < lastDepIdx)
+            anyMove = true;
-            lp = lastDepIdx - 1;
+            break;
+        }
 
-        const int insertAt = lp + 1;
+        if (!movedThisIter)
-        order.insert(order.begin() + insertAt, s);
+            break;
     }
 
     bool changed = false;
@@ -580,23 +551,38 @@ static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb, const
     return true;
 }
 
-void moveOperators(SgFile* file, const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform) {
+void moveOperators(SgFile *file, map<string, vector<LoopGraph*>>& loopGraph, 
-    if (!file)
+                   const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, 
-        return;
+                   int& countOfTransform) {
-    if (SgFile::switchToFile(file->filename()) == -1)
+    // Correct usage pattern in this project:
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    // save current file -> switch -> work on current_file -> restore.
-    const int funcNum = file->numberOfFunctions();
+    const string oldFileName = (current_file ? current_file->filename() : "");
+
+    for (const auto& [fileName, _] : loopGraph)
+    {
+        if (SgFile::switchToFile(fileName.c_str()) == -1)
+            continue;
+
+        SgFile* curFile = current_file;
+        if (!curFile)
+            continue;
+
+        const int funcNum = curFile->numberOfFunctions();
         for (int i = 0; i < funcNum; ++i)
         {
-        SgStatement* st = file->functions(i);
+            SgStatement* st = curFile->functions(i);
 
             const auto loopBlocks = findBlocksInLoopsByFullIR(st, FullIR);
             for (auto* bb : loopBlocks)
             {
                 if (!bb)
                     continue;
-            if (reorderOperatorsInBasicBlockUsingDeps(bb, file->filename()))
+                if (reorderOperatorsInBasicBlockUsingDeps(bb))
                     countOfTransform += 1;
             }
         }
+    }
+
+    if (!oldFileName.empty())
+        SgFile::switchToFile(oldFileName.c_str());
 }

src/Transformations/MoveOperators/move_operators.h

@@ -3,4 +3,4 @@
 #include "../../GraphLoop/graph_loops.h"
 #include "../../CFGraph/CFGraph.h"
 
-void moveOperators(SgFile* file, const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform);
+void moveOperators(SgFile *file, std::map<std::string, std::vector<LoopGraph*>>& loopGraph, const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR, int& countOfTransform);

src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp

@@ -504,7 +504,7 @@ static void replaceArrayInFragment(SgSymbol* replace_symb,
     }
 }
 
-static bool ioRegionBorder(SgStatement* stat, SgStatement* last_io_bound)
+static bool ioReginBorder(SgStatement* stat, SgStatement* last_io_bound)
 {
     auto var = stat->variant();
 
@@ -535,24 +535,14 @@ static bool ioRegionBorder(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,
@@ -572,8 +562,6 @@ 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__);
@@ -600,12 +588,13 @@ 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)
@@ -615,7 +604,18 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
 
                     if (var == PROC_HEDR || var == PROG_HEDR || var == FUNC_HEDR)
                     {
-                        current_func_info = getCurrentFuncInfo(func_info_it->second, curr_stmt->lineNumber());
+                        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__);
 
                         curr_stmt = curr_stmt->lexNext();
                         while (curr_stmt && !isSgExecutableStatement(curr_stmt))
@@ -628,7 +628,7 @@ void replaceDistributedArraysInIO(vector<ParallelRegion*>& regions,
                             break;
                     }
 
-                    if (ioRegionBorder(curr_stmt, last_io_bound))
+                    if (ioReginBorder(curr_stmt, last_io_bound))
                     {
                         for (const auto& by_array_to_copy : need_replace)
                         {

src/Utils/PassManager.h

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

src/VisualizerCalls/get_information.cpp

@@ -1809,13 +1809,6 @@ 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)
@@ -2526,8 +2519,6 @@ 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;