Clean up

src/DirectiveProcessing/directive_creator_base.cpp

@@ -1601,7 +1601,7 @@ static bool matchParallelAndDist(const pair<DIST::Array*, const DistrVariant*>&
         parallelOn = NULL;
         for (auto& refOn : realRefs)
         {
-            linkWithTempl = refOn->GetLinksWithTemplate(regionId);
+            linkWithTempl = parallelOn->GetLinksWithTemplate(regionId);
             int z = 0;
             for (int k = 0; k < linkWithTempl.size(); ++k)
                 if (linkWithTempl[k] != -1)

src/Distribution/Array.h

@@ -9,7 +9,6 @@
 #include "DvmhDirectiveBase.h"
 #include "../Utils/utils.h"
 #include "../Utils/errors.h"
-#include "../Utils/json.hpp"
 
 class Symbol;
 class Expression;
@@ -21,7 +20,6 @@ struct FuncInfo;
 #define MAP std::map
 #define SET std::set
 #define TO_STR std::to_string
-#define JSON nlohmann::json
 
 #if __SPF
 extern int sharedMemoryParallelization;
@@ -106,7 +104,7 @@ namespace Distribution
         MAP<STRING, SET<int>> usagePlaces;
 
         VECTOR<bool> mappedDims;
-        VECTOR<bool> deprecateToDistribute;
+        VECTOR<bool> depracateToDistribute;
 
         bool ompThreadPrivate;
         bool privateInLoop;
@@ -171,7 +169,7 @@ namespace Distribution
             sizes.resize(dimSize);
             sizesExpr.resize(dimSize);
             mappedDims.resize(dimSize);
-            deprecateToDistribute.resize(dimSize);
+            depracateToDistribute.resize(dimSize);
 
             for (int z = 0; z < dimSize; ++z)
             {
@@ -179,7 +177,7 @@ namespace Distribution
                 PAIR<int, int> initVal = std::make_pair(0, 0);
                 sizesExpr[z] = std::make_pair(std::make_pair((Expression*)NULL, initVal), std::make_pair((Expression*)NULL, initVal));
                 mappedDims[z] = false;
-                deprecateToDistribute[z] = false;
+                depracateToDistribute[z] = false;
             }
                         
             GenUniqKey();
@@ -214,7 +212,7 @@ namespace Distribution
             uniqKey = copy.uniqKey;
             containsInRegions = copy.containsInRegions;
             mappedDims = copy.mappedDims;
-            deprecateToDistribute = copy.deprecateToDistribute;
+            depracateToDistribute = copy.depracateToDistribute;
             ompThreadPrivate = copy.ompThreadPrivate;
             privateInLoop = copy.privateInLoop;
             inEquivalence = copy.inEquivalence;
@@ -226,7 +224,7 @@ namespace Distribution
             int countToRem = 0;
             for (int z = 0; z < dimSize; ++z)
             {
-                if (!mappedDims[z] || deprecateToDistribute[z])
+                if (!mappedDims[z] || depracateToDistribute[z])
                 {
                     needToRemove = true;
                     countToRem++;
@@ -246,19 +244,19 @@ namespace Distribution
 
             for (int z = 0; z < dimSize; ++z)
             {
-                if (mappedDims[z] && !deprecateToDistribute[z])
+                if (mappedDims[z] && !depracateToDistribute[z])
                 {
                     newSizes.push_back(sizes[z]);
                     newSizesExpr.push_back(sizesExpr[z]);
                     newMappedDims.push_back(mappedDims[z]);
-                    newDepr.push_back(deprecateToDistribute[z]);
+                    newDepr.push_back(depracateToDistribute[z]);
                 }
             }
 
             sizes = newSizes;
             sizesExpr = newSizesExpr;
             mappedDims = newMappedDims;
-            deprecateToDistribute = newDepr;
+            depracateToDistribute = newDepr;
             dimSize = (int)sizes.size();
 
             return false;
@@ -426,64 +424,48 @@ namespace Distribution
 
         void ClearShadowSpecs() { allShadowSpecs.clear(); }
 
-        JSON toJson()
+        STRING toString()
         {
-            JSON retVal;
+            STRING retVal = "";
+            retVal += TO_STR(id);
+            retVal += "#" + name;
+            retVal += "#" + shortName;
+            retVal += "#" + TO_STR(dimSize);
+            retVal += "#" + TO_STR(typeSize);
+            retVal += "#" + TO_STR(isNonDistribute);
+            
+            retVal += "#" + TO_STR(locationPos.first);
+            retVal += "#" + locationPos.second;
 
-            retVal["id"] = (int64_t)id;
-            retVal["name"] = name;
-            retVal["shortName"] = shortName;
-            retVal["packedAddress"] = std::to_string((long long)this);
-
-            retVal["dimSize"] = dimSize;
-            retVal["typeSize"] = typeSize;
-            retVal["state"] = (int)isNonDistribute;
-            retVal["location"] = (int)locationPos.first;
-            retVal["locName"] = locationPos.second;
-
-            retVal["isTemplFlag"] = (int)isTemplFlag;
-            retVal["isLoopArrayFlag"] = (int)isLoopArrayFlag;
-
-            JSON deprToDist = nlohmann::json::array();
-            for (int i = 0; i < deprecateToDistribute.size(); ++i)
-                deprToDist.push_back((int)deprecateToDistribute[i]);
-            retVal["deprecateToDist"] = deprToDist;
-
-            JSON mappedDimsJ = nlohmann::json::array();
-            for (int i = 0; i < mappedDims.size(); ++i)
-                mappedDimsJ.push_back((int)mappedDims[i]);
-            retVal["mappedDims"] = mappedDimsJ;
-
-            JSON sizesJ = nlohmann::json::array();
+            retVal += "#" + TO_STR(sizes.size());
             for (int i = 0; i < sizes.size(); ++i)
-            {
-                JSON pair;
-                pair["key"] = sizes[i].first;
-                pair["value"] = sizes[i].second;
-                sizesJ.push_back(pair);
-            }
-            retVal["sizes"] = sizesJ;
+                retVal += "#" + TO_STR(sizes[i].first) + "#" + TO_STR(sizes[i].second);
 
-            JSON regions = nlohmann::json::array();
-            for (auto& reg : containsInRegions)
-                regions.push_back(reg);
-            retVal["regions"] = regions;
+            retVal += "#" + TO_STR(depracateToDistribute.size());
+            for (int i = 0; i < depracateToDistribute.size(); ++i)
+                retVal += "#" + TO_STR((int)depracateToDistribute[i]);
 
+            retVal += "#" + TO_STR(mappedDims.size());
+            for (int i = 0; i < mappedDims.size(); ++i)
+                retVal += "#" + TO_STR((int)mappedDims[i]);
 
-            JSON declPlacesJ = nlohmann::json::array();
-            for (auto& place : declPlaces)
-            {
-                JSON elem;
-                elem["file"] = place.first;
-                elem["line"] = place.second;
+            retVal += "#" + TO_STR(templateInfo.size());
+            for (auto it = templateInfo.begin(); it != templateInfo.end(); ++it)
+                retVal += "#" + TO_STR(it->first) + it->second->toString();
+            
+            retVal += "#" + TO_STR((int)isTemplFlag);
+            retVal += "|" + TO_STR((int)isLoopArrayFlag);
+            retVal += "|" + TO_STR(declPlaces.size());
 
-                declPlacesJ.push_back(elem);
-            }
-            retVal["declPlaces"] = declPlacesJ;
+            for (auto &place : declPlaces)
+                retVal += "|" + place.first + "|" + TO_STR(place.second);
 
+            retVal += "|" + TO_STR(containsInRegions.size());
+            for (auto &reg : containsInRegions)
+                retVal += "|" + reg;
             return retVal;
         }
-        
+
         Array* GetTemplateArray(const uint64_t regionId, bool withCheck = true)
         {
             TemplateLink *currLink = getTemlateInfo(regionId, withCheck);
@@ -605,13 +587,13 @@ namespace Distribution
         {
             if (dim >= dimSize)
                 return;
-            deprecateToDistribute[dim] = value;
+            depracateToDistribute[dim] = value;
         }
 
         void DeprecateAllDims()
         {
             for (int dim = 0; dim < dimSize; ++dim)
-                deprecateToDistribute[dim] = true;
+                depracateToDistribute[dim] = true;
         }
 
         bool IsDimDepracated(const int dim) const
@@ -621,9 +603,9 @@ namespace Distribution
             else
             {
                 if (templateDimsOrder.size() == 0)
-                    return deprecateToDistribute[dim];
+                    return depracateToDistribute[dim];
                 else
-                    return deprecateToDistribute[templateDimsOrder[dim]];
+                    return depracateToDistribute[templateDimsOrder[dim]];
             }
         }
         
@@ -631,11 +613,11 @@ namespace Distribution
         {
             bool ret = true;
             for (int z = 0; z < dimSize; ++z)
-                ret = ret && deprecateToDistribute[z];
+                ret = ret && depracateToDistribute[z];
             return ret;
         }
 
-        const VECTOR<bool>& GetDeprecetedDims() const { return deprecateToDistribute; }
+        const VECTOR<bool>& GetDeprecetedDims() const { return depracateToDistribute; }
 
         int GetTypeSize() const { return typeSize; }
 

src/Distribution/DvmhDirective.cpp

@@ -199,6 +199,15 @@ static set<string> fillUsedSymbols(SgStatement *loop)
     return usedS;
 }
 
+static string correctSymbolModuleName(const string& origFull)
+{
+    auto it = origFull.find("::");
+    if (it == string::npos)
+        return origFull;
+    else
+        return origFull.substr(it + 2);
+}
+
 static SgStatement* getModuleScope(const string& origFull, vector<SgStatement*>& moduleList, SgStatement *local)
 {
     auto it = origFull.find("::");
@@ -950,7 +959,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 SgSymbol* redS;
                 string clearName = correctSymbolModuleName(red);
                 if (clearName != red)
-                    redS = getNameInLocation(parentFunc, red, getModuleScope(red, moduleList, parentFunc)->symbol()->identifier());
+                    redS = getNameInLocation(parentFunc, clearName, getModuleScope(red, moduleList, parentFunc)->symbol()->identifier());
                 else
                     redS = findSymbolOrCreate(file, clearName, NULL, parentFunc);
 
@@ -1008,12 +1017,12 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 string clearName2 = correctSymbolModuleName(get<1>(list));
 
                 if (clearName1 != get<0>(list))
-                    redS1 = getNameInLocation(parentFunc, get<0>(list), getModuleScope(get<0>(list), moduleList, parentFunc)->symbol()->identifier());
+                    redS1 = getNameInLocation(parentFunc, clearName1, getModuleScope(get<0>(list), moduleList, parentFunc)->symbol()->identifier());
                 else
                     redS1 = findSymbolOrCreate(file, clearName1, NULL, parentFunc);
 
                 if (clearName2 != get<1>(list))
-                    redS2 = getNameInLocation(parentFunc, get<1>(list), getModuleScope(get<1>(list), moduleList, parentFunc)->symbol()->identifier());
+                    redS2 = getNameInLocation(parentFunc, clearName2, getModuleScope(get<1>(list), moduleList, parentFunc)->symbol()->identifier());
                 else
                     redS2 = findSymbolOrCreate(file, clearName2, NULL, parentFunc);
 

src/Distribution/DvmhDirectiveBase.cpp

@@ -12,8 +12,6 @@
 #include "../Distribution/GraphCSR.h"
 #include "../Utils/errors.h"
 #include "../Utils/utils.h"
-#include "../Utils/json.hpp"
-
 #include "../GraphCall/graph_calls_func.h"
 
 using std::vector;
@@ -29,8 +27,6 @@ using std::make_pair;
 using std::min;
 using std::max;
 
-using nlohmann::json;
-
 template<typename setT>
 static void uniteSets(const set<setT> &first, const set<setT> &second, set<setT> &result)
 {
@@ -736,34 +732,30 @@ string AlignRuleBase::GenRuleBase() const
     return retVal;
 }
 
-json AlignRuleBase::toJson()
+string AlignRuleBase::toString()
 {
-    json retVal;
+    string retVal = "";
 
-    retVal["packedAlignArrayAddress"] = alignArray ? std::to_string((long long)alignArray) : std::to_string((long long)-1);
-    retVal["packedAlignWithAddress"] = alignWith ? std::to_string((long long)alignWith) : std::to_string((long long)-1);
+    if (alignArray)
+        retVal += "#" + std::to_string((long long)alignArray);
+    else
+        retVal += "#-1";
 
-    json alignRules = json::array();
-    for (auto& rule : alignRule)
-    {
-        json pair;
-        pair["key"] = rule.first;
-        pair["value"] = rule.second;
-        alignRules.push_back(pair);
-    }
-    retVal["alignRule"] = alignRules;
+    if (alignWith)
+        retVal += "#" + std::to_string((long long)alignWith);
+    else
+        retVal += "#-1";
 
-    json alignRuleWithJ = json::array();
-    for (auto& [dimNum, AB] : alignRuleWith)
-    {
-        json tuple;
-        tuple["dimNum"] = dimNum;
-        tuple["a"] = AB.first;
-        tuple["b"] = AB.second;
+    retVal += "#" + std::to_string(alignRule.size());
+    for (int i = 0; i < alignRule.size(); ++i)
+        retVal += "#" + std::to_string(alignRule[i].first) + "#" + std::to_string(alignRule[i].second);
+
+    retVal += "#" + std::to_string(alignRuleWith.size());
+    for (int i = 0; i < alignRuleWith.size(); ++i)
+        retVal += "#" + std::to_string(alignRuleWith[i].first)
+        + "#" + std::to_string(alignRuleWith[i].second.first)
+        + "#" + std::to_string(alignRuleWith[i].second.second);
 
-        alignRuleWithJ.push_back(tuple);
-    }
-    retVal["alignRuleWith"] = alignRuleWithJ;
     return retVal;
 }
 

src/Distribution/DvmhDirectiveBase.h

@@ -3,8 +3,6 @@
 #include <vector>
 #include <string>
 
-#include "../Utils/json.hpp"
-
 typedef enum lang : int { LANG_C, LANG_F } language;
 typedef enum dist : int { BLOCK, NONE } distType;
 typedef std::pair<std::pair<int, int>, std::pair<int, int>> attrType;
@@ -50,7 +48,7 @@ public:
 
 public:
     std::string GenRuleBase() const;
-    nlohmann::json toJson();
+    std::string toString();
 
 public:
     DIST::Array *alignArray;

src/ParallelizationRegions/ParRegions.h

@@ -11,8 +11,6 @@
 #include "../Distribution/Distribution.h"
 #include "../Utils/AstWrapper.h"
 
-#include "../Utils/json.hpp"
-
 #if __SPF
 #include "../Utils/SgUtils.h"
 #endif
@@ -237,42 +235,35 @@ public:
         return retVal;
     }
 
-    nlohmann::json toJson()
+    std::string toString()
     {
-        nlohmann::json retVal;
+        std::string retVal = "";
 
-        retVal["packedRegionId"] = std::to_string(regionId);
-        retVal["originalName"] = originalName;
+        retVal += "#" + std::to_string(regionId);
+        retVal += "#" + originalName;
+        retVal += "#" + std::to_string(lines.size());
 
-        nlohmann::json arrays = nlohmann::json::array();
-        for (auto& array : allArrays.GetArrays())
-            arrays.push_back(array->toJson());
-        retVal["packedArrays"] = arrays;
-
-        nlohmann::json linesInfo = nlohmann::json::array();
-        for (auto& [file, linesByFile] : lines)
+        for (auto it = lines.begin(); it != lines.end(); ++it)
         {
-            nlohmann::json linesRegs;
-            nlohmann::json lines = nlohmann::json::array();
-
-            for (auto& elem : linesByFile)
-            {
-                JSON pair;
-                pair["key"] = elem.lines.first;
-                pair["value"] = elem.lines.second;
-                lines.push_back(pair);
-            }
-            linesRegs["file"] = file;
-            linesRegs["lines"] = lines;
-
-            linesInfo.push_back(linesRegs);
+            retVal += "|" + it->first + "|";
+            retVal += std::to_string(it->second.size());
+            for (int i = 0; i < it->second.size(); ++i)
+                retVal += "#" + std::to_string(it->second[i].lines.first) + "#" + std::to_string(it->second[i].lines.second);
         }
-        retVal["regionsLines"] = linesInfo;
 
-        nlohmann::json alignRules = nlohmann::json::array();
-        for (auto& rule : dataDirectives.alignRules)
-            alignRules.push_back(rule.toJson());
-        retVal["alignRules"] = alignRules;
+        const std::set<DIST::Array*> &arrays = allArrays.GetArrays();
+        retVal += "#" + std::to_string(arrays.size());
+
+        //create map<array_address, DIST::Array_toString()> 
+        for (auto it = arrays.begin(); it != arrays.end(); ++it)
+        {
+            retVal += "#" + std::to_string((long long)(*it));
+            retVal += "#" + (*it)->toString();
+        }
+
+        retVal += "#" + std::to_string(dataDirectives.alignRules.size());
+        for (int i = 0; i < dataDirectives.alignRules.size(); ++i)
+            retVal += dataDirectives.alignRules[i].toString();
 
         return retVal;
     }

src/Predictor/PredictScheme.h

@@ -2,7 +2,6 @@
 #include <vector>
 #include "dvm.h"
 #include "../GraphCall/graph_calls.h"
-#include "../Utils/json.hpp"
 
 class ParallelStats
 {
@@ -12,10 +11,10 @@ public:
         RemoteCount = ShadowCount = ReductionCount = AcrossCount = 0;
     }
      
-    int RemoteCount = 0;
-    int ShadowCount = 0;
-    int ReductionCount = 0;
-    int AcrossCount = 0;
+    int RemoteCount;
+    int ShadowCount;
+    int ReductionCount;
+    int AcrossCount;
 };
 
 class PredictorStats
@@ -28,32 +27,28 @@ public:
     }
      
     ParallelStats ParallelStat;
-    int ParallelCount = 0;
-    int RemoteCount = 0;
-    int RedistributeCount = 0;
-    int IntervalCount = 0;
-    int TotalScoreComm = 0;
-    int TotalScorePar = 0;
-    int TotalScoreDist = 0;
+    int ParallelCount;
+    int RemoteCount;
+    int RedistributeCount;
+    int IntervalCount;
+    int TotalScoreComm;
+    int TotalScorePar;
+    int TotalScoreDist;
 
-    nlohmann::json toJson()
+    std::string to_string()
     {
-        nlohmann::json stat;
+        std::string res = "";
+        res += std::to_string(ParallelCount) + "|";
+        res += std::to_string(RemoteCount) + "|";
+        res += std::to_string(RedistributeCount) + "|";
+        res += std::to_string(IntervalCount) + "|";
 
-        stat["ParallelCount"] = ParallelCount;
-        stat["RemoteCount"] = RemoteCount;
-        stat["RedistributeCount"] = RedistributeCount;
-        stat["IntervalCount"] = IntervalCount;
+        res += std::to_string(ParallelStat.RemoteCount) + "|";
+        res += std::to_string(ParallelStat.ShadowCount) + "|";
+        res += std::to_string(ParallelStat.ReductionCount) + "|";
+        res += std::to_string(ParallelStat.AcrossCount);
 
-        stat["PS_RemoteCount"] = ParallelStat.RemoteCount;
-        stat["PS_ShadowCount"] = ParallelStat.ShadowCount;
-        stat["PS_ReductionCount"] = ParallelStat.ReductionCount;
-        stat["PS_AcrossCount"] = ParallelStat.AcrossCount;
-
-        //TODO: need to improve
-        //                    (summed.TotalScoreComm != 0 ? 1.0 / summed.TotalScoreComm : 0.0) + (double)summed.TotalScorePar * 1000 + (countOfDist == 0 ? -5000 : countOfDist);
-        stat["TotalScore"] = -1 * (ParallelStat.RemoteCount + ParallelStat.ShadowCount + ParallelStat.ReductionCount + ParallelStat.AcrossCount);
-        return stat;
+        return res;
     }
 };
 

src/ProjectManipulation/ParseFiles.cpp

@@ -387,50 +387,7 @@ static string shiftLines(const string &in, const map<string, const FileInfo*> &m
     return newStr;
 }
 
-static void addMessage(const string& in, const map<string, const FileInfo*>& mapOfFiles,
-                       const FileInfo* currF, map<string, vector<Messages>>& messages, typeMessage type)
-{
-    int byNum = 0;
-
-    auto it = in.find("on line ");
-    if (it != string::npos)
-        it += strlen("on line ");
-
-    int line = 0;
-    sscanf(in.c_str() + it, "%d", &line);
-
-    auto it1 = in.find("of", it + 1);
-    if (it1 == string::npos)
-        return;
-    it1 += 3;
-
-    string fileN = in.substr(it1, in.find(':', it1) - it1);
-    auto itF = mapOfFiles.find(fileN);
-    if (itF != mapOfFiles.end() && itF->second != currF)
-    {
-        byNum = itF->second->includesAdded;
-        if (byNum != 0)
-        {
-            if (line - byNum <= 0)
-            {
-                //return in;
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-            }
-            else
-                line -= byNum;
-        }
-    }
-    
-    const string newStr = in.substr(0, it) + std::to_string(line) + in.substr(in.find(' ', it + 1));
-
-    wstring messageE, messageR;
-    __spf_printToLongBuf(messageE, L"%s", to_wstring(newStr).c_str());
-    __spf_printToLongBuf(messageR, L"%s", to_wstring(newStr).c_str());
-
-    messages[fileN].push_back(Messages(type, line, messageR, messageE, 6000));
-}
-
-static int dumpErrors(const vector<FileInfo>& listOfProject, const vector<string>& errors, map<string, vector<Messages>>& messages)
+static int dumpErrors(const vector<FileInfo>& listOfProject, const vector<string>& errors)
 {
     int errorsCount = 0;
     map<string, const FileInfo*> mapOfFiles;
@@ -463,13 +420,9 @@ static int dumpErrors(const vector<FileInfo>& listOfProject, const vector<string
         for (auto& elem : splited)
         {
             if (elem.find("Warning 308") != string::npos)
-            {
-                addMessage(elem, mapOfFiles, &file, messages, WARR);
                 outS += shiftLines(elem, mapOfFiles, &file) + "\n";
-            }
             else if (elem.find("Error") != string::npos)
             {
-                addMessage(elem, mapOfFiles, &file, messages, ERROR);
                 errS += shiftLines(elem, mapOfFiles, &file) + "\n";
                 errorsCount++;
             }
@@ -699,7 +652,7 @@ static int parseFiles(vector<string>& errors, vector<FileInfo>& listOfProject, v
     return rethrow;
 }
 
-int parseFiles(const char* proj, vector<string>& filesCompilationOrder, int parseForInlining, map<string, vector<Messages>>& messages)
+int parseFiles(const char* proj, vector<string>& filesCompilationOrder, int parseForInlining)
 {
     FILE* list = fopen(proj, "r");
     if (!list)
@@ -770,7 +723,7 @@ int parseFiles(const char* proj, vector<string>& filesCompilationOrder, int pars
     vector<string> errors;
 
     int rethrow = parseFiles(errors, listOfProject, filesCompilationOrder, parseForInlining);
-    int errCount = dumpErrors(listOfProject, errors, messages);
+    int errCount = dumpErrors(listOfProject, errors);
 
     if (rethrow != 0)
         throw rethrow;
@@ -779,8 +732,6 @@ int parseFiles(const char* proj, vector<string>& filesCompilationOrder, int pars
 
 void parseFiles(int argc, char** argv)
 {
-    map<string, vector<Messages>> messages;
-
     bool isInline = false;
     auto result = splitCommandLineForParse(argv, argc, isInline);
     if (result.second.size() == 0)

src/ProjectManipulation/ParseFiles.h

@@ -3,5 +3,5 @@
 #include <vector>
 #include <string>
 
-int parseFiles(const char* proj, std::vector<std::string>& filesCompilationOrder, int parseForInlining, std::map<std::string, std::vector<Messages>>& messages);
+int parseFiles(const char* proj, std::vector<std::string>& filesCompilationOrder, int parseForInlining);
 void parseFiles(int argc, char** argv);

src/Sapfor.cpp

@@ -64,7 +64,6 @@
 #include "DvmhRegions/LoopChecker.h"
 #include "DvmhRegions/ReadWriteAnalyzer.h"
 #include "Utils/utils.h"
-#include "Utils/json.hpp"
 #include "Distribution/Array.h"
 
 #include "VisualizerCalls/get_information.h"
@@ -108,7 +107,6 @@ using namespace std;
 using std::chrono::high_resolution_clock;
 using std::chrono::duration_cast;
 using std::chrono::milliseconds;
-using json = nlohmann::json;
 
 int PASSES_DONE[EMPTY_PASS];
 bool PASSES_DONE_INIT = false;
@@ -333,10 +331,9 @@ static string unparseProjectIfNeed(SgFile* file, const int curr_regime, const bo
             unparseToBuf = removeIncludeStatsAndUnparse(file, file_name, fout_name.c_str(), allIncludeFiles, out_free_form == 1, moduleUsesByFile, 
                                                         moduleDecls, getObjectForFileFromMap(file_name, exctactedModuleStats), toString, false, true);
             auto itI = filesToInclude.find(file_name);
-            for (auto& [_, incls] : itI->second)
-                for (auto& incl : incls)
-                    if (allIncludeFiles.find(incl) != allIncludeFiles.end())
-                        allIncludeFiles.erase(incl);
+            for (auto& [_, incl] : itI->second)
+                if (allIncludeFiles.find(incl) != allIncludeFiles.end())
+                    allIncludeFiles.erase(incl);
         }
         else
         {
@@ -830,7 +827,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         {
             auto fileIt = includeDependencies.find(file_name);
             if (fileIt == includeDependencies.end())
-                fileIt = includeDependencies.insert(fileIt, make_pair(file_name, map<int, set<string>>()));
+                fileIt = includeDependencies.insert(fileIt, make_pair(file_name, vector<pair<int, string>>()));
 
             set<string> modFiles;
             for (auto& elem : moduleDecls)
@@ -847,7 +844,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                     {
                         if (lastFromFile == NULL)
                             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-                        fileIt->second[lastFromFile->lineNumber()].insert(st->fileName());
+                        fileIt->second.push_back(make_pair(lastFromFile->lineNumber(), st->fileName()));
                     }
                     else
                         lastFromFile = st;
@@ -1606,15 +1603,12 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                     set<string> includedToThisFile;
                     if (itDep != includeDependencies.end())
                     {
-                        for (auto& [_, incls] : itDep->second)
+                        for (auto& [_, incl] : itDep->second)
                         {
-                            for (auto& incl : incls)
-                            {
-                                auto comm = commentsToInclude.find(incl);
-                                if (comm != commentsToInclude.end())
-                                    for (auto& allComm : comm->second)
-                                        includedToThisFile.insert(allComm.second.begin(), allComm.second.end());
-                            }
+                            auto comm = commentsToInclude.find(incl);
+                            if (comm != commentsToInclude.end())
+                                for (auto &allComm : comm->second)
+                                    includedToThisFile.insert(allComm.second.begin(), allComm.second.end());
                         }
                     }
 
@@ -2050,7 +2044,7 @@ static void findFunctionsToInclude(bool needToAddErrors)
                 SPF_messages[byFile.first].push_back(message);
             else
             {
-                if (message.getType() != ERROR)
+                if (message.type != ERROR)
                     SPF_messages[byFile.first].push_back(message);
                 else
                     lastErrors[byFile.first].push_back(message);
@@ -2225,7 +2219,8 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
                 runPass(GROUP_ACTUAL_AND_REMOTE, proj_name, folderName);
 
             runAnalysis(*project, CALCULATE_STATS_SCHEME, false);
-
+            for (auto& elem : allPredictorStats)
+                __spf_print(1, "  stat for file %s: %s\n", elem.first.c_str(), elem.second.to_string().c_str());
             //TODO: need to rewrite this to new algo 
             /*if (!folderName && !consoleMode || predictOn)
                 runAnalysis(*project, PREDICT_SCHEME, false); */
@@ -2394,7 +2389,7 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
         break;
     case PARSE_FILES:
         {
-            int err = parseFiles(proj_name, filesCompilationOrder, parseForInlining, SPF_messages);
+            int err = parseFiles(proj_name, filesCompilationOrder, parseForInlining);
             if (err != 0)
                 throw err;
         }
@@ -2663,28 +2658,26 @@ int main(int argc, char **argv)
     {
         printStackTrace();
         printf("exception occurred\n");
-        
-        json byFileArray = json::array();
         for (auto& byFile : SPF_messages)
         {
-            json inFile;
-            inFile["file"] = byFile.first;
-
-            json messages = json::array();
             for (auto& message : byFile.second)
             {
-                message.print(byFile.first);
-                messages.push_back(message.toJson());
-            }
-            inFile["messages"] = messages;
-            byFileArray.push_back(inFile);
-        }
-        json allMessages;
-        allMessages["allMessage"] = byFileArray;
+                string toPrint = "";
+                for (int z = 0; z < message.engMessage.size(); ++z)
+                    toPrint += message.engMessage[z];
+                string type;
+                if (message.type == WARR)
+                    type = "WARR";
+                else if (message.type == ERROR)
+                    type = "ERROR";
+                else if (message.type == NOTE)
+                    type = "NOTE";
+                else 
+                    type = "UNKN";
 
-        FILE* outF = fopen("dump_messages.json", "w");
-        fprintf(outF, "%s", allMessages.dump().c_str());
-        fclose(outF);        
+                printf("%s - [#%d: %s: line %d]: %s\n", type.c_str(), message.group, byFile.first.c_str(), message.line, toPrint.c_str());
+            }
+        }
     }
 
     deleteAllAllocatedData(withDel);

src/SapforData.h

@@ -85,7 +85,7 @@ std::map<std::string, std::map<int, std::set<std::string>>> commentsToInclude;
 //
 
 //for INSERT_INCLUDES
-std::map<std::string, std::map<int, std::set<std::string>>> filesToInclude; // file -> includes [nearest line, include]
+std::map<std::string, std::vector<std::pair<int, std::string>>> filesToInclude; // file -> includes [nearest line, include]
 //
 
 //for PASSES DEPENDENSIES
@@ -96,7 +96,7 @@ std::set<passes> passesIgnoreStateDone;
 //for files info
 std::map<std::string, int> lineInfo; // file -> lines count
 std::map<std::string, std::pair<std::set<int>, std::set<int>>> dirsInfo; // file -> dirs <lines SPF, lines DVM> count
-std::map<std::string, std::map<int, std::set<std::string>>> includeDependencies; // file -> includes [nearest line, include]
+std::map<std::string, std::vector<std::pair<int, std::string>>> includeDependencies; // file -> includes [nearest line, include]
 std::vector<std::string> filesCompilationOrder; // order of files for unite to one file
 std::map<std::string, std::map<SgStatement*, std::vector<SgStatement*>>> exctactedModuleStats; // file -> hided excluded modules
 //

src/Utils/errors.h

@@ -1,7 +1,5 @@
 #pragma once
 #include <string>
-#include "json.hpp"
-
 #ifdef __SPF
 #include "dvm.h"
 #endif
@@ -145,9 +143,6 @@ enum typeMessage { WARR, ERROR, NOTE };
 //   06 "%s clause can be used only once."
 //   07 "Variable '%s' can't be used in FILES and EXCEPT clauses at the same time."
 
-// 6000 PARSER GROUP
-//
-
 extern int langOfMessages;
 struct Messages
 {
@@ -169,41 +164,18 @@ public:
             engMessage.erase(engMessage.begin() + engMessage.size() - 1);
     }
 
-    nlohmann::json toJson() const 
+    std::wstring toString() const
     {
-        nlohmann::json resVal;
-
-        resVal["line"] = line;
-        resVal["group"] = group;
-        resVal["value"] = std::string(value.begin(), value.end());
-        resVal["type"] = (int)type;
-        return resVal;
+        std::wstring retVal = L"|";
+        retVal += std::to_wstring((int)type) + L" ";
+        retVal += std::to_wstring(line) + L" ";
+        retVal += std::to_wstring(group);
+        retVal += L"|" + value;
+        return retVal; 
     }
 
-    typeMessage getType() const { return type; }
-    int getLine() const { return line; }
-
-    void print(const std::string& file) const 
-    {
-        std::string toPrint = "";
-        for (int z = 0; z < engMessage.size(); ++z)
-            toPrint += engMessage[z];
-
-        std::string typeStr;
-        if (type == WARR)
-            typeStr = "WARR";
-        else if (type == ERROR)
-            typeStr = "ERROR";
-        else if (type == NOTE)
-            typeStr = "NOTE";
-        else
-            typeStr = "UNKN";
-
-        printf("%s - [#%d: %s: line %d]: %s\n", typeStr.c_str(), group, file.c_str(), line, toPrint.c_str());
-    }
-
-    auto getUniqKey() const { return std::make_tuple(type, group, line, value); }
-private:
+    std::string getString() const { return std::string(engMessage.begin(), engMessage.end()); }
+public:
     typeMessage type;
     int group;
     int line;

src/Utils/module_utils.cpp

@@ -310,17 +310,8 @@ static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
     SgSymbol* s = func->symbol()->next();    
     while (s)
     {
-        if (func->variant() == MODULE_STMT) 
-        {
-            if (s->scope() && s->scope()->symbol() && s->scope()->symbol()->identifier())
-                if (s->scope()->symbol()->identifier() == currScope)
-                    symbs.insert(s);
-        }
-        else
-        {
-            if (IS_BY_USE(s) && s->scope() && s->scope()->symbol()->identifier() == currScope)
-                symbs.insert(s);
-        }
+        if (IS_BY_USE(s) && s->scope() && s->scope()->symbol()->identifier() == currScope)
+            symbs.insert(s);
         s = s->next();
     }
 }
@@ -334,18 +325,18 @@ const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
     set<SgSymbol*> symbs;
     getModuleSymbols(func, symbs);
 
-    //if function or module in contains
+    //if function in contains
     auto cp = func->controlParent();
-    if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT)
+    if (isSgProgHedrStmt(cp))
         getModuleSymbols(cp, symbs);
 
     symbolsForFunc[func->symbol()->identifier()] = symbs;
     return symbs;
 }
 
-static void findSymbol(SgStatement* func, const string& varName, const string& locName,
-                       map<string, SgSymbol*>& altNames)
+SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
 {
+    map<string, SgSymbol*> altNames;
     for (const auto& s : getModuleSymbols(func))
     {
         SgSymbol* orig = OriginalSymbol(s);
@@ -353,22 +344,11 @@ static void findSymbol(SgStatement* func, const string& varName, const string& l
         if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
             altNames[s->identifier()] = s;
     }
-}
-
-SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
-{
-    const string clearName = correctSymbolModuleName(varName);
-
-    map<string, SgSymbol*> altNames;
-    findSymbol(func, varName, locName, altNames);
-    
-    if (altNames.size() == 0 && clearName != varName)
-        findSymbol(func, clearName, locName, altNames);
 
     if (altNames.size() > 0)
         return altNames.begin()->second;
     else {
-        __spf_print(1, "%s (%s %s) %s\n", func->symbol()->identifier(), clearName.c_str(), varName.c_str(), locName.c_str());
+        __spf_print(1, "%s %s %s\n", func->symbol()->identifier(), varName.c_str(), locName.c_str());
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
     }
 
@@ -404,15 +384,6 @@ SgSymbol* getNameInLocation(SgSymbol* curr, SgStatement* location)
     return returnVal;
 }
 
-string correctSymbolModuleName(const string& origFull)
-{
-    auto it = origFull.find("::");
-    if (it == string::npos)
-        return origFull;
-    else
-        return origFull.substr(it + 2);
-}
-
 namespace Distribution
 {
     const string Array::GetNameInLocation(void* location_p) const

src/Utils/module_utils.h

@@ -1,6 +1,5 @@
 #pragma once
 
-std::string correctSymbolModuleName(const std::string& origFull);
 const std::set<SgSymbol*>& getModuleSymbols(SgStatement* func);
 void getModulesAndFunctions(SgFile* file, std::vector<SgStatement*>& modulesAndFunctions);
 void findModulesInFile(SgFile* file, std::vector<SgStatement*>& modules);

src/Utils/utils.cpp

@@ -30,7 +30,6 @@
 #include "../Distribution/Arrays.h"
 #include "../DynamicAnalysis/gcov_info.h"
 #include "../ParallelizationRegions/ParRegions.h"
-#include "json.hpp"
 
 #if __SPF
 #include "acc_analyzer.h"
@@ -43,7 +42,6 @@ using std::set;
 using std::vector;
 using std::string;
 using std::wstring;
-using json = nlohmann::json;
 
 #if __cplusplus >= 201703L
 #include <filesystem>
@@ -429,7 +427,7 @@ static map<string, vector<Messages>> removeCopies(map<string, vector<Messages>>
         map<tuple<typeMessage, int, int, wstring>, const Messages*> uniq;
         for (auto& message : byFile.second)
         {
-            auto key = message.getUniqKey();
+            auto key = make_tuple(message.type, message.group, message.line, message.value);
             /*string tmp = "";
             for (auto& s : message.toString())
                 tmp += (char)s;
@@ -462,7 +460,7 @@ static void convertGlobalMessagesBuffer(short *&result, int *&resultSize)
         bool waschanged = false;
         for (auto &message : byFile.second)
         {
-            if (message.getLine() > 0)
+            if (message.line > 0)
                 newVal.push_back(message);
             else
                 waschanged = true;
@@ -472,31 +470,23 @@ static void convertGlobalMessagesBuffer(short *&result, int *&resultSize)
             byFile.second = newVal;
     }
 
-    json allMessages = json::array();
-    for (auto& byFile : copySPF_messages)
+    wstring val = L"";
+    val += std::to_wstring(copySPF_messages.size());
+    for (auto it = copySPF_messages.begin(); it != copySPF_messages.end(); ++it)
     {
-        json inFile;
-        inFile["file"] = byFile.first;
-
-        json array = json::array();
-        for (auto& message : byFile.second)
-        {
-            json msg = message.toJson();
-            array.push_back(msg);
-        }
-        inFile["messages"] = array;
-        allMessages.push_back(inFile);
+        val += L"|" + to_wstring(it->first.c_str()) + L"|" + std::to_wstring(it->second.size());
+        for (int k = 0; k < it->second.size(); ++k)
+            val += it->second[k].toString();
     }
 
-    json all;
-    all["allMessages"] = allMessages;
-
-    const string str = all.dump();    
-    const unsigned len = (unsigned)str.size();
-
-    copyStringToShort(result, str);
+    const unsigned len = (unsigned)val.size();
+    result = new short[len + 1];
     allocated.insert(result);
 
+    result[len] = '\0';
+    for (unsigned i = 0; i < len; ++i)
+        result[i] = val[i];
+
     resultSize = new int[1];
     resultSize[0] = (int)len;
 }
@@ -1696,16 +1686,4 @@ set<string> fillDistributedArrays(const DataDirective& dataDirectives,
     for (auto& elem : ret)
         distrArrays.insert(shortName ? elem->GetShortName() : elem->GetName());
     return distrArrays;
-}
-
-void copyStringToShort(short*& result, const string& resVal, bool withEnd)
-{
-    result = new short[resVal.size() + 1];
-    allocated.insert(result);
-
-    for (int i = 0; i < resVal.size(); ++i)
-        result[i] = resVal[i];
-
-    if (withEnd)
-        result[resVal.size()] = (short)'\0';
 }

src/Utils/utils.h

@@ -96,5 +96,3 @@ std::vector<std::string> splitAndArgvCreate(const std::string& options);
 
 std::set<DIST::Array*> fillDistributedArraysD(const DataDirective& dataDirectives, const std::map<DIST::Array*, std::tuple<int, std::string, std::string>>& tableOfUniqNamesByArray, const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCalls, bool onlyCommon = false);
 std::set<std::string> fillDistributedArrays(const DataDirective& dataDirectives, const std::map<DIST::Array*, std::tuple<int, std::string, std::string>>& tableOfUniqNamesByArray, const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCalls, bool onlyCommon = false, bool shortName = false);
-
-void copyStringToShort(short*& result, const std::string& resVal, bool withEnd = true);

src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2422"
+#define VERSION_SPF "2414"

src/VisualizerCalls/get_information.cpp

@@ -218,6 +218,18 @@ static bool tryOpenProjectFile(const char *project)
     return ret;
 }
 
+static void copyStringToShort(short *&result, const string &resVal, bool withEnd = true)
+{
+    result = new short[resVal.size() + 1];
+    allocated.insert(result);
+
+    for (int i = 0; i < resVal.size(); ++i)
+        result[i] = resVal[i];
+
+    if (withEnd)
+        result[resVal.size()] = (short)'\0';
+}
+
 volatile int passDone = 0;
 static volatile int rethrow = 0;
 static void runPassesLoop(const vector<passes> &passesToRun, const char *prName, const char *folderNameChar)
@@ -453,15 +465,14 @@ int SPF_ParseFilesWithOrder(void*& context, int winHandler, short* options, shor
     {
         runPassesForVisualizer(projName, { PARSE_FILES });
 
-        json filesArray = json::array();
-        
-        for (auto& file : filesCompilationOrder)
-            filesArray.push_back(file);            
-        
-        json filesOrder;
-        filesOrder["allFiles"] = filesArray;
-
-        string resVal = filesOrder.dump();
+        string resVal = "";
+        for (auto& elem : filesCompilationOrder)
+        {
+            if (resVal == "")
+                resVal += elem;
+            else
+                resVal += "|" + elem;
+        }
         copyStringToShort(result, resVal);
         retSize = 0;
     }
@@ -755,17 +766,15 @@ int SPF_GetArrayDistribution(void*& context, int winHandler, short *options, sho
         else
             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);            
 
-        json regions = json::array();
-        for (auto& reg : parallelRegions)
-        {
-            json currReg = reg->toJson();
-            regions.push_back(currReg);
-        }
+        string resVal = "";
+        resVal += to_string(parallelRegions.size());
+        for (int i = 0; i < parallelRegions.size(); ++i)
+            resVal += parallelRegions[i]->toString();
 
-        json allRegions;
-        allRegions["allRegions"] = regions;
+        //__spf_print(1, "==============\n");
+        //__spf_print(1, "%s\n", resVal.c_str());
+        //__spf_print(1, "==============\n");
 
-        string resVal = allRegions.dump();
         copyStringToShort(result, resVal);
         retSize = (int)resVal.size() + 1;
     }
@@ -1054,6 +1063,7 @@ int SPF_CreateParallelVariant(void*& context, int winHandler, short *options, sh
             printf("SAPFOR: set all info done\n");
         runPassesForVisualizer(projName, { INSERT_PARALLEL_DIRS }, folderName);
 
+        string predictRes = "";
         PredictorStats summed;
         for (auto &predFile : allPredictorStats)
         {
@@ -1069,11 +1079,44 @@ int SPF_CreateParallelVariant(void*& context, int winHandler, short *options, sh
             summed.TotalScoreComm += predFile.second.TotalScoreComm;
             summed.TotalScoreDist += predFile.second.TotalScoreDist;
             summed.TotalScorePar += predFile.second.TotalScorePar;
+        }                
+        predictRes += summed.to_string();
+        //predictRes += "|" + to_string((summed.TotalScoreComm != 0 ? 1.0 / summed.TotalScoreComm : 0.0 )+ (double)summed.TotalScorePar * 1000 + (countOfDist == 0 ? -5000 : countOfDist));
+        if (countOfDist == 0)
+            predictRes += "|x";
+        else
+            predictRes += "|" + to_string(-1 * (summed.ParallelStat.AcrossCount + summed.ParallelStat.RemoteCount + summed.RedistributeCount + summed.RemoteCount));
+        //predictRes += "|0";
+
+        //TODO: need to rewrite to new algo
+        /*if (folderName == NULL)
+        {
+            SpfInterval *mainIterval = getMainInterval(project, intervals);
+            const int idxBest = mainIterval->getBestTimeIdx();
+            double speedUpBest = 1;
+            int procCount = 1;
+            string topo = "";
+            if (idxBest != -1 && mainIterval->exec_time != 0)
+            {
+                speedUpBest = mainIterval->exec_time / mainIterval->predictedTimes[idxBest];
+                topo += "[";
+                for (int z = 0; z < topologies[idxBest].size(); ++z)
+                {
+                    topo += to_string(topologies[idxBest][z]);
+                    procCount *= topologies[idxBest][z];
+                    if (z != topologies[idxBest].size() - 1)
+                        topo += "x";
+                }
+                topo += "]";
+            }
+            char buf[256];
+            sprintf(buf, "%.2f", speedUpBest / procCount * 100.0);
+            predictRes += "|" + string(buf) + topo;
         }
+        else
+            predictRes += "|0";*/
 
-        string predictRes = summed.toJson().dump();                
         copyStringToShort(predictorStats, predictRes);
-
         __spf_print(1, "  statistic to send: %s\n", predictRes.c_str());
         retSize = (int)predictRes.size();
     }
@@ -1113,6 +1156,8 @@ int SPF_GetArrayLinks(void*& context, int winHandler, short *options, short *pro
     {
         runPassesForVisualizer(projName, { CALL_GRAPH2 } );
 
+        string resVal = "";
+        
         map<DIST::Array*, set<DIST::Array*>> linkedArrays;
         for (auto& inMap : arrayLinksByFuncCalls)
         {
@@ -1126,24 +1171,17 @@ int SPF_GetArrayLinks(void*& context, int winHandler, short *options, short *pro
                             linkedArrays[ref].insert(toAdd);
         }
 
-        json allLinks = json::array();
+
         for (auto& array : linkedArrays)
         {
-            json currLink;
-            currLink["id"] = array.first->GetId();
-
-            json links = json::array();
+            resVal += to_string(array.first->GetId()) + "|" + to_string(array.second.size()) + "|";
             for (auto& link : array.second)
-                links.push_back(link->GetId());
-            currLink["links"] = links;
-
-            allLinks.push_back(currLink);
+                resVal += to_string(link->GetId()) + "|";
         }
 
-        json links;
-        links["allLinks"] = allLinks;
+        if (resVal[resVal.size() - 1] == '|')
+            resVal.erase(resVal.size() - 1);
 
-        string resVal = links.dump();
         copyStringToShort(result, resVal);
         retSize = (int)resVal.size() + 1;
     }
@@ -1270,7 +1308,7 @@ int SPF_GetIntrinsics(void*& context, short *&result)
     return (int)resVal.size() + 1;
 }
 
-extern map<string, map<int, set<string>>> includeDependencies;
+extern map<string, vector<pair<int, string>>> includeDependencies;
 int SPF_GetIncludeDependencies(void*& context, int winHandler, short *options, short *projName, short *&result, short*& output, int*& outputSize,
                                short*& outputMessage, int*& outputMessageSize)
 {
@@ -1290,15 +1328,12 @@ int SPF_GetIncludeDependencies(void*& context, int winHandler, short *options, s
             includes["file"] = deps.first;
 
             json array = json::array();
-            for (const auto& [line, incls] : deps.second)
+            for (const auto& [line, incl] : deps.second)
             {
-                for (auto& incl : incls)
-                {
-                    json elem;
-                    elem["line"] = line;
-                    elem["dependencyFileName"] = incl;
-                    array.push_back(elem);
-                }
+                json elem;
+                elem["line"] = line;
+                elem["dependencyFileName"] = incl;
+                array.push_back(elem);
             }
             includes["includes"] = array;
             inc_array.push_back(includes);
@@ -1381,17 +1416,14 @@ int SPF_GetAllDeclaratedArrays(void*& context, int winHandler, short *options, s
     {
         runPassesForVisualizer(projName, { GET_ALL_ARRAY_DECL });
 
-        json arrays = json::array();
-        for (const auto& [_, array] : declaredArrays)
+        string resVal = "";
+        for (auto f = declaredArrays.begin(); f != declaredArrays.end(); ++f)
         {
-            json jArray = array.first->toJson();
-            arrays.push_back(jArray);
+            if (f != declaredArrays.begin())
+                resVal += "@";
+            resVal += f->second.first->toString();
         }
 
-        json allArrays;
-        allArrays["allArrays"] = arrays;
-        string resVal = allArrays.dump();
-
         copyStringToShort(result, resVal);
         retSize = (int)resVal.size() + 1;
     }
@@ -2157,7 +2189,7 @@ int SPF_InlineProcedures(void*& context, int winHandler, short* options, short*
 }
 
 
-extern map<string, map<int, set<string>>> filesToInclude;
+extern map<string, vector<pair<int, string>>> filesToInclude;
 int SPF_InsertIncludesPass(void*& context, int winHandler, short *options, short *projName, short *folderName, char *visFilesToInclude,
                            short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize)
 {
@@ -2190,8 +2222,9 @@ int SPF_InsertIncludesPass(void*& context, int winHandler, short *options, short
             if (sscanf(splited[k].c_str(), "%d", &line) == -1)
                 return -5;
 
-            filesToInclude[file][line].insert(splited[k + 1]);
-            __spf_print(1, "    include = [%d %s]\n", line, splited[k + 1].c_str());
+            auto pair = make_pair(line, splited[k + 1]);
+            filesToInclude[file].push_back(pair);
+            __spf_print(1, "    include = [%d %s]\n", pair.first, pair.second.c_str());
         }
         i += 2 * num;
     }
@@ -2220,30 +2253,18 @@ int SPF_GetGCovInfo(void*& context, int winHandler, short *options, short *projN
     {
         runPassesForVisualizer(projName, { GCOV_PARSER });
 
-        json gcov_array = json::array();
-        for (auto& byFile : gCovInfo)
+        string resVal = "";
+        bool first = true;
+        for (auto &byFile : gCovInfo)
         {
-            json fileGCov;
-            fileGCov["file"] = byFile.first;
-
-            json info_array = json::array();
-            for (auto& elem : byFile.second)
-            {
-                json item;
-                item["line"] = elem.first;
-                item["execution"] = elem.second.getExecutedCount();
-
-                info_array.push_back(item);
-            }
-            fileGCov["lines"] = info_array;
-
-            gcov_array.push_back(fileGCov);
+            if (!first)
+                resVal += "@";
+            resVal += byFile.first + "@";
+            for (auto &elem : byFile.second)
+                resVal += to_string(elem.first) + " " + to_string(elem.second.getExecutedCount()) + " ";            
+            first = false;
         }
 
-        json allGCov;
-        allGCov["allGCov"] = gcov_array;
-        string resVal = allGCov.dump();
-
         copyStringToShort(result, resVal);
         retSize = (int)resVal.size();
     }