diff --git a/CMakeLists.txt b/CMakeLists.txt index f50eb72..952a044 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,13 @@ set(libpred_sources projects/libpredictor/src/) set(libpred_include projects/libpredictor/include/) include_directories(src) +include_directories(src/Utils) +include_directories(src/SgUtils) +include_directories(src/Distribution) +include_directories(src/GraphCall) +include_directories(src/GraphLoop) +include_directories(src/Transformations/ExpressionSubstitution) + #Sage lib includes include_directories(${fdvm_include}) include_directories(${sage_include_1}) @@ -154,40 +161,47 @@ set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp src/ParallelizationRegions/resolve_par_reg_conflicts.cpp src/ParallelizationRegions/resolve_par_reg_conflicts.h) -set(TR_DEAD_CODE src/Transformations/dead_code.cpp - src/Transformations/dead_code.h) -set(TR_CP src/Transformations/checkpoints.cpp - src/Transformations/checkpoints.h) -set(TR_VECTOR src/Transformations/array_assign_to_loop.cpp - src/Transformations/array_assign_to_loop.h) -set(TR_ENDDO_LOOP src/Transformations/enddo_loop_converter.cpp - src/Transformations/enddo_loop_converter.h) -set(TR_LOOP_NEST src/Transformations/loop_transform.cpp - src/Transformations/loop_transform.h) -set(TR_LOOP_COMB src/Transformations/loops_combiner.cpp - src/Transformations/loops_combiner.h) -set(TR_LOOP_SPLIT src/Transformations/loops_splitter.cpp - src/Transformations/loops_splitter.h) -set(TR_LOOP_UNROLL src/Transformations/loops_unrolling.cpp - src/Transformations/loops_unrolling.h) -set(TR_PRIV_BR src/Transformations/private_arrays_resizing.cpp - src/Transformations/private_arrays_resizing.h) -set(TR_PRIV_DEL src/Transformations/private_removing.cpp - src/Transformations/private_removing.h) -set(TR_SWAP_ARR_DIMS src/Transformations/swap_array_dims.cpp - src/Transformations/swap_array_dims.h) -set(TR_FUNC_DUP src/Transformations/uniq_call_chain_dup.cpp - src/Transformations/uniq_call_chain_dup.h) -set(TR_FUNC_PURE src/Transformations/function_purifying.cpp - src/Transformations/function_purifying.h) -set(TR_GV src/Transformations/fix_common_blocks.cpp - src/Transformations/fix_common_blocks.h) -set(TR_CONV src/Transformations/convert_to_c.cpp - src/Transformations/convert_to_c.h) -set(TR_IMPLICIT_NONE src/Transformations/set_implicit_none.cpp - src/Transformations/set_implicit_none.h) -set(TR_REPLACE_ARRAYS_IN_IO src/Transformations/replace_dist_arrays_in_io.cpp - src/Transformations/replace_dist_arrays_in_io.h) +set(TR_DEAD_CODE src/Transformations/DeadCodeRemoving/dead_code.cpp + src/Transformations/DeadCodeRemoving/dead_code.h) +set(TR_CP src/Transformations/CheckPoints/checkpoints.cpp + src/Transformations/CheckPoints/checkpoints.h) +set(TR_VECTOR src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp + src/Transformations/VectorAssignToLoop/array_assign_to_loop.h) +set(TR_ENDDO_LOOP src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp + src/Transformations/LoopEndDoConverter/enddo_loop_converter.h) +set(TR_LOOP_NEST src/Transformations/LoopNesting/loop_transform.cpp + src/Transformations/LoopNesting/loop_transform.h) +set(TR_LOOP_COMB src/Transformations/LoopCombining/loops_combiner.cpp + src/Transformations/LoopCombining/loops_combiner.h) +set(TR_LOOP_SPLIT src/Transformations/LoopSplitting/loops_splitter.cpp + src/Transformations/LoopSplitting/loops_splitter.h) +set(TR_LOOP_UNROLL src/Transformations/LoopUnrolling/loops_unrolling.cpp + src/Transformations/LoopUnrolling/loops_unrolling.h) +set(TR_PRIV_BR src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp + src/Transformations/PrivateArrayResizing/private_arrays_resizing.h) +set(TR_PRIV_DEL src/Transformations/PrivateArrayRemoving/private_removing.cpp + src/Transformations/PrivateArrayRemoving/private_removing.h) +set(TR_SWAP_ARR_DIMS src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp + src/Transformations/ArrayDimsSwapping/swap_array_dims.h) +set(TR_FUNC_DUP src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp + src/Transformations/FunctionDuplication/uniq_call_chain_dup.h) +set(TR_FUNC_PURE src/Transformations/FunctionPurifying/function_purifying.cpp + src/Transformations/FunctionPurifying/function_purifying.h) +set(TR_GV src/Transformations/GlobalVariables/fix_common_blocks.cpp + src/Transformations/GlobalVariables/fix_common_blocks.h) +set(TR_CONV src/Transformations/ConvertToC/convert_to_c.cpp + src/Transformations/ConvertToC/convert_to_c.h) +set(TR_IMPLICIT_NONE src/Transformations/SetImplicitNone/set_implicit_none.cpp + src/Transformations/SetImplicitNone/set_implicit_none.h) +set(TR_REPLACE_ARRAYS_IN_IO src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp + src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h) +set(TR_EXPR_TRANSFORM src/Transformations/ExpressionSubstitution/control_flow_graph_part.cpp + src/Transformations/ExpressionSubstitution/expr_transform.cpp + src/Transformations/ExpressionSubstitution/expr_transform.h) +set(TR_INLINER src/Transformations/FunctionInlining/inliner.cpp + src/Transformations/FunctionInlining/inliner.h) +set(TR_RENAME_SYMBOLS src/Transformations/RenameSymbols/rename_symbols.cpp + src/Transformations/RenameSymbols/rename_symbols.h) set(TRANSFORMS ${TR_DEAD_CODE} @@ -207,10 +221,15 @@ set(TRANSFORMS ${TR_CONV} ${TR_PRIV_DEL} ${TR_IMPLICIT_NONE} - ${TR_REPLACE_ARRAYS_IN_IO}) + ${TR_REPLACE_ARRAYS_IN_IO} + ${TR_EXPR_TRANSFORM} + ${TR_INLINER} + ${TR_RENAME_SYMBOLS}) set(CFG src/CFGraph/IR.cpp src/CFGraph/IR.h + src/CFGraph/IR_domTree.cpp + src/CFGraph/IR_domTree.h src/CFGraph/CFGraph.cpp src/CFGraph/CFGraph.h src/CFGraph/RD_subst.cpp @@ -288,10 +307,6 @@ set(DYNA src/DynamicAnalysis/createParallelRegions.cpp src/DynamicAnalysis/gcov_info.h src/DynamicAnalysis/gCov_parser.cpp src/DynamicAnalysis/gCov_parser_func.h) - -set(EXPR_TRANSFORM src/ExpressionTransform/control_flow_graph_part.cpp - src/ExpressionTransform/expr_transform.cpp - src/ExpressionTransform/expr_transform.h) set(GR_CALL src/GraphCall/graph_calls.cpp src/GraphCall/graph_calls.h @@ -303,9 +318,6 @@ set(GR_LOOP src/GraphLoop/graph_loops_base.cpp src/GraphLoop/graph_loops.h src/GraphLoop/graph_loops_func.h) -set(INLINER src/Inliner/inliner.cpp - src/Inliner/inliner.h) - set(LOOP_ANALYZER src/LoopAnalyzer/allocations_prepoc.cpp src/LoopAnalyzer/dep_analyzer.cpp src/LoopAnalyzer/loop_analyzer.cpp @@ -313,10 +325,6 @@ set(LOOP_ANALYZER src/LoopAnalyzer/allocations_prepoc.cpp src/LoopAnalyzer/implicit_loops_analyzer.cpp src/LoopAnalyzer/implicit_loops_analyzer.h) -set(RENAME_SYMBOLS src/RenameSymbols/rename_symbols.cpp - src/RenameSymbols/rename_symbols.h) - - set(MAIN src/Sapfor.cpp src/Sapfor.h src/SapforData.h @@ -406,12 +414,9 @@ set(SOURCE_EXE ${DISTR} ${DVMH_REG} ${DYNA} - ${EXPR_TRANSFORM} ${GR_CALL} ${GR_LOOP} - ${INLINER} ${LOOP_ANALYZER} - ${RENAME_SYMBOLS} ${TRANSFORMS} ${PARALLEL_REG} ${PRIV} @@ -435,7 +440,7 @@ source_group (CFGraph FILES ${CFG}) source_group (CFGraph\\DataFlow FILES ${DATA_FLOW}) source_group (Transformations\\DeadCodeRemoving FILES ${TR_DEAD_CODE}) -source_group (Transformations\\ExpressionSubstitution FILES ${EXPR_TRANSFORM}) +source_group (Transformations\\ExpressionSubstitution FILES ${TR_EXPR_TRANSFORM}) source_group (Transformations\\CheckPoints FILES ${TR_CP}) source_group (Transformations\\LoopEndDoConverter FILES ${TR_ENDDO_LOOP}) source_group (Transformations\\LoopNesting FILES ${TR_LOOP_NEST}) @@ -443,13 +448,13 @@ source_group (Transformations\\LoopCombining FILES ${TR_LOOP_COMB}) source_group (Transformations\\LoopSplitting FILES ${TR_LOOP_SPLIT}) source_group (Transformations\\LoopUnrolling FILES ${TR_LOOP_UNROLL}) source_group (Transformations\\FunctionDuplication FILES ${TR_FUNC_DUP}) -source_group (Transformations\\FunctionInlining FILES ${INLINER}) +source_group (Transformations\\FunctionInlining FILES ${TR_INLINER}) source_group (Transformations\\FunctionPurifying FILES ${TR_FUNC_PURE}) source_group (Transformations\\ArrayDimsSwapping FILES ${TR_SWAP_ARR_DIMS}) source_group (Transformations\\PrivateArrayResizing FILES ${TR_PRIV_BR}) source_group (Transformations\\PrivateArrayRemoving FILES ${TR_PRIV_DEL}) source_group (Transformations\\VectorAssignToLoop FILES ${TR_VECTOR}) -source_group (Transformations\\RenameSymbols FILES ${RENAME_SYMBOLS}) +source_group (Transformations\\RenameSymbols FILES ${TR_RENAME_SYMBOLS}) source_group (Transformations\\GlobalVariables FILES ${TR_GV}) source_group (Transformations\\ConvertToC FILES ${TR_CONV}) source_group (Transformations\\SetImplicitNone FILES ${TR_IMPLICIT_NONE}) diff --git a/projects/dvm b/projects/dvm index 3a567d7..c550423 160000 --- a/projects/dvm +++ b/projects/dvm @@ -1 +1 @@ -Subproject commit 3a567d7582d01ec80d026a320415820e32e82c7c +Subproject commit c550423b8ee7c2c5ba63215c990f9b1a098d5832 diff --git a/src/CFGraph/CFGraph.cpp b/src/CFGraph/CFGraph.cpp index ab6e929..e27590e 100644 --- a/src/CFGraph/CFGraph.cpp +++ b/src/CFGraph/CFGraph.cpp @@ -1,5 +1,5 @@ #define _LEAK_ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,9 +8,9 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../GraphCall/graph_calls.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "graph_calls.h" #include "dvm.h" #include "IR.h" @@ -1167,6 +1167,16 @@ map> buildCFG(const map& common if (settings.withRD) buildReachingDefs(result, settings); + if (settings.withDominators) + { + auto t = high_resolution_clock::now(); + for (auto& [func, bblocks] : result) + SAPFOR::buildDominatorTree(bblocks); + + auto msec = duration_cast(high_resolution_clock::now() - t).count(); + __spf_print(1, " dominator build time is %.3f sec\n", msec / 1000.); + } + if (SgFile::switchToFile(oldFile) == -1) printInternalError(convertFileName(__FILE__).c_str(), __LINE__); diff --git a/src/CFGraph/CFGraph.h b/src/CFGraph/CFGraph.h index 369c1d7..c828c12 100644 --- a/src/CFGraph/CFGraph.h +++ b/src/CFGraph/CFGraph.h @@ -10,6 +10,7 @@ #include "../Utils/utils.h" #include "../Utils/CommonBlock.h" #include "../GraphCall/graph_calls.h" +#include "IR_domTree.h" namespace SAPFOR { @@ -28,7 +29,7 @@ namespace SAPFOR std::vector next; std::vector prev; - + BasicBlock* directDominator = NULL; //reaching definition std::map> RD_in, RD_out; @@ -38,6 +39,7 @@ namespace SAPFOR bool addLive(const std::map>& to_add, bool in); std::map> getLive(bool in) const; bool removeLive(SAPFOR::Argument* to_remove, bool in); + public: BasicBlock() { num = lastNumBlock++; } BasicBlock(IR_Block* item); @@ -47,6 +49,7 @@ namespace SAPFOR void addInstruction(IR_Block* item, bool pushFront = false); void addPrev(BasicBlock* prev_) { prev.push_back(prev_); } void addNext(BasicBlock* next_) { next.push_back(next_); } + void setDom(BasicBlock* dom) { directDominator = dom; } int removePrev(BasicBlock* removed); int removeNext(BasicBlock* removed); @@ -74,7 +77,11 @@ namespace SAPFOR const std::vector& getInstructions() const { return instructions; } const std::vector& getNext() const { return next; } const std::vector& getPrev() const { return prev; } - + BasicBlock* getDom() const + { + return directDominator; + } + /* * FOR LIVE ANALYSIS */ @@ -110,13 +117,15 @@ namespace SAPFOR bool withDVM = false; bool withCallsInBlocks = false; // separate each F_CALL to own BasicBlock bool withCallFrom = true; + bool withDominators = true; explicit CFG_Settings(int) { } explicit CFG_Settings(bool atLeastOneIterInLoop = false, bool withRD = true, bool withRegisters = false, - bool withDVM = false, bool withSPF = false, bool withCallsInBlocks = false, bool withCallFrom = true) : + bool withDVM = false, bool withSPF = false, bool withCallsInBlocks = false, + bool withCallFrom = true, bool withDominators = true) : atLeastOneIterInLoop(atLeastOneIterInLoop), withRD(withRD), withRegisters(withRegisters), withDVM(withDVM), withSPF(withSPF), - withCallsInBlocks(withCallsInBlocks), withCallFrom(withCallFrom) + withCallsInBlocks(withCallsInBlocks), withCallFrom(withCallFrom), withDominators(withDominators) { } }; } @@ -151,4 +160,4 @@ static inline void deleteCFG(std::map #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/DataFlow/backward_data_flow_impl.h b/src/CFGraph/DataFlow/backward_data_flow_impl.h index 4578e7b..ae52690 100644 --- a/src/CFGraph/DataFlow/backward_data_flow_impl.h +++ b/src/CFGraph/DataFlow/backward_data_flow_impl.h @@ -5,7 +5,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" #include "../RD_subst.h" diff --git a/src/CFGraph/DataFlow/data_flow.h b/src/CFGraph/DataFlow/data_flow.h index d58755f..d4b6b3b 100644 --- a/src/CFGraph/DataFlow/data_flow.h +++ b/src/CFGraph/DataFlow/data_flow.h @@ -2,7 +2,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/DataFlow/data_flow_impl.h b/src/CFGraph/DataFlow/data_flow_impl.h index c6a88f6..5a414eb 100644 --- a/src/CFGraph/DataFlow/data_flow_impl.h +++ b/src/CFGraph/DataFlow/data_flow_impl.h @@ -4,7 +4,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/IR.cpp b/src/CFGraph/IR.cpp index a46226b..cd2d0ae 100644 --- a/src/CFGraph/IR.cpp +++ b/src/CFGraph/IR.cpp @@ -1,14 +1,14 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../GraphCall/graph_calls.h" -#include "../ExpressionTransform/expr_transform.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "graph_calls.h" +#include "expr_transform.h" #include "dvm.h" #include "IR.h" diff --git a/src/CFGraph/IR.h b/src/CFGraph/IR.h index a5d34f3..88081a1 100644 --- a/src/CFGraph/IR.h +++ b/src/CFGraph/IR.h @@ -6,7 +6,7 @@ #include #include "CFGraph.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" namespace SAPFOR { @@ -347,4 +347,4 @@ std::vector buildIR(SgStatement* function, const FuncInfo* fu SAPFOR::Instruction* getInstructionByNumber(const std::vector& blocks, int num); std::pair getInstructionAndBlockByNumber(const std::map>& CFGraph, int num); std::pair getInstructionAndBlockByStatement(const std::map>& CFGraph, SgStatement* stmt); -int getParamIndex(SAPFOR::Argument* func_param, int max_index); +int getParamIndex(SAPFOR::Argument* func_param, int max_index); \ No newline at end of file diff --git a/src/CFGraph/IR_SSAForm.cpp b/src/CFGraph/IR_SSAForm.cpp index 987aa92..91cd435 100644 --- a/src/CFGraph/IR_SSAForm.cpp +++ b/src/CFGraph/IR_SSAForm.cpp @@ -225,54 +225,52 @@ static BBlock* findImmediateDominatorsDfsHelper(BBlock* block, BBlock* currentBl return NULL; } +bool checkoDom(vector a, vector b, BBlock* c) { + if (a.size() != b.size() + 1) { + return false; + } + + for (auto i : a) + { + if (i != c && find(b.begin(), b.end(), i) == b.end()) { + return false; + } + } + + return true; +} + static map findImmediateDominators1(const map>& dominators, BBlock* entry) { map iDom; - for (const auto& pair : dominators) - { + for (const auto& pair : dominators) { BBlock* b = pair.first; - if (b == entry) - continue; + if (b == entry) continue; const auto& doms = pair.second; - BBlock* candidate = NULL; - for (auto& d : doms) - { - if (d == b) - continue; + // candidates = all dominators of b except itself + bool found = false; + for (auto& d : doms) { + if (d == b) continue; - bool isImmediate = true; - for (auto& other : doms) - { - if (other == b || other == d) - continue; - - const auto& domsOfOther = dominators.at(other); - if (std::find(domsOfOther.begin(), domsOfOther.end(), d) != domsOfOther.end()) - { - isImmediate = false; - break; - } - } - - if (isImmediate) - { - candidate = d; + if (checkoDom(doms, dominators.at(d), b)) { + iDom[b] = d; + found = true; break; } } - if (candidate) - iDom[b] = candidate; + if (!found) { + cout << "ERRORERRORERROR " << b->getNumber() << endl; + } } return iDom; } - static map findImmediateDominators(map>& dominators, BBlock* fistBlock) { map iDominators; @@ -483,6 +481,8 @@ static void renameFiFunctionArgsVar(BBlock* block, map auto size = block->getInstructions().size(); auto& instructions = block->getInstructions(); + //cout << "try to insert Phi to block - " << block->getNumber() << endl; + for (size_t i = 0; i < size; ++i) { auto irBlock = instructions[i]; @@ -491,6 +491,7 @@ static void renameFiFunctionArgsVar(BBlock* block, map instruction->getArg1()->getValue() == "FI_FUNCTION" && instruction->getResult() != NULL && instruction->getArg2() != NULL) { + //cout << "Insert Phi to block - " << block->getNumber() << endl; Instruction* paramInstruction; if (stack[instruction->getResult()->getValue()].size() > 0) @@ -527,12 +528,14 @@ static vector findBlocksWithValue(map& iDominators, B static void renameIR(BBlock* block, map& iDominators, map& counter, map>& stack) { + //cout << "renameIR for block " << block->getNumber() << endl; + renameFiFunctionResultVar(block, counter, stack); renameInstructionVars(block, counter, stack); for (auto& successor : block->getNext()) renameFiFunctionArgsVar(successor, stack); - + for (auto& child : findBlocksWithValue(iDominators, block)) renameIR(child, iDominators, counter, stack); @@ -558,22 +561,37 @@ static void renameIR(BBlock* block, map& iDominators, map>& fullIR, map>& result) { for (auto& [funcinfo, funcIRConst]: fullIR) { + if (isEqual1("csol.for", funcinfo->fileName) || isEqual1("reblns.for", funcinfo->fileName) || isEqual1("adjont.for", funcinfo->fileName) + || isEqual1("beginf.for", funcinfo->fileName) || isEqual1("dsnp1.for", funcinfo->fileName) || isEqual1("dsnpnm.for", funcinfo->fileName) + || isEqual1("decod3.for", funcinfo->fileName)) + continue; + cout << "Testing " << funcinfo->funcName << endl; vector funcIR; + /* for (auto& i : funcIRConst) { + printBlock(i); + }*/ + for (auto& i : funcIRConst) funcIR.push_back(new BBlock(*i)); restoreConnections(funcIRConst, funcIR); - for (auto& i : funcIR) { - //printBlock(i); - } + /*for (auto& i : funcIR) { + printBlock(i); + }*/ + for (auto& [func, bblocks] : result) + SAPFOR::buildDominatorTree(bblocks); auto dominators = findDominators(funcIR); /*cout << endl << endl << endl << "DOMINATORS" << endl << endl << endl; @@ -640,11 +658,17 @@ void buildIRSSAForm(const map>& fullIR, varStack[var->getValue()] = tmp; } + /*for (auto& i : funcIR) { + printBlock(i); + }*/ + renameIR(funcIR[0], iDominators, count, varStack); - for (auto& i : funcIR) { - //printBlock(i); - } + //cout << endl << endl << "___________________" << endl << endl; + + /*for (auto& i : funcIR) { + printBlock(i); + }*/ //cout << endl << endl << endl << endl << endl; //for (auto i : funcIRConst) { // printBlock(i); diff --git a/src/CFGraph/IR_domTree.cpp b/src/CFGraph/IR_domTree.cpp new file mode 100644 index 0000000..067cc7c --- /dev/null +++ b/src/CFGraph/IR_domTree.cpp @@ -0,0 +1,102 @@ +#include "dvm.h" +#include "IR_domTree.h" + +namespace SAPFOR { + void DominatorFinder::DFS(BasicBlock* v, int parent_num) { + dfs_num[v] = n; + vertex[n] = n; + semi[n] = n; + label[n] = n; + ancestor[n] = -1; + parent[n] = parent_num; + vertices[n++] = v; + + for (const auto& w : v->getNext()) { + if (dfs_num[w] == -1) + DFS(w, dfs_num[v]); + } + } + + void DominatorFinder::Compress(int v) { + if (ancestor[ancestor[v]] != -1) { + Compress(ancestor[v]); + + if (semi[label[ancestor[v]]] < semi[label[v]]) + label[v] = label[ancestor[v]]; + ancestor[v] = ancestor[ancestor[v]]; + } + } + + int DominatorFinder::Eval(int v) { + if (ancestor[v] == -1) + return v; + + Compress(v); + return label[v]; + } + + void DominatorFinder::Link(int v, int w) { + ancestor[w] = v; + } + + DominatorFinder::DominatorFinder(std::vector& blocks) { + if (blocks.empty()) + return; + + entry = blocks[0]; + n = 0; + + for (auto block : blocks) + dfs_num[block] = -1; + + int max_size = blocks.size(); + vertices.resize(max_size); + parent.assign(max_size, -1); + semi.assign(max_size, -1); + vertex.assign(max_size, -1); + ancestor.assign(max_size, -1); + label.assign(max_size, -1); + bucket.resize(max_size); + + DFS(entry, -1); + + for (int i = n - 1; i > 0; --i) { + int w = vertex[i]; + + for (BasicBlock* v : vertices[w]->getPrev()) { + if (dfs_num[v] == -1) + continue; + int u = Eval(dfs_num[v]); + + if (semi[u] < semi[w]) + semi[w] = semi[u]; + } + + bucket[vertex[semi[w]]].push_back(w); + Link(parent[w], w); + + for (int v : bucket[parent[w]]) + { + int u = Eval(v); + if (semi[u] < semi[v]) + vertices[v]->setDom(vertices[u]); + else + vertices[v]->setDom(vertices[parent[w]]); + } + bucket[parent[w]].clear(); + } + + for (int i = 1; i < n; ++i) { + int w = vertex[i]; + + if (vertices[w]->getDom() != vertices[vertex[semi[w]]]) + vertices[w]->setDom(vertices[w]->getDom()->getDom()); + } + + entry->setDom(nullptr); + } + + void buildDominatorTree(std::vector& blocks) { + DominatorFinder finder(blocks); + } +} diff --git a/src/CFGraph/IR_domTree.h b/src/CFGraph/IR_domTree.h new file mode 100644 index 0000000..5557f0b --- /dev/null +++ b/src/CFGraph/IR_domTree.h @@ -0,0 +1,35 @@ +#pragma once + +#include +#include +#include + +#include "CFGraph.h" + +// Lengauer, Thomas. A fast algorithm for finding dominators in a flowgraph / Thomas Lengauer, Robert Endre Tarjan +// ACM Transactions on Programming Languages and Systems (TOPLAS). � 1979. � Vol. 1, no. 1. � Pp. 121�141. + +namespace SAPFOR { + +class BasicBlock; + +class DominatorFinder { +private: + BasicBlock* entry; + std::vector vertices; + std::unordered_map dfs_num; + std::vector parent, semi, vertex, ancestor, label; + std::vector> bucket; + int n; + + void DFS(BasicBlock* v, int parent_num); + void Compress(int v); + int Eval(int v); + void Link(int v, int w); + +public: + DominatorFinder(std::vector& blocks); +}; + +void buildDominatorTree(std::vector& blocks); +} diff --git a/src/CFGraph/RD_subst.cpp b/src/CFGraph/RD_subst.cpp index 948fb97..ac6f00a 100644 --- a/src/CFGraph/RD_subst.cpp +++ b/src/CFGraph/RD_subst.cpp @@ -8,10 +8,10 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../GraphCall/graph_calls.h" -#include "../ExpressionTransform/expr_transform.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "graph_calls.h" +#include "expr_transform.h" #define PRINT_PROF_INFO 0 #define DEBUG_CHECKS 0 diff --git a/src/CFGraph/RD_subst.h b/src/CFGraph/RD_subst.h index 188effb..e51c51b 100644 --- a/src/CFGraph/RD_subst.h +++ b/src/CFGraph/RD_subst.h @@ -2,9 +2,9 @@ #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../GraphCall/graph_calls.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "graph_calls.h" #include "CFGraph.h" #include "IR.h" diff --git a/src/CFGraph/live_variable_analysis.h b/src/CFGraph/live_variable_analysis.h index 9b92523..b5c2d17 100644 --- a/src/CFGraph/live_variable_analysis.h +++ b/src/CFGraph/live_variable_analysis.h @@ -1,6 +1,6 @@ #pragma once -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "CFGraph.h" namespace LIVE_VARIABLES diff --git a/src/CFGraph/private_variables_analysis.cpp b/src/CFGraph/private_variables_analysis.cpp index 72f5fc9..1a5b24a 100644 --- a/src/CFGraph/private_variables_analysis.cpp +++ b/src/CFGraph/private_variables_analysis.cpp @@ -1,6 +1,6 @@ -#include "../Utils/errors.h" +#include "errors.h" #include "private_variables_analysis.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../SageAnalysisTool/depGraph.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/CFGraph/private_variables_analysis.h b/src/CFGraph/private_variables_analysis.h index 649b5cf..59bbb7d 100644 --- a/src/CFGraph/private_variables_analysis.h +++ b/src/CFGraph/private_variables_analysis.h @@ -1,5 +1,5 @@ -#include "../Utils/SgUtils.h" -#include "../GraphLoop/graph_loops.h" +#include "SgUtils.h" +#include "graph_loops.h" #include "CFGraph.h" #include diff --git a/src/CreateInterTree/CreateInterTree.cpp b/src/CreateInterTree/CreateInterTree.cpp index 2699766..c48a111 100644 --- a/src/CreateInterTree/CreateInterTree.cpp +++ b/src/CreateInterTree/CreateInterTree.cpp @@ -1,7 +1,7 @@ #include "CreateInterTree.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../GraphCall/graph_calls_func.h" +#include "SgUtils.h" +#include "utils.h" +#include "graph_calls_func.h" using std::string; using std::wstring; diff --git a/src/CreateInterTree/CreateInterTree.h b/src/CreateInterTree/CreateInterTree.h index d6147a3..74f87db 100644 --- a/src/CreateInterTree/CreateInterTree.h +++ b/src/CreateInterTree/CreateInterTree.h @@ -8,7 +8,7 @@ #include "dvm.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" struct SpfInterval { diff --git a/src/DirectiveProcessing/directive_analyzer.cpp b/src/DirectiveProcessing/directive_analyzer.cpp index afc3da8..198b86a 100644 --- a/src/DirectiveProcessing/directive_analyzer.cpp +++ b/src/DirectiveProcessing/directive_analyzer.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -16,9 +16,9 @@ #include #include "../Distribution/DvmhDirective.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "directive_analyzer.h" -#include "../Utils/utils.h" +#include "utils.h" using std::vector; using std::map; diff --git a/src/DirectiveProcessing/directive_analyzer.h b/src/DirectiveProcessing/directive_analyzer.h index 28892b2..bec85df 100644 --- a/src/DirectiveProcessing/directive_analyzer.h +++ b/src/DirectiveProcessing/directive_analyzer.h @@ -1,6 +1,6 @@ #pragma once #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" void UniteNestedDirectives(std::vector &loopGraph); diff --git a/src/DirectiveProcessing/directive_creator.cpp b/src/DirectiveProcessing/directive_creator.cpp index 2bd6d86..1601d27 100644 --- a/src/DirectiveProcessing/directive_creator.cpp +++ b/src/DirectiveProcessing/directive_creator.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -15,18 +15,18 @@ #include "../Distribution/Distribution.h" #include "../Distribution/DvmhDirective_func.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "directive_parser.h" #include "directive_creator.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../Transformations/loop_transform.h" -#include "../ExpressionTransform/expr_transform.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops_func.h" +#include "../Transformations/LoopNesting/loop_transform.h" +#include "expr_transform.h" +#include "graph_calls_func.h" -#include "../Utils/AstWrapper.h" +#include "AstWrapper.h" #define PRINT_DIR_RESULT 0 diff --git a/src/DirectiveProcessing/directive_creator.h b/src/DirectiveProcessing/directive_creator.h index c2f24cd..5b20b8b 100644 --- a/src/DirectiveProcessing/directive_creator.h +++ b/src/DirectiveProcessing/directive_creator.h @@ -1,9 +1,9 @@ #pragma once #include "../Distribution/Distribution.h" -#include "../Utils/errors.h" -#include "../GraphLoop/graph_loops.h" -#include "../Utils/types.h" +#include "errors.h" +#include "graph_loops.h" +#include "types.h" void createParallelDirectives(const std::map> &loopInfo, const std::vector& regions, diff --git a/src/DirectiveProcessing/directive_creator_base.cpp b/src/DirectiveProcessing/directive_creator_base.cpp index 6a7f183..7cdb252 100644 --- a/src/DirectiveProcessing/directive_creator_base.cpp +++ b/src/DirectiveProcessing/directive_creator_base.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -10,9 +10,9 @@ #include "../ParallelizationRegions/ParRegions.h" #include "../Distribution/Arrays.h" -#include "../Transformations/loop_transform.h" +#include "../Transformations/LoopNesting/loop_transform.h" -#include "../Utils/errors.h" +#include "errors.h" #include "directive_parser.h" #include "directive_creator.h" diff --git a/src/DirectiveProcessing/directive_omp_parser.cpp b/src/DirectiveProcessing/directive_omp_parser.cpp index 6654abf..b54fa3f 100644 --- a/src/DirectiveProcessing/directive_omp_parser.cpp +++ b/src/DirectiveProcessing/directive_omp_parser.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -9,7 +9,7 @@ #include "directive_omp_parser.h" #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" using std::vector; using std::map; diff --git a/src/DirectiveProcessing/directive_omp_parser.h b/src/DirectiveProcessing/directive_omp_parser.h index 8895289..a34adea 100644 --- a/src/DirectiveProcessing/directive_omp_parser.h +++ b/src/DirectiveProcessing/directive_omp_parser.h @@ -4,7 +4,7 @@ #include #include -#include "../Utils/errors.h" +#include "errors.h" #define SPF_USER_DIR 777 #define SPF_USER_DIR_COPY 999 diff --git a/src/DirectiveProcessing/directive_parser.cpp b/src/DirectiveProcessing/directive_parser.cpp index ac11540..e653f26 100644 --- a/src/DirectiveProcessing/directive_parser.cpp +++ b/src/DirectiveProcessing/directive_parser.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -12,10 +12,10 @@ #include #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/errors.h" +#include "AstWrapper.h" +#include "errors.h" using std::string; using std::vector; diff --git a/src/DirectiveProcessing/directive_parser.h b/src/DirectiveProcessing/directive_parser.h index 4f6bd3c..f632940 100644 --- a/src/DirectiveProcessing/directive_parser.h +++ b/src/DirectiveProcessing/directive_parser.h @@ -4,8 +4,8 @@ #include #include -#include "../Utils/AstWrapper.h" -#include "../GraphLoop/graph_loops.h" +#include "AstWrapper.h" +#include "graph_loops.h" #include "../Distribution/DvmhDirective.h" struct DvmDirective diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp index 4a8f7ed..c927150 100644 --- a/src/DirectiveProcessing/insert_directive.cpp +++ b/src/DirectiveProcessing/insert_directive.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -16,13 +16,13 @@ #include "../Distribution/Arrays.h" #include "../Distribution/Distribution.h" #include "../Distribution/DvmhDirective_func.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../Sapfor.h" #include "directive_creator.h" #include "insert_directive.h" diff --git a/src/DirectiveProcessing/remote_access.cpp b/src/DirectiveProcessing/remote_access.cpp index a35c844..0323cf1 100644 --- a/src/DirectiveProcessing/remote_access.cpp +++ b/src/DirectiveProcessing/remote_access.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -18,13 +18,13 @@ #include "dvm.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/types.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "types.h" +#include "errors.h" +#include "SgUtils.h" #include "../Distribution/Arrays.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "remote_access.h" using std::vector; diff --git a/src/DirectiveProcessing/remote_access_base.cpp b/src/DirectiveProcessing/remote_access_base.cpp index c81ddbf..9f2bb39 100644 --- a/src/DirectiveProcessing/remote_access_base.cpp +++ b/src/DirectiveProcessing/remote_access_base.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -17,8 +17,8 @@ #include #include "../Distribution/Arrays.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_calls.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" #include "remote_access.h" diff --git a/src/DirectiveProcessing/shadow.cpp b/src/DirectiveProcessing/shadow.cpp index e8eb705..ce190ab 100644 --- a/src/DirectiveProcessing/shadow.cpp +++ b/src/DirectiveProcessing/shadow.cpp @@ -1,19 +1,19 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include #include #include -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "errors.h" +#include "utils.h" +#include "graph_loops_func.h" +#include "graph_calls.h" +#include "graph_calls_func.h" #include "directive_parser.h" #include "../Distribution/DvmhDirective_func.h" -#include "../Utils/SgUtils.h" -#include "../ExpressionTransform/expr_transform.h" +#include "SgUtils.h" +#include "expr_transform.h" #include "../CFGraph/CFGraph.h" diff --git a/src/DirectiveProcessing/spf_directive_preproc.cpp b/src/DirectiveProcessing/spf_directive_preproc.cpp index da7ddee..6039de6 100644 --- a/src/DirectiveProcessing/spf_directive_preproc.cpp +++ b/src/DirectiveProcessing/spf_directive_preproc.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -12,13 +12,13 @@ #include "dvm.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops.h" +#include "graph_calls_func.h" #include "../SageAnalysisTool/depInterfaceExt.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" #include "directive_parser.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../DirectiveProcessing/directive_omp_parser.h" diff --git a/src/Distribution/Array.cpp b/src/Distribution/Array.cpp index 4149bda..8f0cf0c 100644 --- a/src/Distribution/Array.cpp +++ b/src/Distribution/Array.cpp @@ -1,7 +1,7 @@ #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphCall/graph_calls.h" +#include "errors.h" +#include "utils.h" +#include "graph_calls.h" using namespace std; diff --git a/src/Distribution/Array.h b/src/Distribution/Array.h index 74a8a08..2092451 100644 --- a/src/Distribution/Array.h +++ b/src/Distribution/Array.h @@ -7,9 +7,9 @@ #include #include #include "DvmhDirectiveBase.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" -#include "../Utils/json.hpp" +#include "utils.h" +#include "errors.h" +#include "json.hpp" class Symbol; class Expression; diff --git a/src/Distribution/ArrayAnalysis.cpp b/src/Distribution/ArrayAnalysis.cpp index c56f3a4..57ac0d9 100644 --- a/src/Distribution/ArrayAnalysis.cpp +++ b/src/Distribution/ArrayAnalysis.cpp @@ -1,8 +1,8 @@ #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphCall/graph_calls.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "utils.h" +#include "graph_calls.h" +#include "SgUtils.h" #include "../DirectiveProcessing/directive_parser.h" #include "../DirectiveProcessing/directive_omp_parser.h" #include "../LoopAnalyzer/loop_analyzer.h" diff --git a/src/Distribution/CreateDistributionDirs.cpp b/src/Distribution/CreateDistributionDirs.cpp index ef34757..4ec1342 100644 --- a/src/Distribution/CreateDistributionDirs.cpp +++ b/src/Distribution/CreateDistributionDirs.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -14,9 +14,9 @@ #include "GraphCSR.h" #include "Arrays.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphLoop/graph_loops.h" +#include "errors.h" +#include "utils.h" +#include "graph_loops.h" using std::vector; using std::set; diff --git a/src/Distribution/CreateDistributionDirs.h b/src/Distribution/CreateDistributionDirs.h index 55c3bee..44eb45d 100644 --- a/src/Distribution/CreateDistributionDirs.h +++ b/src/Distribution/CreateDistributionDirs.h @@ -1,7 +1,7 @@ #pragma once -#include "../GraphLoop/graph_loops.h" -#include "../Utils/errors.h" +#include "graph_loops.h" +#include "errors.h" void createDistributionDirs(DIST::GraphCSR &reducedG, DIST::Arrays &allArrays, DataDirective &dataDirectives, std::map> &allMessages, diff --git a/src/Distribution/Cycle.cpp b/src/Distribution/Cycle.cpp index bb307ba..ade7a12 100644 --- a/src/Distribution/Cycle.cpp +++ b/src/Distribution/Cycle.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/Distribution/Cycle.h b/src/Distribution/Cycle.h index 622bf88..31c7fb5 100644 --- a/src/Distribution/Cycle.h +++ b/src/Distribution/Cycle.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/types.h" +#include "types.h" namespace Distribution { diff --git a/src/Distribution/Distribution.cpp b/src/Distribution/Distribution.cpp index 6f99a0c..64b56d5 100644 --- a/src/Distribution/Distribution.cpp +++ b/src/Distribution/Distribution.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -30,9 +30,9 @@ using namespace std::chrono; #include "Arrays.h" #include "Array.h" #include "Distribution.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" -#include "../Utils/types.h" +#include "utils.h" +#include "errors.h" +#include "types.h" #include "../Distribution/Cycle.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" @@ -455,15 +455,7 @@ namespace Distribution } if (needPrint) - { -#if _WIN32 - wstring treeM = L" , " + std::to_wstring(k + 1) + L"/" + std::to_wstring(AllCycles.size()); -#else - wstring treeM = L"conflict resolution, processing group " + std::to_wstring(k + 1) + L"/" + std::to_wstring(AllCycles.size()); -#endif - sendMessage_2lvl(treeM); - - } + sendMessage_2lvl(4, k, (int)AllCycles.size()); auto timeR = steady_clock::now(); if (countConflicts != 0) @@ -516,7 +508,7 @@ namespace Distribution } if (needPrint) - sendMessage_2lvl(L""); + sendMessage_2lvl(2); return make_pair(allOnlySecondType, globalSum); } @@ -572,13 +564,7 @@ namespace Distribution for (int z = 0; z < arraysV.size(); ++z) { const DIST::Array *array = arraysV[z]; - -#ifdef _WIN32 - wstring treeM = L" , " + std::to_wstring(z + 1) + L"/" + std::to_wstring(arrays.size()); -#else - wstring treeM = L"conflict resolution, processing array " + std::to_wstring(z + 1) + L"/" + std::to_wstring(arrays.size()); -#endif - sendMessage_2lvl(treeM); + sendMessage_2lvl(5, z, (int)arrays.size()); vector verts; @@ -605,7 +591,7 @@ namespace Distribution } } } - sendMessage_2lvl(L""); + sendMessage_2lvl(2); } else { diff --git a/src/Distribution/DvmhDirective.cpp b/src/Distribution/DvmhDirective.cpp index 1f8f0d2..558f4c0 100644 --- a/src/Distribution/DvmhDirective.cpp +++ b/src/Distribution/DvmhDirective.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -7,12 +7,12 @@ #include #include -#include "../Utils/types.h" +#include "types.h" #include "DvmhDirective.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "../Sapfor.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "dvm.h" diff --git a/src/Distribution/DvmhDirective.h b/src/Distribution/DvmhDirective.h index 24c5425..0d1b7e0 100644 --- a/src/Distribution/DvmhDirective.h +++ b/src/Distribution/DvmhDirective.h @@ -7,9 +7,9 @@ #include "Array.h" #include "DvmhDirectiveBase.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/types.h" -#include "../Utils/utils.h" +#include "AstWrapper.h" +#include "types.h" +#include "utils.h" extern int sharedMemoryParallelization; diff --git a/src/Distribution/DvmhDirectiveBase.cpp b/src/Distribution/DvmhDirectiveBase.cpp index 28576a8..88f2491 100644 --- a/src/Distribution/DvmhDirectiveBase.cpp +++ b/src/Distribution/DvmhDirectiveBase.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -10,11 +10,11 @@ #include "../Distribution/Array.h" #include "../Distribution/Arrays.h" #include "../Distribution/GraphCSR.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/json.hpp" +#include "errors.h" +#include "utils.h" +#include "json.hpp" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::vector; using std::tuple; diff --git a/src/Distribution/DvmhDirectiveBase.h b/src/Distribution/DvmhDirectiveBase.h index d3c98a7..b1bfe90 100644 --- a/src/Distribution/DvmhDirectiveBase.h +++ b/src/Distribution/DvmhDirectiveBase.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/json.hpp" +#include "json.hpp" typedef enum lang : int { LANG_C, LANG_F } language; typedef enum dist : int { BLOCK, NONE } distType; diff --git a/src/Distribution/DvmhDirective_func.h b/src/Distribution/DvmhDirective_func.h index 78bf560..7d4fa13 100644 --- a/src/Distribution/DvmhDirective_func.h +++ b/src/Distribution/DvmhDirective_func.h @@ -4,7 +4,7 @@ #include #include #include "dvm.h" -#include "../Utils/types.h" +#include "types.h" SgExpression* createAndSetNext(const int side, const int variant, SgExpression *p); std::vector genSubscripts(const std::vector> &shadowRenew, const std::vector> &shadowRenewShifts); diff --git a/src/Distribution/GraphCSR.cpp b/src/Distribution/GraphCSR.cpp index 08f712e..9d17db0 100644 --- a/src/Distribution/GraphCSR.cpp +++ b/src/Distribution/GraphCSR.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -19,8 +19,8 @@ extern int passDone; #include "Cycle.h" #include "Arrays.h" #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "utils.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" @@ -830,13 +830,13 @@ namespace Distribution color[k] = WHITE; findFrom = currentV; -#ifdef _WIN32 +/*#ifdef _WIN32 if (needPrint) { wstring vertexM = std::to_wstring(k + 1) + L"/" + std::to_wstring(vertByTrees[t].size()); sendMessage_2lvl(wstring(L" , ") + wstring(treeM.begin(), treeM.end()) + L" " + wstring(vertexM.begin(), vertexM.end())); } -#endif +#endif*/ __spf_print(PRINT_TIMES && needPrint, "v (tree %d) = %d (with neighb %d) ", t, i, neighbors[i + 1] - neighbors[i]); activeV[activeCounter++] = currentV; FindLoop(cyclesTmp[t], currentV, currentV, numbers); @@ -847,8 +847,8 @@ namespace Distribution maxLoopDim = wasMaxLoopDim; } - if (needPrint) - sendMessage_2lvl(L""); + /*if (needPrint) + sendMessage_2lvl(2);*/ } catch (int code) { diff --git a/src/Distribution/GraphCSR.h b/src/Distribution/GraphCSR.h index c52d665..03024de 100644 --- a/src/Distribution/GraphCSR.h +++ b/src/Distribution/GraphCSR.h @@ -5,7 +5,7 @@ #include #include -#include "../Utils/RationalNum.h" +#include "RationalNum.h" typedef enum links { RR_link, WR_link, WW_link } LinkType; diff --git a/src/DvmhRegions/DvmhRegion.h b/src/DvmhRegions/DvmhRegion.h index 10a9d34..2db6d20 100644 --- a/src/DvmhRegions/DvmhRegion.h +++ b/src/DvmhRegions/DvmhRegion.h @@ -1,6 +1,6 @@ #pragma once -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include diff --git a/src/DvmhRegions/DvmhRegionInserter.cpp b/src/DvmhRegions/DvmhRegionInserter.cpp index 57dff85..db6f51d 100644 --- a/src/DvmhRegions/DvmhRegionInserter.cpp +++ b/src/DvmhRegions/DvmhRegionInserter.cpp @@ -11,7 +11,7 @@ #include "DvmhRegionInserter.h" #include "DvmhRegions/RegionsMerger.h" #include "../VerificationCode/verifications.h" -#include "../Transformations/function_purifying.h" +#include "../Transformations/FunctionPurifying/function_purifying.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/DvmhRegions/DvmhRegionInserter.h b/src/DvmhRegions/DvmhRegionInserter.h index eba428d..651428d 100644 --- a/src/DvmhRegions/DvmhRegionInserter.h +++ b/src/DvmhRegions/DvmhRegionInserter.h @@ -1,10 +1,10 @@ #pragma once -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" +#include "expr_transform.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "ReadWriteAnalyzer.h" #include "DvmhRegion.h" diff --git a/src/DvmhRegions/LoopChecker.h b/src/DvmhRegions/LoopChecker.h index 793b5ed..6e2c7ae 100644 --- a/src/DvmhRegions/LoopChecker.h +++ b/src/DvmhRegions/LoopChecker.h @@ -1,7 +1,7 @@ #pragma once -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" #include #include diff --git a/src/DvmhRegions/ReadWriteAnalyzer.h b/src/DvmhRegions/ReadWriteAnalyzer.h index 8e31306..5a9d49f 100644 --- a/src/DvmhRegions/ReadWriteAnalyzer.h +++ b/src/DvmhRegions/ReadWriteAnalyzer.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "VarUsages.h" #include #include diff --git a/src/DvmhRegions/TypedSymbol.h b/src/DvmhRegions/TypedSymbol.h index 5e74310..e4b0a03 100644 --- a/src/DvmhRegions/TypedSymbol.h +++ b/src/DvmhRegions/TypedSymbol.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include enum class VAR_TYPE { VAR_ARR, VAR_DISTR_ARR, VAR_SCALAR, VAR_ANY, VAR_UNDEFINED }; diff --git a/src/DynamicAnalysis/createParallelRegions.cpp b/src/DynamicAnalysis/createParallelRegions.cpp index 43be93b..7d641c3 100644 --- a/src/DynamicAnalysis/createParallelRegions.cpp +++ b/src/DynamicAnalysis/createParallelRegions.cpp @@ -5,10 +5,10 @@ #include "./createParallelRegions.h" #include "../CreateInterTree/CreateInterTree.h" -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include "./gcov_info.h" #include "./gCov_parser_func.h" -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/DynamicAnalysis/createParallelRegions.h b/src/DynamicAnalysis/createParallelRegions.h index 8818511..ced7137 100644 --- a/src/DynamicAnalysis/createParallelRegions.h +++ b/src/DynamicAnalysis/createParallelRegions.h @@ -1,10 +1,10 @@ #pragma once -#include "../Utils/utils.h" +#include "utils.h" #include "./gcov_info.h" #include "../CreateInterTree/CreateInterTree.h" -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include #include diff --git a/src/DynamicAnalysis/gCov_parser.cpp b/src/DynamicAnalysis/gCov_parser.cpp index c8db6e7..53ff70d 100644 --- a/src/DynamicAnalysis/gCov_parser.cpp +++ b/src/DynamicAnalysis/gCov_parser.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,7 +8,7 @@ #include "dvm.h" #include "gCov_parser_func.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/DynamicAnalysis/gCov_parser_func.h b/src/DynamicAnalysis/gCov_parser_func.h index 843d150..87594a9 100644 --- a/src/DynamicAnalysis/gCov_parser_func.h +++ b/src/DynamicAnalysis/gCov_parser_func.h @@ -5,7 +5,7 @@ #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" #include "gcov_info.h" #include "../CreateInterTree/CreateInterTree.h" diff --git a/src/DynamicAnalysis/gcov_info.cpp b/src/DynamicAnalysis/gcov_info.cpp index c37cf81..0814a68 100644 --- a/src/DynamicAnalysis/gcov_info.cpp +++ b/src/DynamicAnalysis/gcov_info.cpp @@ -1,10 +1,10 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include #include -#include "../Utils/errors.h" +#include "errors.h" #include "gcov_info.h" diff --git a/src/DynamicAnalysis/gcov_info.h b/src/DynamicAnalysis/gcov_info.h index 29f7527..91b09d4 100644 --- a/src/DynamicAnalysis/gcov_info.h +++ b/src/DynamicAnalysis/gcov_info.h @@ -5,7 +5,7 @@ #include #include -#include "../Utils/utils.h" +#include "utils.h" //make 'class' - need friend for Gcov_info struct Perform diff --git a/src/GraphCall/graph_calls.cpp b/src/GraphCall/graph_calls.cpp index 4ce117d..1109d48 100644 --- a/src/GraphCall/graph_calls.cpp +++ b/src/GraphCall/graph_calls.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -15,13 +15,13 @@ #include "graph_calls_func.h" #include "../CFGraph/CFGraph.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include "../DirectiveProcessing/directive_parser.h" -#include "../Utils/SgUtils.h" -#include "../Utils/json.hpp" +#include "SgUtils.h" +#include "json.hpp" #include "../ParallelizationRegions/ParRegions_func.h" #include "../DynamicAnalysis/gCov_parser_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../VerificationCode/verifications.h" diff --git a/src/GraphCall/graph_calls.h b/src/GraphCall/graph_calls.h index 17fc462..0de481e 100644 --- a/src/GraphCall/graph_calls.h +++ b/src/GraphCall/graph_calls.h @@ -3,10 +3,10 @@ #include #include -#include "../Utils/AstWrapper.h" -#include "../Utils/utils.h" +#include "AstWrapper.h" +#include "utils.h" #include "../DirectiveProcessing/shadow.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" static const char* paramNames[] = { "NONE_T", "ARRAY_T", "STRING_ARRAY_T", "STRING_T", "SCALAR_CHAR_T", "SCALAR_BOOL_T", "SCALAR_SHORT_T", "SCALAR_INT_T", "SCALAR_LONG_INT_T", diff --git a/src/GraphCall/graph_calls_base.cpp b/src/GraphCall/graph_calls_base.cpp index 94fdd43..fdb6393 100644 --- a/src/GraphCall/graph_calls_base.cpp +++ b/src/GraphCall/graph_calls_base.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -10,10 +10,10 @@ #include #include -#include "../Utils/errors.h" +#include "errors.h" #include "graph_calls.h" #include "../Distribution/Distribution.h" -#include "../Utils/utils.h" +#include "utils.h" #include "../ParallelizationRegions/ParRegions.h" using std::vector; diff --git a/src/GraphCall/graph_calls_func.h b/src/GraphCall/graph_calls_func.h index acba4a7..44e029c 100644 --- a/src/GraphCall/graph_calls_func.h +++ b/src/GraphCall/graph_calls_func.h @@ -5,7 +5,7 @@ #include #include "graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" #include "Utils/json.hpp" diff --git a/src/GraphLoop/graph_loops.cpp b/src/GraphLoop/graph_loops.cpp index 485fe21..e35ae5c 100644 --- a/src/GraphLoop/graph_loops.cpp +++ b/src/GraphLoop/graph_loops.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -12,26 +12,26 @@ #include "dvm.h" #include "../Sapfor.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "../ParallelizationRegions/ParRegions_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" #include "../Distribution/GraphCSR.h" #include "../Distribution/Arrays.h" #include "../Distribution/Distribution.h" #include "graph_loops.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "utils.h" +#include "SgUtils.h" -#include "../Utils/errors.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/json.hpp" +#include "errors.h" +#include "AstWrapper.h" +#include "json.hpp" #include "../DirectiveProcessing/directive_parser.h" #include "../DynamicAnalysis/gCov_parser_func.h" -#include "../Transformations/array_assign_to_loop.h" +#include "../Transformations/VectorAssignToLoop/array_assign_to_loop.h" using std::vector; using std::map; @@ -520,7 +520,7 @@ static void findArrayRef(SgExpression *exp, bool isWirte, set& use { if (exp) { - if (exp->variant() == ARRAY_REF) + if (isArrayRef(exp)) { DIST::Array *arrayRef = NULL; SgSymbol *symbS = OriginalSymbol(exp->symbol()); diff --git a/src/GraphLoop/graph_loops.h b/src/GraphLoop/graph_loops.h index 39fd48b..70d12e5 100644 --- a/src/GraphLoop/graph_loops.h +++ b/src/GraphLoop/graph_loops.h @@ -5,8 +5,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/types.h" +#include "errors.h" +#include "types.h" #include "../Distribution/DvmhDirective.h" #include "../Distribution/Distribution.h" diff --git a/src/GraphLoop/graph_loops_base.cpp b/src/GraphLoop/graph_loops_base.cpp index 98e13ca..031a4d6 100644 --- a/src/GraphLoop/graph_loops_base.cpp +++ b/src/GraphLoop/graph_loops_base.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -23,8 +23,8 @@ using std::make_pair; using std::get; #include "graph_loops.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/errors.h" +#include "graph_calls_func.h" +#include "errors.h" #include "../Distribution/Distribution.h" #include "../Distribution/CreateDistributionDirs.h" #include "../ParallelizationRegions/ParRegions.h" diff --git a/src/LoopAnalyzer/allocations_prepoc.cpp b/src/LoopAnalyzer/allocations_prepoc.cpp index fdf04dc..4d714d2 100644 --- a/src/LoopAnalyzer/allocations_prepoc.cpp +++ b/src/LoopAnalyzer/allocations_prepoc.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,8 +8,8 @@ #include #include "dvm.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" using std::set; using std::pair; diff --git a/src/LoopAnalyzer/dep_analyzer.cpp b/src/LoopAnalyzer/dep_analyzer.cpp index 67d99ed..aa17a19 100644 --- a/src/LoopAnalyzer/dep_analyzer.cpp +++ b/src/LoopAnalyzer/dep_analyzer.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -20,8 +20,8 @@ #include "dvm.h" #include "loop_analyzer.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "utils.h" +#include "SgUtils.h" #include "../ParallelizationRegions/ParRegions_func.h" #include "../SageAnalysisTool/depGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" diff --git a/src/LoopAnalyzer/implicit_loops_analyzer.cpp b/src/LoopAnalyzer/implicit_loops_analyzer.cpp index 4bf5b8e..94f047f 100644 --- a/src/LoopAnalyzer/implicit_loops_analyzer.cpp +++ b/src/LoopAnalyzer/implicit_loops_analyzer.cpp @@ -9,6 +9,9 @@ #include "GraphCall/graph_calls.h" #include "implicit_loops_analyzer.h" +using namespace std; +using namespace SAPFOR; + using std::map; using std::set; using std::vector; @@ -21,38 +24,46 @@ using std::to_string; enum VisitState { UNVISITED = 0, VISITING = 1, VISITED = 2 }; -static void dfs(SAPFOR::BasicBlock* block, map& visit, vector>& startAndEnd, SAPFOR::BasicBlock* prev) { - if (!block) - return; +void dfs(SAPFOR::BasicBlock* block, + std::map& visit, + std::vector>& startAndEnd, + SAPFOR::BasicBlock* prev) { + if (!block) return; - if (visit[block->getNumber()] == VISITED) - { - cout << "error"; + int id = block->getNumber(); + + if (visit[id] == VISITING) { + // Обратное ребро — фиксируем цикл + startAndEnd.emplace_back(prev, block); + //std::cout << "Back edge detected: " << prev->getNumber() << " -> " << id << std::endl; return; } - if (visit[block->getNumber()] == VISITING) - { - visit[block->getNumber()] = VISITED; - startAndEnd.push_back(make_pair(prev, block)); + if (visit[id] == VISITED) { return; } - visit[block->getNumber()] = VISITING; - for (auto i : block->getNext()) - dfs(i, visit, startAndEnd, block); + visit[id] = VISITING; + + for (auto next : block->getNext()) { + dfs(next, visit, startAndEnd, block); + } + + visit[id] = VISITED; } -static void printBlock(SAPFOR::BasicBlock* block) -{ +static void printBlock(SAPFOR::BasicBlock* block) { cout << "block - " << block->getNumber() << endl; cout << "next -"; for (auto i : block->getNext()) + { cout << " " << i->getNumber(); - + } cout << endl << "prev -"; for (auto i : block->getPrev()) + { cout << " " << i->getNumber(); + } cout << endl; for (auto i : block->getInstructions()) @@ -60,93 +71,85 @@ static void printBlock(SAPFOR::BasicBlock* block) string resValue = ""; string arg1Value = ""; string arg2Value = ""; - if (i->getInstruction()->getResult() != NULL && i->getInstruction()->getResult()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) - { + if (i->getInstruction()->getResult() != nullptr && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR) { resValue = i->getInstruction()->getResult()->getValue(); i->getInstruction()->getResult()->setValue(i->getInstruction()->getResult()->getValue() + to_string(i->getInstruction()->getResult()->getNumber())); } - - if (i->getInstruction()->getArg1() != NULL && i->getInstruction()->getArg1()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) - { + if (i->getInstruction()->getArg1() != nullptr && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR) { arg1Value = i->getInstruction()->getArg1()->getValue(); i->getInstruction()->getArg1()->setValue(i->getInstruction()->getArg1()->getValue() + to_string(i->getInstruction()->getArg1()->getNumber())); } - - if (i->getInstruction()->getArg2() != NULL && i->getInstruction()->getArg2()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) - { + if (i->getInstruction()->getArg2() != nullptr && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR) { arg2Value = i->getInstruction()->getArg2()->getValue(); i->getInstruction()->getArg2()->setValue(i->getInstruction()->getArg2()->getValue() + to_string(i->getInstruction()->getArg2()->getNumber())); } cout << i->getNumber() << " " << i->getInstruction()->dump() << endl; - if (i->getInstruction()->getResult() != NULL && i->getInstruction()->getResult()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) - i->getInstruction()->getResult()->setValue(resValue); - - if (i->getInstruction()->getArg1() != NULL && i->getInstruction()->getArg1()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + if (i->getInstruction()->getResult() != nullptr && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR) { + i->getInstruction()->getResult()->setValue(resValue); + } + if (i->getInstruction()->getArg1() != nullptr && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR) { i->getInstruction()->getArg1()->setValue(arg1Value); - - if (i->getInstruction()->getArg2() != NULL && i->getInstruction()->getArg2()->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + } + if (i->getInstruction()->getArg2() != nullptr && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR) { i->getInstruction()->getArg2()->setValue(arg2Value); + } } cout << endl; } -static void getLoopBody(SAPFOR::BasicBlock* loopHeader, const set& loopExits, std::vector& loopBody) -{ - set visited; +void getLoopBody(SAPFOR::BasicBlock* loopHeader, const std::set& loopExits, std::vector& loopBody) { + std::set visited; std::stack stack; stack.push(loopHeader); - while (!stack.empty()) - { + while (!stack.empty()) { auto block = stack.top(); stack.pop(); - if (visited.count(block)) - continue; + if (visited.count(block)) continue; visited.insert(block); - for (auto& succ : block->getNext()) - { - if (loopExits.count(succ)) - continue; - - if (!visited.count(succ)) - stack.push(succ); + for (auto succ : block->getNext()) { + if (loopExits.count(succ)) continue; + if (!visited.count(succ)) { + stack.push(succ); + } } } - set backReachable; + std::set backReachable; std::stack reverseStack; reverseStack.push(loopHeader); - while (!reverseStack.empty()) - { + while (!reverseStack.empty()) { auto block = reverseStack.top(); reverseStack.pop(); - if (backReachable.count(block)) - continue; + if (backReachable.count(block)) continue; backReachable.insert(block); - for (auto& pred : block->getPrev()) - if (visited.count(pred) && !backReachable.count(pred)) + for (auto pred : block->getPrev()) { + if (visited.count(pred) && !backReachable.count(pred)) { reverseStack.push(pred); + } + } } - for (auto& block : visited) - if (backReachable.count(block)) + for (auto block : visited) { + if (backReachable.count(block)) { loopBody.push_back(block); + } + } } -static set findRegisterSourceVariables(const std::vector& blocks, SAPFOR::Argument* var) -{ - set result; - set visited; +set findRegisterSourceVariables(const std::vector& blocks, SAPFOR::Argument* var) { + std::set result; + std::set visited; std::stack workStack; workStack.push(var); @@ -159,15 +162,14 @@ static set findRegisterSourceVariables(const std::vector findRegisterSourceVariables(const std::vectorgetInstructions()) - { + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { auto instr = instrWrapper->getInstruction(); if (!instr || instr->getResult() != variable) continue; @@ -187,23 +187,21 @@ static set findRegisterSourceVariables(const std::vectorgetArg1(); auto arg2 = instr->getArg2(); - if (isBinaryOp(op) && arg1 && arg2) - { - if (arg1->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + if (isBinaryOp(op) && arg1 && arg2) { + if (arg1->getType() == CFG_ARG_TYPE::VAR) result.insert(arg1); - else if (arg1->getType() == SAPFOR::CFG_ARG_TYPE::REG) + else if (arg1->getType() == CFG_ARG_TYPE::REG) workStack.push(arg1); - if (arg2->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + if (arg2->getType() == CFG_ARG_TYPE::VAR) result.insert(arg2); - else if (arg2->getType() == SAPFOR::CFG_ARG_TYPE::REG) + else if (arg2->getType() == CFG_ARG_TYPE::REG) workStack.push(arg2); } - else if (isUnaryOp(op) && arg1) - { - if (arg1->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + else if (isUnaryOp(op) && arg1) { + if (arg1->getType() == CFG_ARG_TYPE::VAR) result.insert(arg1); - else if (arg1->getType() == SAPFOR::CFG_ARG_TYPE::REG) + else if (arg1->getType() == CFG_ARG_TYPE::REG) workStack.push(arg1); } } @@ -213,8 +211,7 @@ static set findRegisterSourceVariables(const std::vector getPhiArguments(SAPFOR::BasicBlock* block, SAPFOR::Instruction* phiInstr) -{ +std::vector getPhiArguments(SAPFOR::BasicBlock* block, SAPFOR::Instruction* phiInstr) { std::vector result; auto& instructions = block->getInstructions(); @@ -222,23 +219,21 @@ static std::vector getPhiArguments(SAPFOR::BasicBlock* blo for (int i = instructions.size() - 1; i >= 0; --i) { auto instr = instructions[i]->getInstruction(); - if (collecting) - { - if (instr->getOperation() == SAPFOR::CFG_OP::PARAM) - { + if (collecting) { + if (instr->getOperation() == SAPFOR::CFG_OP::PARAM) { auto arg = instr->getArg1(); - if (arg) - result.push_back(instr); + if (arg) { + result.push_back(instr); + } + } + else { + break; } - else - break; } - if (!instr) - continue; + if (!instr) continue; - if (instr == phiInstr) - { + if (instr == phiInstr) { collecting = true; continue; } @@ -248,215 +243,346 @@ static std::vector getPhiArguments(SAPFOR::BasicBlock* blo return result; } -SAPFOR::BasicBlock* findInstructionBlock(SAPFOR::Instruction* targetInstr, const std::vector& blocks) -{ - for (auto& block : blocks) - { - for (auto& instrWrapper : block->getInstructions()) - { +SAPFOR::BasicBlock* findInstructionBlock(SAPFOR::Instruction* targetInstr, const std::vector& blocks) { + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { auto instr = instrWrapper->getInstruction(); - if (instr == targetInstr) + if (instr == targetInstr) { return block; + } } } - return NULL; + return nullptr; } -static SAPFOR::BasicBlock* findInstructionBlockByNumber(int number, const std::vector& blocks) -{ - for (auto& block : blocks) - { - for (auto& instrWrapper : block->getInstructions()) - { +SAPFOR::BasicBlock* findInstructionBlockByNumber(int number, const std::vector& blocks) { + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { auto instr = instrWrapper->getInstruction(); - if (instr->getNumber() == number) + if (instr->getNumber() == number) { return block; + } } } - return NULL; + return nullptr; } -static void findInductiveVars(const std::vector& blocks, - const std::vector& Loopblocks, SAPFOR::BasicBlock* loopHeader, - const set& loopExits) -{ - set inductiveVars; - set relevantBlocks = { loopHeader }; +set findSourceVariablesRecursive(const std::vector& blocks, SAPFOR::Argument* var) { + std::set result; + std::set visited; + std::stack workStack; + workStack.push(var); - for (auto& block : relevantBlocks) - { - for (auto& instrWrapper : block->getInstructions()) - { + while (!workStack.empty()) { + auto variable = workStack.top(); workStack.pop(); + if (!variable || visited.count(variable)) continue; + visited.insert(variable); + + bool foundDefinition = false; + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { + auto instr = instrWrapper->getInstruction(); + if (!instr || instr->getResult() != variable) continue; + + foundDefinition = true; + auto arg1 = instr->getArg1(); + auto arg2 = instr->getArg2(); + if (arg1 && arg1->getType() == CFG_ARG_TYPE::VAR) result.insert(arg1); + if (arg1 && arg1->getType() == CFG_ARG_TYPE::REG) workStack.push(arg1); + if (arg2 && arg2->getType() == CFG_ARG_TYPE::VAR) result.insert(arg2); + if (arg2 && arg2->getType() == CFG_ARG_TYPE::REG) workStack.push(arg2); + } + } + if (!foundDefinition) result.insert(variable); // параметр + } + + return result; +} + +// Версия findInductiveVars без логов, только финальная статистика + +// Версия findInductiveVars с расширенной поддержкой и анализом цепочек зависимостей через регистры и другие операции + +std::set traceRecursiveSources(const std::vector& blocks, SAPFOR::Argument* arg) { + std::set result; + std::set visited; + std::stack stack; + stack.push(arg); + + while (!stack.empty()) { + auto curr = stack.top(); stack.pop(); + if (!curr || visited.count(curr)) continue; + visited.insert(curr); + + if (curr->getType() == CFG_ARG_TYPE::VAR) { + result.insert(curr->getValue()); + continue; + } + + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { + auto instr = instrWrapper->getInstruction(); + if (!instr) continue; + if (instr->getResult() != curr) continue; + + auto a1 = instr->getArg1(); + auto a2 = instr->getArg2(); + if (a1) stack.push(a1); + if (a2) stack.push(a2); + } + } + } + + return result; +} + +// Улучшенная версия с трассировкой цепочек регистров до phi-переменных + +std::set traceSourcesDeepToPhi(const std::vector& blocks, SAPFOR::Argument* arg, const std::set& phiNames) { + std::set reachedPhi; + std::set visited; + std::stack stack; + stack.push(arg); + + while (!stack.empty()) { + auto curr = stack.top(); stack.pop(); + if (!curr || visited.count(curr)) continue; + visited.insert(curr); + + //std::cout << "[DEBUG] visiting " + // << (curr->getType() == CFG_ARG_TYPE::VAR ? "VAR" : + // curr->getType() == CFG_ARG_TYPE::REG ? "REG" : "OTHER") + // << ": ." << curr->getValue() << "." << std::endl; + + if (phiNames.count(curr->getValue())) { + //std::cout << "[DEBUG] REACHED phi: ." << curr->getValue() << "." << std::endl; + reachedPhi.insert(curr->getValue()); + continue; + } + + for (auto block : blocks) { + for (auto instrWrapper : block->getInstructions()) { + auto instr = instrWrapper->getInstruction(); + if (!instr) continue; + if (instr->getResult() != curr) continue; + + auto a1 = instr->getArg1(); + auto a2 = instr->getArg2(); + if (a1) stack.push(a1); + if (a2) stack.push(a2); + } + } + } + return reachedPhi; +} + +void findInductiveVars(const std::vector& blocks, + const std::vector& Loopblocks, + SAPFOR::BasicBlock* loopHeader, + const std::set& loopExits) { + std::set inductiveVars; + std::set relevantBlocks = { loopHeader }; + + for (auto block : relevantBlocks) { + for (auto instrWrapper : block->getInstructions()) { auto instr = instrWrapper->getInstruction(); - if (!instr) - continue; + if (!instr) continue; auto op = instr->getOperation(); auto res = instr->getResult(); auto arg1 = instr->getArg1(); auto arg2 = instr->getArg2(); - if (op == SAPFOR::CFG_OP::JUMP_IF) - { - if (arg1 && arg1->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + if (op == CFG_OP::JUMP_IF) { + if (arg1 && arg1->getType() == CFG_ARG_TYPE::VAR) { inductiveVars.insert(arg1->getValue()); - - if (arg1 && arg1->getType() == SAPFOR::CFG_ARG_TYPE::REG) - { + } + if (arg1 && arg1->getType() == CFG_ARG_TYPE::REG) { auto foundVariables = findRegisterSourceVariables(blocks, arg1); - for (auto& var : foundVariables) + for (auto var : foundVariables) { inductiveVars.insert(var->getValue()); + } } } } } - set finalInductiveVars; + std::set finalInductiveVars; - for (auto& instrWrapper : loopHeader->getInstructions()) - { + for (auto instrWrapper : loopHeader->getInstructions()) { auto instr = instrWrapper->getInstruction(); - if (!instr || instr->getOperation() != SAPFOR::CFG_OP::F_CALL || !instr->getArg1() || instr->getArg1()->getValue() != "FI_FUNCTION") - continue; + if (!instr || instr->getOperation() != SAPFOR::CFG_OP::F_CALL || !instr->getArg1() || instr->getArg1()->getValue() != "FI_FUNCTION") continue; auto phiRes = instr->getResult(); - if (!phiRes || !inductiveVars.count(phiRes->getValue())) - continue; + if (!phiRes || !inductiveVars.count(phiRes->getValue())) continue; auto currentBlock = findInstructionBlock(instr, blocks); - if (!currentBlock) - continue; + if (!currentBlock) continue; auto phiArgs = getPhiArguments(currentBlock, instr); + bool hasInLoopDefinition = false; - for (const auto& argInstr : phiArgs) - { - if (!argInstr) - continue; + for (const auto& argInstr : phiArgs) { + if (!argInstr) continue; - int definitionInstrNumber = stoi(argInstr->getArg1()->getValue()); - if (definitionInstrNumber == -1) - continue; + int definitionInstrNumber = std::stoi(argInstr->getArg1()->getValue()); + if (definitionInstrNumber == -1) continue; auto phiBlock = findInstructionBlockByNumber(definitionInstrNumber, blocks); - if (!phiBlock) - continue; + if (!phiBlock) continue; - if (std::find(Loopblocks.begin(), Loopblocks.end(), phiBlock) != Loopblocks.end()) + if (std::find(Loopblocks.begin(), Loopblocks.end(), phiBlock) != Loopblocks.end()) { hasInLoopDefinition = true; + } } - if (hasInLoopDefinition) + if (hasInLoopDefinition) { finalInductiveVars.insert(phiRes->getValue()); + } } - for (auto& i : finalInductiveVars) - cout << "Confirmed inductive variable: " << i << endl; + for (const auto& var : finalInductiveVars) { + std::cout << "Confirmed inductive variable: " << var << std::endl; + } - if (finalInductiveVars.empty()) - cout << "No confirmed inductive variables found." << endl; + if (finalInductiveVars.empty()) { + std::cout << "No confirmed inductive variables found." << std::endl; + } } -static SAPFOR::Instruction* findInstructionAfterLoop(const std::vector& loopBody) -{ - set loopSet(loopBody.begin(), loopBody.end()); - for (auto& block : loopBody) - { - for (auto& succ : block->getNext()) - { - if (!loopSet.count(succ)) - { - // + +Instruction* findInstructionAfterLoop(const std::vector& loopBody) { + std::set loopSet(loopBody.begin(), loopBody.end()); + + for (auto block : loopBody) { + for (auto succ : block->getNext()) { + if (!loopSet.count(succ)) { + // Нашли выход из цикла — возьмём первую инструкцию auto instructions = succ->getInstructions(); - for (auto& wrapper : instructions) - if (auto instr = wrapper->getInstruction()) + if (instructions.empty()) { + std::cout << "Exit block has no instructions." << std::endl; + } + for (auto wrapper : instructions) { + if (auto instr = wrapper->getInstruction()) { return instr; + } + } } } } - return NULL; // + return nullptr; // не нашли } -void findImplicitLoops(const map>& fullIR_SSA, const char* fileName) -{ +bool isEqual(const char* cstr, const std::string& str) { + return str == cstr; +} + +void findImplicitLoops(const std::map>& fullIR_SSA, const char* fileName) { for (auto& i : fullIR_SSA) { - //for (auto& j : i.second) + //for (auto j : i.second) // printblock(j); - if (fileName != i.first->fileName) + if (!isEqual(fileName, i.first->fileName)) continue; + if (isEqual("csol.for", i.first->fileName) || isEqual("reblns.for", i.first->fileName) || isEqual("adjont.for", i.first->fileName) + || isEqual("beginf.for", i.first->fileName) || isEqual("dsnp1.for", i.first->fileName) || isEqual("dsnpnm.for", i.first->fileName) + || isEqual("decod3.for", i.first->fileName)) + continue; + + /*if (!isEqual("ddst2.for", i.first->fileName)) + continue;*/ + map visited; - for (auto& i : i.second) + for (auto i : i.second) visited[i->getNumber()] = UNVISITED; - //vector visited(i.second.size(), UNVISITED); + //for (auto j : i.second) + // printBlock(j); + + + + //vector visited(i.second.size(), UNVISITED); vector> startAndEnd; dfs(i.second[0], visited, startAndEnd, NULL); + //continue; + vector loops; for (auto& [tail, header] : startAndEnd) { set loopExits; - for (auto& succ : tail->getNext()) - if (succ != header) + for (auto succ : tail->getNext()) { + if (succ != header) { loopExits.insert(succ); + } + } vector loopBody; getLoopBody(header, loopExits, loopBody); - cout << "LOOP DETECTED:" << endl; - cout << " Header: " << header->getNumber() << endl; - cout << " Tail: " << tail->getNumber() << endl; - cout << " Body blocks: "; - for (auto& block : loopBody) - cout << block->getNumber() << " "; - cout << endl; + //cout << "LOOP DETECTED:" << endl; + //cout << " Header: " << header->getNumber() << endl; + //cout << " Tail: " << tail->getNumber() << endl; + //cout << " Body blocks: "; + //for (auto block : loopBody) { + // cout << block->getNumber() << " "; + //} + //cout << endl; findInductiveVars(i.second, loopBody, header, loopExits); - SAPFOR::Instruction* instructionAfterLoop = findInstructionAfterLoop(loopBody); - if (instructionAfterLoop == NULL) - { + continue; + + + Instruction* instructionAfterLoop = findInstructionAfterLoop(loopBody); + + if (instructionAfterLoop == NULL) { cout << "Warning: instruction after loop not found!" << endl; + cout << i.first->fileName << endl; continue; } auto firstInstruction = header->getInstructions()[0]->getInstruction(); auto lastInstruction = tail->getInstructions().back()->getInstruction(); - cout << "first - " << firstInstruction->getNumber() << " last - " << lastInstruction->getNumber() << " after - " << instructionAfterLoop->getNumber() << endl; - auto x = firstInstruction->getOperator(); + //cout << "first - " << firstInstruction->getNumber() << " last - " << lastInstruction->getNumber() << " after - " << instructionAfterLoop->getNumber() << endl; + //auto x = firstInstruction->getOperator(); auto tmpLoop = new LoopGraph(); tmpLoop->isFor = true; tmpLoop->lineNum = firstInstruction->getOperator()->lineNumber(); tmpLoop->lineNumAfterLoop = instructionAfterLoop->getOperator()->lineNumber(); - if (firstInstruction->getOperator()->variant() == FOR_NODE) - { + //continue; + + if (firstInstruction->getOperator()->variant() == FOR_NODE) { SgForStmt* stmt = isSgForStmt(firstInstruction->getOperator()); + cout << "for loop" << endl;// << stmt->sunparse() << endl; } - else if (firstInstruction->getOperator()->variant() == WHILE_NODE) - { + else if (firstInstruction->getOperator()->variant() == WHILE_NODE) { SgWhileStmt* stmt = isSgWhileStmt(firstInstruction->getOperator()); + cout << (stmt->conditional() == NULL ? "infinit" : "") << "while loop" << endl;//<< stmt->sunparse() << endl; } - else if (firstInstruction->getOperator()->variant() == DO_WHILE_NODE) - { + else if (firstInstruction->getOperator()->variant() == DO_WHILE_NODE) { SgWhileStmt* stmt = isSgDoWhileStmt(firstInstruction->getOperator()); + cout << "do while loop" << endl;// << stmt->sunparse() << endl; } - else if (firstInstruction->getOperator()->variant() == LOOP_NODE) + else if (firstInstruction->getOperator()->variant() == LOOP_NODE) { cout << "not known loop" << endl;// << firstInstruction->getOperator()->sunparse() << endl; - else + } + else { + cout << "goto loop" << endl;// firstInstruction->getOperator()->sunparse() << endl; + } cout << "loop start line " << tmpLoop->lineNum << endl; cout << "after loop line " << tmpLoop->lineNumAfterLoop << endl << endl; @@ -464,4 +590,4 @@ void findImplicitLoops(const map>& fullIR loops.push_back(tmpLoop); } } -} +} \ No newline at end of file diff --git a/src/LoopAnalyzer/loop_analyzer.cpp b/src/LoopAnalyzer/loop_analyzer.cpp index a544fca..dd312bf 100644 --- a/src/LoopAnalyzer/loop_analyzer.cpp +++ b/src/LoopAnalyzer/loop_analyzer.cpp @@ -18,7 +18,7 @@ #include #include -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #if _WIN32 && NDEBUG && __BOOST #include @@ -30,25 +30,25 @@ extern int passDone; #include "../Distribution/Arrays.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../DirectiveProcessing/directive_parser.h" #include "../DirectiveProcessing/directive_creator.h" -#include "../Utils/SgUtils.h" -#include "../Utils/AstWrapper.h" +#include "SgUtils.h" +#include "AstWrapper.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "../ParallelizationRegions/ParRegions_func.h" #include "../DynamicAnalysis/gCov_parser_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" #include "../SageAnalysisTool/depInterfaceExt.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" -#include "../Transformations/enddo_loop_converter.h" +#include "../Transformations/LoopEndDoConverter/enddo_loop_converter.h" #include "../DirectiveProcessing/remote_access.h" #include "../DirectiveProcessing/directive_omp_parser.h" @@ -1633,17 +1633,7 @@ void loopAnalyzer(SgFile *file, vector ®ions, mapfunctions(i)->symbol()->identifier(); -#if _WIN32 - if (file->functions(i)->variant() != MODULE_STMT) - sendMessage_2lvl(wstring(L"обработка функции '") + wstring(fName.begin(), fName.end()) + L"'"); - else - sendMessage_2lvl(wstring(L"обработка модуля '") + wstring(fName.begin(), fName.end()) + L"'"); -#else - if (file->functions(i)->variant() != MODULE_STMT) - sendMessage_2lvl(wstring(L"processing function '") + wstring(fName.begin(), fName.end()) + L"'"); - else - sendMessage_2lvl(wstring(L"processing module '") + wstring(fName.begin(), fName.end()) + L"'"); -#endif + sendMessage_2lvl(0, (file->functions(i)->variant() != MODULE_STMT), fName); set delcsSymbViewed; set delcsStatViewed; @@ -2188,11 +2178,8 @@ void loopAnalyzer(SgFile *file, vector ®ions, mapfunctions(i)->symbol()->identifier(); -#ifdef _WIN32 - sendMessage_2lvl(wstring(L"обработка цикла ") + std::to_wstring(idx) + L"/" + std::to_wstring(convertedLoopInfo.size())); -#else - sendMessage_2lvl(wstring(L"processing loop ") + std::to_wstring(idx) + L"/" + std::to_wstring(convertedLoopInfo.size())); -#endif + sendMessage_2lvl(1, idx, (int)convertedLoopInfo.size()); + tryToFindDependencies(loop.first, allLoops, funcWasInit, file, regions, currMessages, collection, funcByName, defUseByPlace); } } @@ -2340,7 +2327,7 @@ void loopAnalyzer(SgFile *file, vector ®ions, map #include #include -#include "../GraphLoop/graph_loops.h" -#include "../GraphCall/graph_calls.h" +#include "graph_loops.h" +#include "graph_calls.h" #include "../ParallelizationRegions/ParRegions.h" #include "../SageAnalysisTool/depInterfaceExt.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/SgUtils.h" +#include "AstWrapper.h" +#include "SgUtils.h" #include "dvm.h" diff --git a/src/ParallelizationRegions/ParRegions.cpp b/src/ParallelizationRegions/ParRegions.cpp index f01be39..a05d827 100644 --- a/src/ParallelizationRegions/ParRegions.cpp +++ b/src/ParallelizationRegions/ParRegions.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -10,12 +10,12 @@ #include "dvm.h" #include "ParRegions.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops.h" +#include "utils.h" +#include "SgUtils.h" +#include "graph_calls_func.h" +#include "graph_loops.h" #include "../Distribution/Distribution.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" using std::vector; using std::string; diff --git a/src/ParallelizationRegions/ParRegions.h b/src/ParallelizationRegions/ParRegions.h index d613d31..6f78563 100644 --- a/src/ParallelizationRegions/ParRegions.h +++ b/src/ParallelizationRegions/ParRegions.h @@ -9,12 +9,12 @@ #include "../Distribution/DvmhDirective.h" #include "../Distribution/GraphCSR.h" #include "../Distribution/Distribution.h" -#include "../Utils/AstWrapper.h" +#include "AstWrapper.h" -#include "../Utils/json.hpp" +#include "json.hpp" #if __SPF -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #endif struct ParallelRegionLines diff --git a/src/ParallelizationRegions/ParRegions_func.h b/src/ParallelizationRegions/ParRegions_func.h index e5d62c6..d1ac9b8 100644 --- a/src/ParallelizationRegions/ParRegions_func.h +++ b/src/ParallelizationRegions/ParRegions_func.h @@ -1,8 +1,8 @@ #pragma once #include "ParRegions.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_calls.h" +#include "graph_loops.h" void fillRegionLines(SgFile *file, std::vector ®ions, std::vector& messagesForFile, std::vector *loops = NULL, std::vector *funcs = NULL); void fillRegionLinesStep2(std::vector ®ions, const std::map> &allFuncInfo, std::map> *loopGraph = NULL); diff --git a/src/ParallelizationRegions/expand_extract_reg.cpp b/src/ParallelizationRegions/expand_extract_reg.cpp index 5aa341a..86cad84 100644 --- a/src/ParallelizationRegions/expand_extract_reg.cpp +++ b/src/ParallelizationRegions/expand_extract_reg.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/ParallelizationRegions/expand_extract_reg.h b/src/ParallelizationRegions/expand_extract_reg.h index c1e0d50..2040a9d 100644 --- a/src/ParallelizationRegions/expand_extract_reg.h +++ b/src/ParallelizationRegions/expand_extract_reg.h @@ -1,7 +1,7 @@ #pragma once #include "ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" bool expandExtractReg(const std::string &fileName, const int startLine, const int endLine, const std::vector ®ions, std::vector &messagesForFile, const bool toDelete = false); diff --git a/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp index 277b46c..dc77d6a 100644 --- a/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp +++ b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -11,14 +11,14 @@ #include "ParRegions_func.h" #include "resolve_par_reg_conflicts.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../DirectiveProcessing/directive_creator.h" #include "../DirectiveProcessing/insert_directive.h" -#include "../Utils/SgUtils.h" -#include "../ExpressionTransform/expr_transform.h" -#include "../Transformations/function_purifying.h" +#include "SgUtils.h" +#include "expr_transform.h" +#include "../Transformations/FunctionPurifying/function_purifying.h" using std::map; using std::pair; diff --git a/src/ParallelizationRegions/resolve_par_reg_conflicts.h b/src/ParallelizationRegions/resolve_par_reg_conflicts.h index 4e5e3c4..cfaecbe 100644 --- a/src/ParallelizationRegions/resolve_par_reg_conflicts.h +++ b/src/ParallelizationRegions/resolve_par_reg_conflicts.h @@ -1,9 +1,9 @@ #pragma once #include "ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" -#include "../GraphCall/graph_calls.h" +#include "SgUtils.h" +#include "errors.h" +#include "graph_calls.h" void fillRegionIntervals(std::vector ®ions); void fillRegionArrays(std::vector ®ions, const std::map> &allFuncInfo, const std::map &commonBlocks); diff --git a/src/Predictor/PredictScheme.cpp b/src/Predictor/PredictScheme.cpp index a63b241..4e09007 100644 --- a/src/Predictor/PredictScheme.cpp +++ b/src/Predictor/PredictScheme.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -16,11 +16,11 @@ #include "../DynamicAnalysis/gcov_info.h" #include "../DynamicAnalysis/gCov_parser_func.h" #include "PredictScheme.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../DirectiveProcessing/directive_parser.h" #include "../Distribution/DvmhDirective.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "graph_loops_func.h" +#include "expr_transform.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../CFGraph/CFGraph.h" diff --git a/src/Predictor/PredictScheme.h b/src/Predictor/PredictScheme.h index 35ccf9e..a9c91f2 100644 --- a/src/Predictor/PredictScheme.h +++ b/src/Predictor/PredictScheme.h @@ -1,8 +1,8 @@ #pragma once #include #include "dvm.h" -#include "../GraphCall/graph_calls.h" -#include "../Utils/json.hpp" +#include "graph_calls.h" +#include "json.hpp" class ParallelStats { diff --git a/src/PrivateAnalyzer/private_analyzer.cpp b/src/PrivateAnalyzer/private_analyzer.cpp index deb0c94..99b621e 100644 --- a/src/PrivateAnalyzer/private_analyzer.cpp +++ b/src/PrivateAnalyzer/private_analyzer.cpp @@ -1,5 +1,5 @@ #define _LEAK_ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -9,7 +9,7 @@ #include #include -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include "private_analyzer.h" #include "dvm.h" #include "../CFGraph/CFGraph.h" diff --git a/src/PrivateAnalyzer/private_analyzer.h b/src/PrivateAnalyzer/private_analyzer.h index 8835950..1a4804c 100644 --- a/src/PrivateAnalyzer/private_analyzer.h +++ b/src/PrivateAnalyzer/private_analyzer.h @@ -3,7 +3,7 @@ #include #include "dvm.h" -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" extern void Private_Vars_Analyzer(SgStatement* start); void PrivateAnalyzer(SgFile *file, std::vector &funcs); diff --git a/src/PrivateAnalyzer/private_arrays_search.cpp b/src/PrivateAnalyzer/private_arrays_search.cpp index 767ebfb..2fe1740 100644 --- a/src/PrivateAnalyzer/private_arrays_search.cpp +++ b/src/PrivateAnalyzer/private_arrays_search.cpp @@ -9,8 +9,8 @@ #include "private_arrays_search.h" #include "range_structures.h" #include "region.h" -#include "../Utils/SgUtils.h" -#include "../GraphLoop/graph_loops.h" +#include "SgUtils.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" using namespace std; diff --git a/src/PrivateAnalyzer/private_arrays_search.h b/src/PrivateAnalyzer/private_arrays_search.h index 220ac79..9407518 100644 --- a/src/PrivateAnalyzer/private_arrays_search.h +++ b/src/PrivateAnalyzer/private_arrays_search.h @@ -6,7 +6,7 @@ #include "range_structures.h" #include "region.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" void Collapse(Region* region); diff --git a/src/PrivateAnalyzer/range_structures.cpp b/src/PrivateAnalyzer/range_structures.cpp index 9a2f437..80255ab 100644 --- a/src/PrivateAnalyzer/range_structures.cpp +++ b/src/PrivateAnalyzer/range_structures.cpp @@ -2,8 +2,8 @@ #include #include #include -#include +#include "utils.h" #include "range_structures.h" using namespace std; @@ -184,7 +184,8 @@ void AccessingSet::FindUncovered(const vector& element, vector currentCoefs = coefsForDims.back(); ArrayDimension current_dim; if (var->getType() == SAPFOR::CFG_ARG_TYPE::CONST) current_dim = { stoul(var->getValue()), 1, 1 }; @@ -214,7 +217,10 @@ static Region* CreateSubRegion(LoopGraph* loop, const vectorsetHeader(bbToRegion.at(header)); else + { + printInternalError(convertFileName(__FILE__).c_str(), __LINE__); return NULL; + } for (SAPFOR::BasicBlock* block : blockSet) if (bbToRegion.find(block) != bbToRegion.end()) @@ -223,7 +229,6 @@ static Region* CreateSubRegion(LoopGraph* loop, const vectorchildren) region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion)); - cout << header << endl; return region; } diff --git a/src/PrivateAnalyzer/region.h b/src/PrivateAnalyzer/region.h index 95121b2..4a474ca 100644 --- a/src/PrivateAnalyzer/region.h +++ b/src/PrivateAnalyzer/region.h @@ -5,7 +5,7 @@ #include #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" class Region : public SAPFOR::BasicBlock { diff --git a/src/ProjectManipulation/ConvertFiles.cpp b/src/ProjectManipulation/ConvertFiles.cpp index 78610d8..ecfe69a 100644 --- a/src/ProjectManipulation/ConvertFiles.cpp +++ b/src/ProjectManipulation/ConvertFiles.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -6,9 +6,9 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "SgUtils.h" +#include "utils.h" #include "../VerificationCode/verifications.h" diff --git a/src/ProjectManipulation/FileInfo.cpp b/src/ProjectManipulation/FileInfo.cpp index aa95940..d7de1b1 100644 --- a/src/ProjectManipulation/FileInfo.cpp +++ b/src/ProjectManipulation/FileInfo.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -7,8 +7,8 @@ #include #include "FileInfo.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "errors.h" using namespace std; diff --git a/src/ProjectManipulation/ParseFiles.cpp b/src/ProjectManipulation/ParseFiles.cpp index d474b85..836f10d 100644 --- a/src/ProjectManipulation/ParseFiles.cpp +++ b/src/ProjectManipulation/ParseFiles.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -22,8 +22,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" @@ -34,6 +34,7 @@ using namespace std; extern "C" int parse_file(int argc, char* argv[], char* proj_name); +extern const char* VISUALIZER_DATA_PATH; static void findModuleDeclInProject(const string& name, const vector& files, map& modDecls) { @@ -293,11 +294,8 @@ static vector parseList(vector& listOfProject, } } -#ifdef _WIN32 - sendMessage_2lvl(L" '" + to_wstring(file) + L"'"); -#else - sendMessage_2lvl(L" processing file '" + to_wstring(file) + L"'"); -#endif + sendMessage_2lvl(3, file); + StdCapture::Init(); string errorMessage = ""; try @@ -443,20 +441,12 @@ static int dumpErrors(const vector& listOfProject, const vector splited; splitString(errors[z], '\n', splited); @@ -475,13 +465,22 @@ static int dumpErrors(const vector& listOfProject, const vector& errors, vector& lis do { -#ifdef _WIN32 - sendMessage_1lvl(L" " + std::to_wstring((iters + 1)) + L" "); -#else - sendMessage_1lvl(L"running " + std::to_wstring((iters + 1)) + L" iteration of syntax analisys"); -#endif + sendMessage_1lvl(0, iters + 1); + errors = parseList(listOfProject, iters != 0, parseForInlining, mapModuleDeps, moduleDelc, modDirectOrder, isFromConsole); changed = createMapOfUse(errors, listOfProject, mapModuleDeps); if (iters != 0) @@ -713,7 +709,7 @@ int parseFiles(const char* proj, vector& filesCompilationOrder, int pars if (pathSplit.size() < 2) printInternalError(convertFileName(__FILE__).c_str(), __LINE__); - if (pathSplit[pathSplit.size() - 2] != "visualiser_data") + if (pathSplit[pathSplit.size() - 2] != VISUALIZER_DATA_PATH) printInternalError(convertFileName(__FILE__).c_str(), __LINE__); string fullPath = ""; for (int z = 0; z < pathSplit.size() - 2; ++z) @@ -745,9 +741,9 @@ int parseFiles(const char* proj, vector& filesCompilationOrder, int pars else fileNameFixed = (toAdd.substr(0, 2) == "./") ? toAdd.substr(2) : toAdd; - const string optPath = fullPath + "visualiser_data/options/" + fileNameFixed + ".opt"; - const string errPath = fullPath + "visualiser_data/options/" + fileNameFixed + ".err"; - const string outPath = fullPath + "visualiser_data/options/" + fileNameFixed + ".out"; + const string optPath = fullPath + VISUALIZER_DATA_PATH + "/options/" + fileNameFixed + ".opt"; + const string errPath = fullPath + VISUALIZER_DATA_PATH + "/options/" + fileNameFixed + ".err"; + const string outPath = fullPath + VISUALIZER_DATA_PATH + "/options/" + fileNameFixed + ".out"; const string fileText = readFileToStr(toAdd); @@ -809,6 +805,8 @@ void parseFiles(int argc, char** argv) printf(" run parsing for inlining\n"); int rethrow = parseFiles(errors, listOfProject, filesCompilationOrder, isInline, true); + int errCount = dumpErrors(listOfProject, errors, messages); + if (rethrow == 0) { for (auto& err : errors) @@ -838,5 +836,7 @@ void parseFiles(int argc, char** argv) } else printf("Parsing was completed with errors, throw code %d, errors count %d\n", rethrow, code); + + dumpMessages(false, messages, VISUALIZER_DATA_PATH); exit(0); } diff --git a/src/ProjectManipulation/PerfAnalyzer.cpp b/src/ProjectManipulation/PerfAnalyzer.cpp index c3ee28c..bc2428a 100644 --- a/src/ProjectManipulation/PerfAnalyzer.cpp +++ b/src/ProjectManipulation/PerfAnalyzer.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -6,8 +6,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "StdCapture.h" diff --git a/src/ProjectParameters/projectParameters.cpp b/src/ProjectParameters/projectParameters.cpp index fd395dc..eef70c8 100644 --- a/src/ProjectParameters/projectParameters.cpp +++ b/src/ProjectParameters/projectParameters.cpp @@ -1,33 +1,443 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include -#include #include #include #include #include +#include #include #include #include +#include "CFGraph/CFGraph.h" +#include "CFGraph/IR.h" +#include "Distribution/Array.h" #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" + +#include "errors.h" +#include "SgUtils.h" +#include "graph_calls.h" +#include "graph_calls_func.h" #include "projectParameters.h" -using namespace std; +using std::set; +using std::map; +using std::string; +using std::vector; +using std::tuple; +using std::pair; +using std::make_tuple; +using std::find_if; -map< pair, set> - findParameters(const map> &defUseByFunctions, - const map &commonBlocks, - const map> &allFuncInfo) +static map> call_sites; + +enum class MODE { - map< pair, set> foundParameters; - - - return foundParameters; -} \ No newline at end of file + BEFORE, + AFTER +}; + +template +static void extract_vars_from_reg(set& worklist, SAPFOR::Argument* reg, Iterator instr, Iterator first_instr); + +static tuple +stmtToIR(const map>& CFGraph, SgStatement* stmt) +{ + SgStatement* cur = stmt; + cur->switchToFile(); + while (cur->variant() != PROC_HEDR && cur->variant() != PROG_HEDR && cur->variant() != FUNC_HEDR) + cur = cur->controlParent(); + + string funcName = ((SgProcHedrStmt*)cur)->nameWithContains(); + + int stmtID = stmt->id(); + for (const auto& [func, bblocks] : CFGraph) + { + if (func->funcName != funcName) + continue; + + for (auto basicBlock : bblocks) + for (auto ins : basicBlock->getInstructions()) + if (stmtID == ins->getInstruction()->getOperator()->id()) + return make_tuple(func, ins->getInstruction(), basicBlock); + } + + printInternalError(convertFileName(__FILE__).c_str(), __LINE__); + return { NULL, NULL, NULL }; +} + +static tuple +IRByNumber(const map>& CFGraph, int num) +{ + if (num < 0) + return { NULL, NULL, NULL }; + + for (const auto& [func, bblocks] : CFGraph) + for (auto byBB : bblocks) + if (byBB->getInstructions().front()->getNumber() <= num && byBB->getInstructions().back()->getNumber() >= num) + return make_tuple(func, getInstructionByNumber(byBB->getInstructions(), num), byBB); + + printInternalError(convertFileName(__FILE__).c_str(), __LINE__); + return { NULL, NULL, NULL }; +} + +template +static void processArgument(set& worklist, + SAPFOR::Argument* arg, + Iterator instr, Iterator first_instr) +{ + if (arg == NULL) + return; + + if (arg->getType() == SAPFOR::CFG_ARG_TYPE::REG) + extract_vars_from_reg(worklist, arg, instr, first_instr); + else if (arg->getType() == SAPFOR::CFG_ARG_TYPE::VAR) + worklist.insert(arg); +} + +template +static void extract_vars_from_reg(set& worklist, + SAPFOR::Argument* reg, + Iterator instr, Iterator first_instr) +{ + for (; instr >= first_instr; instr--) + { + if ((*instr)->getInstruction()->getResult() == reg) + { + processArgument(worklist, (*instr)->getInstruction()->getArg1(), instr, first_instr); + processArgument(worklist, (*instr)->getInstruction()->getArg2(), instr, first_instr); + return; + } + } +} + +static void lookup_for_vars(set>& where_to_add, + set& worklist, + SAPFOR::Instruction* instr, + SAPFOR::BasicBlock* bblock, + FuncInfo* cur_func, + const map>& fullIR) +{ + while (bblock) + { + auto first_instr = bblock->getInstructions().begin(); + auto cur_instr = find_if(first_instr, bblock->getInstructions().end(), [instr](SAPFOR::IR_Block* i) { + return i->getInstruction() == instr; + }); + + for (; cur_instr >= bblock->getInstructions().begin(); --cur_instr) + { + auto instr = (*cur_instr)->getInstruction(); + auto result_arg = instr->getResult(); + auto arg1 = instr->getArg1(); + auto arg2 = instr->getArg2(); + + if (worklist.count(result_arg)) + { + worklist.erase(result_arg); + processArgument(worklist, arg1, cur_instr, first_instr); + processArgument(worklist, arg2, cur_instr, first_instr); + } + + if (instr->getOperation() == SAPFOR::CFG_OP::PARAM && worklist.count(arg1)) + { + // skip to F_CALL + auto f_call_instr = cur_instr; + while ((*f_call_instr)->getInstruction()->getOperation() != SAPFOR::CFG_OP::F_CALL) + f_call_instr++; + + if ((*f_call_instr)->getInstruction()->getArg1()->getValue() == "_READ") + { + auto stmt_before = (*f_call_instr)->getInstruction()->getOperator(); + auto filename = stmt_before->fileName(); + auto line = stmt_before->lineNumber(); + auto var_name = arg1->getValue().substr(arg1->getValue().find('%') + 1); + __spf_print(1, "Please specify value of variable %s on line %d of file %s\n", arg1->getValue().c_str(), line, filename); + auto toAdd = make_tuple(stmt_before, var_name, MODE::AFTER); + where_to_add.insert(toAdd); + worklist.erase(arg1); + } + } + } + + const auto& RD = bblock->getRD_In(); + map group_by_block; + + set to_erase; + for (auto& arg : worklist) + { + if (RD.count(arg)) + { + if (RD.at(arg).size() == 1 && *RD.at(arg).begin() == SAPFOR::CFG_VAL::UNINIT) + __spf_print(1, "variable %s has no definition\n", arg->getValue().c_str()); + else if (RD.at(arg).size() > 1) + { + auto stmt_after = (*first_instr)->getInstruction()->getOperator(); + auto filename = stmt_after->fileName(); + auto line = stmt_after->lineNumber(); + auto var_name = arg->getValue().substr(arg->getValue().find('%') + 1); + __spf_print(1, "variable %s has multiple reaching definitions, further analysis is impossible\n", arg->getValue().c_str()); + __spf_print(1, "Please specify value of variable %s on line %d of file %s\n", arg->getValue().c_str(), line, filename); + auto toAdd = make_tuple(stmt_after, var_name, MODE::BEFORE); + where_to_add.insert(toAdd); + to_erase.insert(arg); + } + else + { + auto instr_num = *RD.at(arg).begin(); + auto [func, instr, bblock] = IRByNumber(fullIR, instr_num); + if (cur_func == func && (group_by_block[bblock] == NULL || group_by_block[bblock]->getNumber() < instr_num)) + group_by_block[bblock] = instr; + } + } + } + for (const auto& arg : to_erase) + worklist.erase(arg); + + while (bblock && group_by_block.find(bblock) == group_by_block.end()) + bblock = bblock->getDom(); + + if (bblock) + instr = group_by_block[bblock]; + } + + // other variables are from global scope + const auto& RD = fullIR.at(cur_func).front()->getRD_In(); + for (auto& arg : worklist) + { + if (arg->isMemGlobal()) + { + set found_rd; + if (RD.count(arg)) + found_rd = RD.at(arg); + + if (found_rd.size() == 0) + { + auto call_instr = call_sites[cur_func].size() ? call_sites[cur_func].front() : NULL; + while (call_instr && found_rd.size() == 0) + { + auto [call_func, _, call_bblock] = IRByNumber(fullIR, call_instr->getNumber()); + if (call_bblock->getRD_Out().count(arg)) + found_rd = call_bblock->getRD_Out().at(arg); + + + call_instr = call_sites[call_func].size() ? call_sites[call_func].front() : NULL; + } + } + + if (found_rd.size() == 1 && *found_rd.begin() == SAPFOR::CFG_VAL::UNINIT) + __spf_print(1, "variable %s has no definition\n", arg->getValue().c_str()); + else if (found_rd.size() > 1) + { + auto first_instr = fullIR.at(cur_func).front()->getInstructions().begin(); + auto stmt_after = (*first_instr)->getInstruction()->getOperator(); + auto filename = stmt_after->fileName(); + auto line = stmt_after->lineNumber(); + auto var_name = arg->getValue().substr(arg->getValue().find('%') + 1); + __spf_print(1, "variable %s has multiple reaching definitions, further analysis is impossible\n", arg->getValue().c_str()); + __spf_print(1, "Please specify value of variable %s on line %d of file %s\n", arg->getValue().c_str(), line, filename); + auto toAdd = make_tuple(stmt_after, var_name, MODE::BEFORE); + where_to_add.insert(toAdd); + } + else + { + auto instr_num = *found_rd.begin(); + auto [func, instr, bblock] = IRByNumber(fullIR, instr_num); + set new_worklist = { arg }; + + lookup_for_vars(where_to_add, new_worklist, instr, bblock, func, fullIR); + } + } + } + + + for (const auto& call_instr : call_sites[cur_func]) + { + set new_worklist; + auto params_num = cur_func->funcParams.countOfPars; + + auto [call_func, _, call_bblock] = IRByNumber(fullIR, call_instr->getNumber()); + auto first_instr = call_bblock->getInstructions().begin(); + auto cur_instr = find_if(first_instr, call_bblock->getInstructions().end(), [call_instr](SAPFOR::IR_Block* i) { + return i->getInstruction() == call_instr; + }); + + for (auto& arg : worklist) + { + if (arg->getMemType() == SAPFOR::CFG_MEM_TYPE::FUNC_PARAM_) + { + auto param_num = stoi(arg->getValue().substr(arg->getValue().find('%', arg->getValue().find('%') + 1) + 1)); + auto param_instr = (cur_instr - (params_num - param_num)); + auto param_arg = (*param_instr)->getInstruction()->getArg1(); + processArgument(new_worklist, param_arg, param_instr, first_instr); + } + } + lookup_for_vars(where_to_add, new_worklist, call_instr, call_bblock, call_func, fullIR); + } + +} + +static void handle_single_allocate(set>& where_to_add, + SgStatement* alloc_statement, + const map>& fullIR) +{ + auto [func, instr, bblock] = stmtToIR(fullIR, alloc_statement); + + auto first_instr = bblock->getInstructions().begin(); + auto cur_instr = find_if(first_instr, bblock->getInstructions().end(), [instr](SAPFOR::IR_Block* i) { + return i->getInstruction() == instr; + }); + auto alloc_instr = cur_instr; + + // skip to F_CALL _ALLOC n + while ((*alloc_instr)->getInstruction()->getOperation() != SAPFOR::CFG_OP::F_CALL || + (*alloc_instr)->getInstruction()->getArg1()->getValue() != "_ALLOC") + alloc_instr++; + + auto arrays_num = stoi((*alloc_instr)->getInstruction()->getArg2()->getValue()); + + set worklist; + for (int i = 0; i < arrays_num; i++) + { + auto param_instr = --alloc_instr; + auto param_reg = (*param_instr)->getInstruction()->getArg1(); + + while ((*param_instr)->getInstruction()->getOperation() != SAPFOR::CFG_OP::LOAD || + (*param_instr)->getInstruction()->getResult() != param_reg) + param_instr--; + + + auto dimensions_num = stoi((*param_instr)->getInstruction()->getArg2()->getValue()); + + for (int j = 0; j < dimensions_num; j++) + { + auto ref_instr = --param_instr; + if ((*ref_instr)->getInstruction()->getOperation() == SAPFOR::CFG_OP::RANGE) + { + vector range_args = { (*ref_instr)->getInstruction()->getArg1(), + (*ref_instr)->getInstruction()->getArg2(), + (*ref_instr)->getInstruction()->getResult() }; + for (auto& arg : range_args) + processArgument(worklist, arg, ref_instr, first_instr); + + } + else + { + auto arg = (*ref_instr)->getInstruction()->getArg1(); + processArgument(worklist, arg, ref_instr, first_instr); + } + } + } + lookup_for_vars(where_to_add, worklist, instr, bblock, func, fullIR); +} + + +static void handle_single_loop(set>& where_to_add, + SgStatement* loop_stmt, + const map>& fullIR) +{ + auto [func, instr, bblock] = stmtToIR(fullIR, loop_stmt); + auto cur_instr = bblock->getInstructions().end() - 1; + + set worklist; + extract_vars_from_reg(worklist, (*cur_instr)->getInstruction()->getResult(), cur_instr, bblock->getInstructions().begin()); + + lookup_for_vars(where_to_add, worklist, (*cur_instr)->getInstruction(), bblock, func, fullIR); +} + +void findParameters(ResultSet& foundParameters, + map>& fullIR, + const map, pair>& declaredArrays) +{ + set> where_to_add; + + map name_to_func; + for (const auto& [func, _] : fullIR) + name_to_func[func->funcName] = func; + + for (auto& [func, bblocks] : fullIR) + { + for (const auto& block : bblocks) + { + for (const auto& ir_block : block->getInstructions()) + { + auto instr = ir_block->getInstruction(); + if (instr->getOperation() == SAPFOR::CFG_OP::F_CALL) + { + auto func_name = instr->getArg1()->getValue(); + auto func_info = name_to_func.find(func_name); + + if (func_info != name_to_func.end()) + call_sites[func_info->second].push_back(instr); + } + } + } + } + + set alloc_statements; + for (const auto& [func, bblocks] : fullIR) + { + for (const auto& block : bblocks) + { + for (auto instr = block->getInstructions().begin(); instr != block->getInstructions().end(); ++instr) + { + auto op = (*instr)->getInstruction()->getOperator(); + if (op && op->variant() == ALLOCATE_STMT) + alloc_statements.insert(op); + } + } + } + + set for_statements; + // Find all FOR statements in the program + for (const auto& [func, bblocks] : fullIR) + { + for (const auto& block : bblocks) + { + for (auto instr = block->getInstructions().begin(); instr != block->getInstructions().end(); ++instr) + { + auto op = (*instr)->getInstruction()->getOperator(); + if (op && op->variant() == FOR_NODE) + for_statements.insert(op); + } + } + } + + for (const auto& alloc_statement : alloc_statements) + handle_single_allocate(where_to_add, alloc_statement, fullIR); + + for (const auto& stmt : for_statements) + handle_single_loop(where_to_add, stmt, fullIR); + + for (const auto& [stmt_before, var_name, mode] : where_to_add) + { + stmt_before->switchToFile(); + + SgVariableSymb* var_symb = new SgVariableSymb(var_name.c_str()); + SgVarRefExp* var = new SgVarRefExp(var_symb); + SgExprListExp* ex = new SgExprListExp(); + auto assgn_op = new SgExpression(ASSGN_OP, var, NULL); + ex->setLhs(assgn_op); + + SgExpression* parameter_op = new SgExpression(SPF_PARAMETER_OP, ex); + auto dir_list = new SgExprListExp(); + dir_list->setLhs(parameter_op); + SgStatement* toAdd = new SgStatement(SPF_ANALYSIS_DIR, NULL, NULL, dir_list, NULL, NULL); + + toAdd->setlineNumber(stmt_before->lineNumber()); + toAdd->setLocalLineNumber(stmt_before->lineNumber()); + toAdd->setFileId(stmt_before->getFileId()); + toAdd->setProject(stmt_before->getProject()); + + //NOTE: only for debbuging, results will be transferred to the visualizer + /*if (mode == MODE::AFTER) + stmt_before->insertStmtAfter(*toAdd, *stmt_before->controlParent()); + else + stmt_before->insertStmtBefore(*toAdd, *stmt_before->controlParent());*/ + + foundParameters.insert(make_tuple(stmt_before->fileName(), stmt_before->lineNumber(), var_name)); + } +} diff --git a/src/ProjectParameters/projectParameters.h b/src/ProjectParameters/projectParameters.h index 5a240b0..5be0d3c 100644 --- a/src/ProjectParameters/projectParameters.h +++ b/src/ProjectParameters/projectParameters.h @@ -1,3 +1,14 @@ #pragma once -std::map< std::pair, std::set> findParameters(const std::map> &defUseByFunctions, const std::map &commonBlocks, const std::map> &allFuncInfo); \ No newline at end of file +#include +#include +#include +#include + +#include "../GraphCall/graph_calls.h" + +using ResultSet = std::set>; + +void findParameters(ResultSet& foundParameters, + std::map>& fullIR, + const std::map, std::pair>& declaredArrays); diff --git a/src/SageAnalysisTool/defUse.cpp b/src/SageAnalysisTool/defUse.cpp index e400158..fea079a 100644 --- a/src/SageAnalysisTool/defUse.cpp +++ b/src/SageAnalysisTool/defUse.cpp @@ -4,9 +4,9 @@ #include #include -#include "../GraphCall/graph_calls.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "graph_calls.h" +#include "errors.h" +#include "utils.h" #include "sage++user.h" #include "definesValues.h" #include "set.h" diff --git a/src/SageAnalysisTool/depGraph.cpp b/src/SageAnalysisTool/depGraph.cpp index a413d99..800cc45 100644 --- a/src/SageAnalysisTool/depGraph.cpp +++ b/src/SageAnalysisTool/depGraph.cpp @@ -15,8 +15,8 @@ extern "C" void removeFromCollection(void *pointer); #endif extern int passDone; -#include "../GraphCall/graph_calls.h" -#include "../Utils/errors.h" +#include "graph_calls.h" +#include "errors.h" #include "../VisualizerCalls/get_information.h" #include "sage++user.h" diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp index 9d7287d..42c92fe 100644 --- a/src/Sapfor.cpp +++ b/src/Sapfor.cpp @@ -24,8 +24,6 @@ #include "ParallelizationRegions/resolve_par_reg_conflicts.h" #include "ParallelizationRegions/expand_extract_reg.h" -#include "Transformations/replace_dist_arrays_in_io.h" - #include "Distribution/Distribution.h" #include "Distribution/GraphCSR.h" #include "Distribution/Arrays.h" @@ -57,7 +55,7 @@ #include "Distribution/CreateDistributionDirs.h" #include "PrivateAnalyzer/private_analyzer.h" #include "PrivateAnalyzer/private_arrays_search.h" -#include "ExpressionTransform/expr_transform.h" +#include "expr_transform.h" #include "Predictor/PredictScheme.h" #include "Predictor/PredictorModel.h" @@ -73,24 +71,26 @@ #include "VisualizerCalls/SendMessage.h" #include "VisualizerCalls/BuildGraph.h" -#include "Transformations/enddo_loop_converter.h" -#include "Transformations/loop_transform.h" -#include "Transformations/array_assign_to_loop.h" -#include "Transformations/private_arrays_resizing.h" -#include "Transformations/loops_splitter.h" -#include "Transformations/loops_combiner.h" -#include "Transformations/loops_unrolling.h" -#include "Transformations/uniq_call_chain_dup.h" -#include "Transformations/checkpoints.h" -#include "Transformations/swap_array_dims.h" -#include "Transformations/function_purifying.h" -#include "Transformations/private_removing.h" -#include "Transformations/fix_common_blocks.h" -#include "Transformations/convert_to_c.h" -#include "Transformations/set_implicit_none.h" -#include "Transformations/dead_code.h" +#include "Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h" +#include "Transformations/LoopEndDoConverter/enddo_loop_converter.h" +#include "Transformations/LoopNesting/loop_transform.h" +#include "Transformations/VectorAssignToLoop/array_assign_to_loop.h" +#include "Transformations/PrivateArrayResizing/private_arrays_resizing.h" +#include "Transformations/LoopSplitting/loops_splitter.h" +#include "Transformations/LoopCombining/loops_combiner.h" +#include "Transformations/LoopUnrolling/loops_unrolling.h" +#include "Transformations/FunctionDuplication/uniq_call_chain_dup.h" +#include "Transformations/CheckPoints/checkpoints.h" +#include "Transformations/ArrayDimsSwapping/swap_array_dims.h" +#include "Transformations/FunctionPurifying/function_purifying.h" +#include "Transformations/PrivateArrayRemoving/private_removing.h" +#include "Transformations/GlobalVariables/fix_common_blocks.h" +#include "Transformations/ConvertToC/convert_to_c.h" +#include "Transformations/SetImplicitNone/set_implicit_none.h" +#include "Transformations/DeadCodeRemoving/dead_code.h" +#include "Transformations/RenameSymbols/rename_symbols.h" +#include "Transformations/FunctionInlining/inliner.h" -#include "RenameSymbols/rename_symbols.h" #include "ProjectParameters/projectParameters.h" #include "CFGraph/IR.h" @@ -101,8 +101,6 @@ #include "CFGraph/live_variable_analysis.h" #include "CFGraph/private_variables_analysis.h" -#include "Inliner/inliner.h" - #include "dvm.h" #include "Sapfor.h" #include "Utils/PassManager.h" @@ -402,11 +400,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne __spf_print(DEBUG_LVL1, "RUN PASS with name %s\n", passNames[curr_regime]); auto toSendStrMessage = string(passNames[curr_regime]); -#ifdef _WIN32 - sendMessage_1lvl(wstring(L"выполняется проход '") + wstring(toSendStrMessage.begin(), toSendStrMessage.end()) + L"'"); -#else - sendMessage_1lvl(wstring(L"running pass '") + wstring(toSendStrMessage.begin(), toSendStrMessage.end()) + L"'"); -#endif + sendMessage_1lvl(1, toSendStrMessage); const int n = project.numberOfFiles(); bool verifyOK = true; @@ -454,11 +448,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne SgFile *file = &(project.file(i)); toSendStrMessage = file->filename(); -#ifdef _WIN32 - sendMessage_2lvl(wstring(L"обработка файла '") + wstring(toSendStrMessage.begin(), toSendStrMessage.end()) + L"'"); -#else - sendMessage_2lvl(wstring(L"processing file '") + wstring(toSendStrMessage.begin(), toSendStrMessage.end()) + L"'"); -#endif + sendMessage_2lvl(3, toSendStrMessage); sendMessage_progress(std::to_wstring((int)(((double)(n - i) / n) * 100))); const char *file_name = file->filename(); @@ -912,7 +902,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne else if (curr_regime == ADD_TEMPL_TO_USE_ONLY) fixUseOnlyStmt(file, parallelRegions); else if (curr_regime == GCOV_PARSER) - parse_gcovfile(file, consoleMode == 1 ? file_name : "./visualiser_data/gcov/" + string(file_name), getObjectForFileFromMap(file_name, gCovInfo), keepFiles); + parse_gcovfile(file, consoleMode == 1 ? file_name : string(VISUALIZER_DATA_PATH) + "/gcov/" + file_name, getObjectForFileFromMap(file_name, gCovInfo), keepFiles); else if(curr_regime == PRIVATE_ARRAYS_EXPANSION) { auto founded = loopGraph.find(file->filename()); @@ -964,7 +954,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne vector include_functions; createInterTree(file, getObjectForFileFromMap(file_name, intervals), removeNestedIntervals, getObjectForFileFromMap(file_name, SPF_messages)); - assignCallsToFile(consoleMode == 1 ? file_name : "./visualiser_data/gcov/" + string(file_name), getObjectForFileFromMap(file_name, intervals)); + assignCallsToFile(consoleMode == 1 ? file_name : string(VISUALIZER_DATA_PATH) + "/gcov/" + file_name, getObjectForFileFromMap(file_name, intervals)); removeNodes(intervals_threshold, getObjectForFileFromMap(file_name, intervals), include_functions); } else if (curr_regime == INSERT_INTER_TREE) @@ -1032,7 +1022,10 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne countOfTransform += removeDeadCode(func->funcPointer, allFuncInfo, commonBlocks); } else if (curr_regime == BUILD_IR_SSA_FORM) - buildIRSSAForm(fullIR, fullIR_SSA); + { + if (fullIR_SSA.size() == 0) + buildIRSSAForm(fullIR, fullIR_SSA); + } else if (curr_regime == FIND_IMPLICIT_LOOPS) findImplicitLoops(fullIR_SSA, file_name); else if (curr_regime == FIND_PRIVATE_ARRAYS) @@ -1065,7 +1058,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne throw -11; } - sendMessage_2lvl(wstring(L"")); + sendMessage_2lvl(2); // ********************************** /// /// SECOND AGGREGATION STEP /// // ********************************** /// @@ -1721,7 +1714,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne } else if (curr_regime == GCOV_PARSER) { - parseTimesDvmStatisticFile((consoleMode == 1) ? string("statistic.txt") : "./visualiser_data/statistic/" + string("statistic.txt"), intervals); + parseTimesDvmStatisticFile((consoleMode == 1) ? string("statistic.txt") : string(VISUALIZER_DATA_PATH) + "/statistic/statistic.txt", intervals); //fixed count, devide by value from PROG_HEDR SgStatement* mainUnit = findMainUnit(&project, SPF_messages); @@ -1903,7 +1896,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne else if (curr_regime == RENAME_SYMBOLS) runRenameSymbols(&project, commonBlocks); else if (curr_regime == FIND_PARAMETERS) - parametersOfProject = findParameters(defUseByFunctions, commonBlocks, allFuncInfo); + findParameters(parametersOfProject, fullIR, declaredArrays); else if (curr_regime == BUILD_IR) { auto CFG_forFile = buildCFG(commonBlocks, allFuncInfo_IR, SAPFOR::CFG_Settings(0)); @@ -1936,7 +1929,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne const float elapsedGlobal = duration_cast(high_resolution_clock::now() - globalTime).count() / 1000.; __spf_print(1, "PROFILE: time for this pass = %f sec (total %f sec)\n", elapsed, elapsedGlobal); - sendMessage_2lvl(wstring(L"")); + sendMessage_2lvl(2); if (internalExit != 0) throw -1; @@ -2670,32 +2663,12 @@ 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; - - FILE* outF = fopen("dump_messages.json", "w"); - fprintf(outF, "%s", allMessages.dump().c_str()); - fclose(outF); + dumpMessages(true, SPF_messages, VISUALIZER_DATA_PATH); } + dumpMessages(false, SPF_messages, VISUALIZER_DATA_PATH); deleteAllAllocatedData(withDel); - #if _WIN32 && _DEBUG if (leakMemDump) { diff --git a/src/SapforData.h b/src/SapforData.h index 94944ce..4cf65cb 100644 --- a/src/SapforData.h +++ b/src/SapforData.h @@ -49,6 +49,7 @@ bool withTemplateInfo = false; bool inlcudeAllFiles = false; // for pass INSERT_INLCUDES bool runAsClient = false; // run console project as client for Visualizer bool printSymbTable = false; +const char* VISUALIZER_DATA_PATH = "visualiser_data"; uint64_t currentAvailMemory = 0; int QUALITY; // quality of conflicts search in graph @@ -168,7 +169,7 @@ std::map filesInfo; // information about open,close,write and re // //for FIND_PARAMETERS -std::map< std::pair, std::set> parametersOfProject; // [file, line] -> set[vars] +std::set> parametersOfProject; // [file, line, varname] // //for GET_MIN_MAX_BLOCK_DIST diff --git a/src/Transformations/swap_array_dims.cpp b/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp similarity index 96% rename from src/Transformations/swap_array_dims.cpp rename to src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp index 64685e7..7ebc316 100644 --- a/src/Transformations/swap_array_dims.cpp +++ b/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp @@ -11,9 +11,9 @@ #include "../Distribution/Array.h" #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/Transformations/swap_array_dims.h b/src/Transformations/ArrayDimsSwapping/swap_array_dims.h similarity index 100% rename from src/Transformations/swap_array_dims.h rename to src/Transformations/ArrayDimsSwapping/swap_array_dims.h diff --git a/src/Transformations/checkpoints.cpp b/src/Transformations/CheckPoints/checkpoints.cpp similarity index 97% rename from src/Transformations/checkpoints.cpp rename to src/Transformations/CheckPoints/checkpoints.cpp index 5003f1a..372d62e 100644 --- a/src/Transformations/checkpoints.cpp +++ b/src/Transformations/CheckPoints/checkpoints.cpp @@ -1,12 +1,12 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../ExpressionTransform/expr_transform.h" +#include "SgUtils.h" +#include "utils.h" +#include "expr_transform.h" #include "checkpoints.h" diff --git a/src/Transformations/checkpoints.h b/src/Transformations/CheckPoints/checkpoints.h similarity index 100% rename from src/Transformations/checkpoints.h rename to src/Transformations/CheckPoints/checkpoints.h diff --git a/src/Transformations/convert_to_c.cpp b/src/Transformations/ConvertToC/convert_to_c.cpp similarity index 96% rename from src/Transformations/convert_to_c.cpp rename to src/Transformations/ConvertToC/convert_to_c.cpp index 2b3f7a6..867dc2b 100644 --- a/src/Transformations/convert_to_c.cpp +++ b/src/Transformations/ConvertToC/convert_to_c.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/Transformations/convert_to_c.h b/src/Transformations/ConvertToC/convert_to_c.h similarity index 100% rename from src/Transformations/convert_to_c.h rename to src/Transformations/ConvertToC/convert_to_c.h diff --git a/src/Transformations/dead_code.cpp b/src/Transformations/DeadCodeRemoving/dead_code.cpp similarity index 100% rename from src/Transformations/dead_code.cpp rename to src/Transformations/DeadCodeRemoving/dead_code.cpp diff --git a/src/Transformations/dead_code.h b/src/Transformations/DeadCodeRemoving/dead_code.h similarity index 92% rename from src/Transformations/dead_code.h rename to src/Transformations/DeadCodeRemoving/dead_code.h index 741acff..8f7b1fa 100644 --- a/src/Transformations/dead_code.h +++ b/src/Transformations/DeadCodeRemoving/dead_code.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph/CFGraph.h" #include "../CFGraph/live_variable_analysis.h" #include "../CFGraph/DataFlow/data_flow.h" diff --git a/src/ExpressionTransform/control_flow_graph_part.cpp b/src/Transformations/ExpressionSubstitution/control_flow_graph_part.cpp similarity index 96% rename from src/ExpressionTransform/control_flow_graph_part.cpp rename to src/Transformations/ExpressionSubstitution/control_flow_graph_part.cpp index 2245ccb..6f3fa08 100644 --- a/src/ExpressionTransform/control_flow_graph_part.cpp +++ b/src/Transformations/ExpressionSubstitution/control_flow_graph_part.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include "dvm.h" #include "acc_analyzer.h" diff --git a/src/ExpressionTransform/expr_transform.cpp b/src/Transformations/ExpressionSubstitution/expr_transform.cpp similarity index 96% rename from src/ExpressionTransform/expr_transform.cpp rename to src/Transformations/ExpressionSubstitution/expr_transform.cpp index 1fdcf65..eff3540 100644 --- a/src/ExpressionTransform/expr_transform.cpp +++ b/src/Transformations/ExpressionSubstitution/expr_transform.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #if _WIN32 && NDEBUG && __SPF && __BOOST #include @@ -19,11 +19,11 @@ extern int passDone; #include "../ParallelizationRegions/ParRegions.h" #include "../ParallelizationRegions/ParRegions_func.h" -#include "../GraphLoop/graph_loops.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "graph_loops.h" +#include "graph_calls.h" +#include "graph_calls_func.h" +#include "utils.h" +#include "SgUtils.h" #include "../Distribution/Distribution.h" #include "../VisualizerCalls/get_information.h" #include "expr_transform.h" diff --git a/src/ExpressionTransform/expr_transform.h b/src/Transformations/ExpressionSubstitution/expr_transform.h similarity index 95% rename from src/ExpressionTransform/expr_transform.h rename to src/Transformations/ExpressionSubstitution/expr_transform.h index fd11907..d79cd06 100644 --- a/src/ExpressionTransform/expr_transform.h +++ b/src/Transformations/ExpressionSubstitution/expr_transform.h @@ -5,10 +5,10 @@ #include #include "dvm.h" #include "../Distribution/Distribution.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../GraphCall/graph_calls.h" -#include "../Utils/SgUtils.h" +#include "graph_calls.h" +#include "SgUtils.h" #include "acc_analyzer.h" diff --git a/src/Transformations/uniq_call_chain_dup.cpp b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp similarity index 96% rename from src/Transformations/uniq_call_chain_dup.cpp rename to src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp index 838df37..b2e5eb9 100644 --- a/src/Transformations/uniq_call_chain_dup.cpp +++ b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -12,13 +12,13 @@ #include #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "uniq_call_chain_dup.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" -#include "../ExpressionTransform/expr_transform.h" +#include "graph_calls.h" +#include "graph_calls_func.h" +#include "expr_transform.h" #include "../VerificationCode/verifications.h" using namespace std; diff --git a/src/Transformations/uniq_call_chain_dup.h b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.h similarity index 89% rename from src/Transformations/uniq_call_chain_dup.h rename to src/Transformations/FunctionDuplication/uniq_call_chain_dup.h index 609e978..4e3e16d 100644 --- a/src/Transformations/uniq_call_chain_dup.h +++ b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.h @@ -1,6 +1,6 @@ #pragma once -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include #include #include diff --git a/src/Inliner/inliner.cpp b/src/Transformations/FunctionInlining/inliner.cpp similarity index 96% rename from src/Inliner/inliner.cpp rename to src/Transformations/FunctionInlining/inliner.cpp index ad87c5a..bb3231d 100644 --- a/src/Inliner/inliner.cpp +++ b/src/Transformations/FunctionInlining/inliner.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,13 +8,13 @@ #include #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../GraphCall/graph_calls_func.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "graph_calls_func.h" #include "inliner.h" #include "../VisualizerCalls/SendMessage.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" using std::set; using std::map; @@ -1776,11 +1776,8 @@ static bool inliner(const string& fileName_in, const string& funcName, const int point.currCall = func->funcName; __spf_print(1, " INLINE %s - ", func->funcName.c_str()); -#ifdef _WIN32 - sendMessage_2lvl(wstring(L" '") + wstring(func->funcName.begin(), func->funcName.end()) + L"'"); -#else - sendMessage_2lvl(wstring(L"inlinig of function '") + wstring(func->funcName.begin(), func->funcName.end()) + L"'"); -#endif + sendMessage_2lvl(6, func->funcName); + //1 level bool isInlined = run_inliner(funcMap, toInsert, SPF_messages, fileName, func, newSymbsToDeclare, point, commonBlocks); __spf_print(1, "%s\n", isInlined ? "done" : "fault"); diff --git a/src/Inliner/inliner.h b/src/Transformations/FunctionInlining/inliner.h similarity index 100% rename from src/Inliner/inliner.h rename to src/Transformations/FunctionInlining/inliner.h diff --git a/src/Transformations/function_purifying.cpp b/src/Transformations/FunctionPurifying/function_purifying.cpp similarity index 97% rename from src/Transformations/function_purifying.cpp rename to src/Transformations/FunctionPurifying/function_purifying.cpp index 28d454f..2eb2470 100644 --- a/src/Transformations/function_purifying.cpp +++ b/src/Transformations/FunctionPurifying/function_purifying.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -11,11 +11,11 @@ #include #include "dvm.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../Utils/DefUseList.h" -#include "ExpressionTransform/expr_transform.h" +#include "graph_calls_func.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "DefUseList.h" +#include "expr_transform.h" #include "../VerificationCode/verifications.h" #include "../DvmhRegions/DvmhRegionInserter.h" #include "function_purifying.h" diff --git a/src/Transformations/function_purifying.h b/src/Transformations/FunctionPurifying/function_purifying.h similarity index 100% rename from src/Transformations/function_purifying.h rename to src/Transformations/FunctionPurifying/function_purifying.h diff --git a/src/Transformations/fix_common_blocks.cpp b/src/Transformations/GlobalVariables/fix_common_blocks.cpp similarity index 100% rename from src/Transformations/fix_common_blocks.cpp rename to src/Transformations/GlobalVariables/fix_common_blocks.cpp diff --git a/src/Transformations/fix_common_blocks.h b/src/Transformations/GlobalVariables/fix_common_blocks.h similarity index 91% rename from src/Transformations/fix_common_blocks.h rename to src/Transformations/GlobalVariables/fix_common_blocks.h index 60b5855..13bbd3e 100644 --- a/src/Transformations/fix_common_blocks.h +++ b/src/Transformations/GlobalVariables/fix_common_blocks.h @@ -8,10 +8,10 @@ #include #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../ExpressionTransform/expr_transform.h" +#include "expr_transform.h" struct DeclInfo // for error messages diff --git a/src/Transformations/loops_combiner.cpp b/src/Transformations/LoopCombining/loops_combiner.cpp similarity index 96% rename from src/Transformations/loops_combiner.cpp rename to src/Transformations/LoopCombining/loops_combiner.cpp index ae5db2e..c0ac86e 100644 --- a/src/Transformations/loops_combiner.cpp +++ b/src/Transformations/LoopCombining/loops_combiner.cpp @@ -1,9 +1,10 @@ #include "loops_combiner.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../ExpressionTransform/expr_transform.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "expr_transform.h" +#include "errors.h" +#include "SgUtils.h" +#include "utils.h" #include #include #include @@ -17,19 +18,6 @@ using std::make_pair; using std::queue; using std::wstring; -static int gcd(int a, int b) -{ - while (a != b) - { - if (a > b) - a = a - b; - else - b = b - a; - } - - return a; -} - static SgSymbol* getLoopSymbol(const LoopGraph* loop) { if (!loop || !loop->isFor) @@ -1385,7 +1373,6 @@ static int getNewStep(SgForStmt* firstLoopStmt, SgForStmt* loopStmt) step2Val = step2->valueInteger(); int stepGcd = gcd(std::abs(step1Val), std::abs(step2Val)); - int newStep = stepGcd; int startDifference = 0; diff --git a/src/Transformations/loops_combiner.h b/src/Transformations/LoopCombining/loops_combiner.h similarity index 90% rename from src/Transformations/loops_combiner.h rename to src/Transformations/LoopCombining/loops_combiner.h index 49244f6..9153a1e 100644 --- a/src/Transformations/loops_combiner.h +++ b/src/Transformations/LoopCombining/loops_combiner.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../SageAnalysisTool/depGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/Transformations/enddo_loop_converter.cpp b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp similarity index 96% rename from src/Transformations/enddo_loop_converter.cpp rename to src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp index d4c45e1..4f1c253 100644 --- a/src/Transformations/enddo_loop_converter.cpp +++ b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -11,9 +11,9 @@ #include "dvm.h" #include "enddo_loop_converter.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/Transformations/enddo_loop_converter.h b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h similarity index 88% rename from src/Transformations/enddo_loop_converter.h rename to src/Transformations/LoopEndDoConverter/enddo_loop_converter.h index 6de9691..39a307b 100644 --- a/src/Transformations/enddo_loop_converter.h +++ b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h @@ -1,6 +1,6 @@ #pragma once -#include "../Utils/errors.h" +#include "errors.h" void ConverToEndDo(SgFile *file, std::vector &messagesForFile); std::vector createIfConditions(std::stack& conds, std::stack& ifBlocks, SgStatement *control); diff --git a/src/Transformations/loop_transform.cpp b/src/Transformations/LoopNesting/loop_transform.cpp similarity index 96% rename from src/Transformations/loop_transform.cpp rename to src/Transformations/LoopNesting/loop_transform.cpp index b720652..41e4394 100644 --- a/src/Transformations/loop_transform.cpp +++ b/src/Transformations/LoopNesting/loop_transform.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,9 +8,9 @@ #include "../DirectiveProcessing/directive_parser.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../SageAnalysisTool/definesValues.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../SageAnalysisTool/depGraph.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::pair; using std::map; diff --git a/src/Transformations/loop_transform.h b/src/Transformations/LoopNesting/loop_transform.h similarity index 88% rename from src/Transformations/loop_transform.h rename to src/Transformations/LoopNesting/loop_transform.h index 3713dba..49c5378 100644 --- a/src/Transformations/loop_transform.h +++ b/src/Transformations/LoopNesting/loop_transform.h @@ -1,7 +1,7 @@ #pragma once #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" void reverseCreatedNestedLoops(const std::string &file, std::vector &loopsInFile); bool createNestedLoops(LoopGraph *current, const std::map &depInfoForLoopGraph, diff --git a/src/Transformations/loops_splitter.cpp b/src/Transformations/LoopSplitting/loops_splitter.cpp similarity index 97% rename from src/Transformations/loops_splitter.cpp rename to src/Transformations/LoopSplitting/loops_splitter.cpp index 65f7eca..07d5776 100644 --- a/src/Transformations/loops_splitter.cpp +++ b/src/Transformations/LoopSplitting/loops_splitter.cpp @@ -4,8 +4,8 @@ #include #include "../LoopAnalyzer/loop_analyzer.h" -#include "../ExpressionTransform/expr_transform.h" -#include "../Utils/errors.h" +#include "expr_transform.h" +#include "errors.h" #include "../CFGraph/CFGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/Transformations/loops_splitter.h b/src/Transformations/LoopSplitting/loops_splitter.h similarity index 83% rename from src/Transformations/loops_splitter.h rename to src/Transformations/LoopSplitting/loops_splitter.h index 9bdaa5e..084387b 100644 --- a/src/Transformations/loops_splitter.h +++ b/src/Transformations/LoopSplitting/loops_splitter.h @@ -4,8 +4,8 @@ #include #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../SageAnalysisTool/depGraph.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" int splitLoops(SgFile *file, std::vector &loopGraphs, std::vector &messages, const std::map& depInfoForLoopGraph, const std::map& commonBlocks, const std::map>& allFuncInfo, int& countOfTransform); diff --git a/src/Transformations/loops_unrolling.cpp b/src/Transformations/LoopUnrolling/loops_unrolling.cpp similarity index 96% rename from src/Transformations/loops_unrolling.cpp rename to src/Transformations/LoopUnrolling/loops_unrolling.cpp index 214c5ab..79fc511 100644 --- a/src/Transformations/loops_unrolling.cpp +++ b/src/Transformations/LoopUnrolling/loops_unrolling.cpp @@ -1,8 +1,8 @@ #include "loops_unrolling.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/errors.h" -#include "../GraphLoop/graph_loops_func.h" +#include "errors.h" +#include "graph_loops_func.h" #include #include diff --git a/src/Transformations/loops_unrolling.h b/src/Transformations/LoopUnrolling/loops_unrolling.h similarity index 77% rename from src/Transformations/loops_unrolling.h rename to src/Transformations/LoopUnrolling/loops_unrolling.h index 4664fcc..f04c2ce 100644 --- a/src/Transformations/loops_unrolling.h +++ b/src/Transformations/LoopUnrolling/loops_unrolling.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include int unrollLoops(SgFile* file, std::vector& loopGraph, std::vector& messages); \ No newline at end of file diff --git a/src/Transformations/private_removing.cpp b/src/Transformations/PrivateArrayRemoving/private_removing.cpp similarity index 97% rename from src/Transformations/private_removing.cpp rename to src/Transformations/PrivateArrayRemoving/private_removing.cpp index 51414e8..0ddd7a6 100644 --- a/src/Transformations/private_removing.cpp +++ b/src/Transformations/PrivateArrayRemoving/private_removing.cpp @@ -1,10 +1,10 @@ #include "private_removing.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../ExpressionTransform/expr_transform.h" -#include "dead_code.h" +#include "errors.h" +#include "SgUtils.h" +#include "utils.h" +#include "expr_transform.h" +#include "../DeadCodeRemoving/dead_code.h" using std::make_pair; using std::map; diff --git a/src/Transformations/private_removing.h b/src/Transformations/PrivateArrayRemoving/private_removing.h similarity index 100% rename from src/Transformations/private_removing.h rename to src/Transformations/PrivateArrayRemoving/private_removing.h diff --git a/src/Transformations/private_arrays_resizing.cpp b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp similarity index 96% rename from src/Transformations/private_arrays_resizing.cpp rename to src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp index 25d2766..d2d4a58 100644 --- a/src/Transformations/private_arrays_resizing.cpp +++ b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp @@ -1,8 +1,8 @@ #include "private_arrays_resizing.h" -#include "../GraphLoop/graph_loops.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "graph_loops.h" +#include "SgUtils.h" +#include "utils.h" +#include "errors.h" #include "../DirectiveProcessing/directive_parser.h" #include "../LoopAnalyzer/loop_analyzer.h" diff --git a/src/Transformations/private_arrays_resizing.h b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h similarity index 91% rename from src/Transformations/private_arrays_resizing.h rename to src/Transformations/PrivateArrayResizing/private_arrays_resizing.h index 1ad162d..e5f00a3 100644 --- a/src/Transformations/private_arrays_resizing.h +++ b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h @@ -1,5 +1,5 @@ #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include #include #include diff --git a/src/RenameSymbols/rename_symbols.cpp b/src/Transformations/RenameSymbols/rename_symbols.cpp similarity index 96% rename from src/RenameSymbols/rename_symbols.cpp rename to src/Transformations/RenameSymbols/rename_symbols.cpp index 1e812de..bcb593b 100644 --- a/src/RenameSymbols/rename_symbols.cpp +++ b/src/Transformations/RenameSymbols/rename_symbols.cpp @@ -4,7 +4,7 @@ #include #include "Utils/SgUtils.h" -#include "RenameSymbols/rename_symbols.h" +#include "rename_symbols.h" using std::vector; using std::map; diff --git a/src/RenameSymbols/rename_symbols.h b/src/Transformations/RenameSymbols/rename_symbols.h similarity index 100% rename from src/RenameSymbols/rename_symbols.h rename to src/Transformations/RenameSymbols/rename_symbols.h diff --git a/src/Transformations/replace_dist_arrays_in_io.cpp b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp similarity index 91% rename from src/Transformations/replace_dist_arrays_in_io.cpp rename to src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp index efb63e4..9a1ad21 100644 --- a/src/Transformations/replace_dist_arrays_in_io.cpp +++ b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp @@ -1,11 +1,11 @@ #include "replace_dist_arrays_in_io.h" -#include "../ParallelizationRegions/resolve_par_reg_conflicts.h" - #include #include #include -#include + +#include "expr_transform.h" +#include "../ParallelizationRegions/resolve_par_reg_conflicts.h" using std::map; using std::set; @@ -88,24 +88,36 @@ static void populateDistributedIoArrays(map>& array case READ_STAT: case WRITE_STAT: { - SgExpression* spec = stat->expr(1); - __spf_print(DEBUG_TRACE, "[%d: %s (%d)]\n", 2000, spec->rhs()->unparse(), spec->rhs()->variant()); - if (!spec || spec->variant() != EXPR_LIST || - spec->lhs()->variant() != SPEC_PAIR || - !spec->rhs() || !spec->rhs()->lhs() || spec->rhs()->lhs()->variant() != SPEC_PAIR) + + if (spec->variant() == SPEC_PAIR) { - printInternalError(convertFileName(__FILE__).c_str(), __LINE__); - return; + if (spec->rhs()->variant() != KEYWORD_VAL || spec->rhs()->sunparse() != "*") + { + need_replace = true; + break; + } } + else + { + while (spec) + { + auto *kv = spec->lhs(); + if (!kv || kv->variant() != SPEC_PAIR || !kv->rhs()) + { + printInternalError(convertFileName(__FILE__).c_str(), __LINE__); + return; + } - SgExpression* unit_val = spec->lhs()->rhs(), * fmt_val = spec->rhs()->lhs()->rhs(); + if (kv->rhs()->variant() != KEYWORD_VAL || kv->rhs()->sunparse() != "*") + { + need_replace = true; + break; + } - if (unit_val->variant() != KEYWORD_VAL || unit_val->sunparse() != "*" || - fmt_val->variant() != KEYWORD_VAL || fmt_val->sunparse() != "*") - need_replace = true; - - break; + spec = spec->rhs(); + } + } } default: break; @@ -136,7 +148,8 @@ static void replaceArrayRec(SgSymbol* arr, SgSymbol* replace_by, SgExpression* e if (!exp) return; - if (exp->symbol() && exp->symbol()->identifier() && strcmp(exp->symbol()->identifier(), arr->identifier()) == 0) + if (isArrayRef(exp) && + strcmp(exp->symbol()->identifier(), arr->identifier()) == 0) { has_read |= from_read; has_write |= from_write; @@ -202,11 +215,9 @@ static void copyArrayBetweenStatements(SgSymbol* replace_symb, SgSymbol* replace while (start->lexNext() && !isSgExecutableStatement(start->lexNext())) start = start->lexNext(); - auto* stop = last->lexNext(); - bool has_read = false, has_write = false; - for (auto* st = start->lexNext(); st && st != stop->lexPrev(); st = st->lexNext()) + for (auto* st = start->lexNext(); st && st != last; st = st->lexNext()) replaceArrayRec(replace_symb, replace_by, st, has_read, has_write); diff --git a/src/Transformations/replace_dist_arrays_in_io.h b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h similarity index 80% rename from src/Transformations/replace_dist_arrays_in_io.h rename to src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h index a9998ef..e643f59 100644 --- a/src/Transformations/replace_dist_arrays_in_io.h +++ b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h @@ -1,9 +1,9 @@ #pragma once #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" -#include "../GraphCall/graph_calls.h" +#include "SgUtils.h" +#include "errors.h" +#include "graph_calls.h" void replaceDistributedArraysInIO(std::vector& regions, const std::map>& allFuncInfo, diff --git a/src/Transformations/set_implicit_none.cpp b/src/Transformations/SetImplicitNone/set_implicit_none.cpp similarity index 96% rename from src/Transformations/set_implicit_none.cpp rename to src/Transformations/SetImplicitNone/set_implicit_none.cpp index 8407685..6559a24 100644 --- a/src/Transformations/set_implicit_none.cpp +++ b/src/Transformations/SetImplicitNone/set_implicit_none.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/Transformations/set_implicit_none.h b/src/Transformations/SetImplicitNone/set_implicit_none.h similarity index 100% rename from src/Transformations/set_implicit_none.h rename to src/Transformations/SetImplicitNone/set_implicit_none.h diff --git a/src/Transformations/array_assign_to_loop.cpp b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp similarity index 97% rename from src/Transformations/array_assign_to_loop.cpp rename to src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp index 01bd012..927d661 100644 --- a/src/Transformations/array_assign_to_loop.cpp +++ b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -13,9 +13,9 @@ #include "dvm.h" #include "../ParallelizationRegions/ParRegions.h" #include "array_assign_to_loop.h" -#include "../Utils/SgUtils.h" -#include "../ExpressionTransform/expr_transform.h" -#include "../GraphCall/graph_calls_func.h" +#include "SgUtils.h" +#include "expr_transform.h" +#include "graph_calls_func.h" #include "../VerificationCode/verifications.h" using std::vector; @@ -2215,6 +2215,7 @@ void restoreAssignsFromLoop(SgFile* file, const mapsetVariant(-abs(move.first->variant())); + __spf_print(1, " save assign\n"); if (needDecl) // declare loops symbol { @@ -2237,8 +2238,10 @@ void restoreAssignsFromLoop(SgFile* file, const mapsetVariant(-abs(move.second->variant())); + __spf_print(1, " restored assign\n"); + } } } } diff --git a/src/Transformations/array_assign_to_loop.h b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h similarity index 93% rename from src/Transformations/array_assign_to_loop.h rename to src/Transformations/VectorAssignToLoop/array_assign_to_loop.h index dade68e..5fc40f3 100644 --- a/src/Transformations/array_assign_to_loop.h +++ b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h @@ -2,7 +2,7 @@ #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" void convertFromAssignToLoop(SgFile *file, const std::vector& regions, std::vector &messagesForFile, const std::map>& arrayLinksByFuncCalls); void restoreAssignsFromLoop(SgFile *file, const std::map>& arrayLinksByFuncCalls); diff --git a/src/Utils/CommonBlock.h b/src/Utils/CommonBlock.h index 196f3b9..7b89792 100644 --- a/src/Utils/CommonBlock.h +++ b/src/Utils/CommonBlock.h @@ -1,5 +1,7 @@ #pragma once +#include "../Distribution/Array.h" + enum varType { SCALAR, ARRAY, CONST, ANOTHER }; struct CommonVariableUse diff --git a/src/Utils/PassManager.h b/src/Utils/PassManager.h index 9d1c5fc..67f96bd 100644 --- a/src/Utils/PassManager.h +++ b/src/Utils/PassManager.h @@ -257,7 +257,7 @@ void InitPassesDependencies(map> &passDepsIn, set list({ REVERT_SUBST_EXPR_RD, CONVERT_LOOP_TO_ASSIGN }) <= Pass(RESOLVE_PAR_REGIONS); - list({ REVERT_SUBST_EXPR_RD, CONVERT_LOOP_TO_ASSIGN, FILL_PAR_REGIONS}) <= Pass(REMOVE_DIST_ARRAYS_FROM_IO); + list({ FILL_PAR_REGIONS, REVERT_SUBST_EXPR_RD, CONVERT_LOOP_TO_ASSIGN }) <= Pass(REMOVE_DIST_ARRAYS_FROM_IO); Pass(REVERT_SUBST_EXPR_RD) <= Pass(EXPAND_EXTRACT_PAR_REGION); diff --git a/src/Utils/SgUtils.cpp b/src/Utils/SgUtils.cpp index 677e0a9..1a206c5 100644 --- a/src/Utils/SgUtils.cpp +++ b/src/Utils/SgUtils.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -37,8 +37,8 @@ #include "../DirectiveProcessing/directive_parser.h" #include "../Distribution/Distribution.h" -#include "../GraphCall/graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls.h" +#include "graph_calls_func.h" #include "../CreateInterTree/CreateInterTree.h" #include "../Predictor/PredictScheme.h" #include "../VisualizerCalls/get_information.h" @@ -3219,12 +3219,14 @@ bool isArrayRef(SgExpression* ex) { SgArrayRefExp* arrayRef = isSgArrayRefExp(ex); if (arrayRef) + { if (isArrayType(ex->symbol()->type())) { auto type = isSgArrayType(ex->symbol()->type()); if (type && type->dimension()) return true; } + } } return false; } diff --git a/src/Utils/SgUtils.h b/src/Utils/SgUtils.h index 5ce6d38..68b726e 100644 --- a/src/Utils/SgUtils.h +++ b/src/Utils/SgUtils.h @@ -3,7 +3,7 @@ #include "dvm.h" #include "utils.h" #include "../Distribution/Distribution.h" -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include "../DynamicAnalysis/gcov_info.h" #include "module_utils.h" diff --git a/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp index 9bc9e1a..8d1de0a 100644 --- a/src/Utils/module_utils.cpp +++ b/src/Utils/module_utils.cpp @@ -7,7 +7,7 @@ #include "dvm.h" #include "errors.h" #include "utils.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "module_utils.h" diff --git a/src/Utils/utils.cpp b/src/Utils/utils.cpp index 2ee26d1..e680054 100644 --- a/src/Utils/utils.cpp +++ b/src/Utils/utils.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -14,18 +14,16 @@ #include #include #include -#include #include #include #include #include -#include -#include "utils.h" #include "errors.h" +#include "utils.h" #include "version.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../Distribution/Array.h" #include "../Distribution/Arrays.h" #include "../DynamicAnalysis/gcov_info.h" @@ -1737,4 +1735,38 @@ void copyStringToShort(short*& result, const string& resVal, bool withEnd) if (withEnd) result[resVal.size()] = (short)'\0'; +} + +void dumpMessages(bool inCatch, const map>& messages, const char *vis_path) +{ + json byFileArray = json::array(); + for (auto& byFile : messages) + { + json inFile; + inFile["file"] = byFile.first; + + json messages = json::array(); + for (auto& message : byFile.second) + { + if (inCatch) + message.print(byFile.first); + messages.push_back(message.toJson()); + } + inFile["messages"] = messages; + byFileArray.push_back(inFile); + } + json allMessages; + allMessages["allMessages"] = byFileArray; + + const string dump = allMessages.dump().c_str(); + + if (dump.size()) + { + FILE* outF = fopen((string(vis_path) + "/error_messages.json").c_str(), "w"); + if (outF) + { + fprintf(outF, "%s", dump.c_str()); + fclose(outF); + } + } } \ No newline at end of file diff --git a/src/Utils/utils.h b/src/Utils/utils.h index e96fd1b..fc2611f 100644 --- a/src/Utils/utils.h +++ b/src/Utils/utils.h @@ -5,7 +5,9 @@ #include #include +struct Messages; struct DataDirective; + namespace Distribution { class Array; @@ -98,3 +100,17 @@ std::set fillDistributedArraysD(const DataDirective& dataDirective std::set fillDistributedArrays(const DataDirective& dataDirectives, const std::map>& tableOfUniqNamesByArray, const std::map>& arrayLinksByFuncCalls, bool onlyCommon = false, bool shortName = false); void copyStringToShort(short*& result, const std::string& resVal, bool withEnd = true); +void dumpMessages(bool inCatch, const std::map>& messages, const char* vis_path); + +template +inline T gcd(T a, T b) +{ + while (a != b) + { + if (a > b) + a = a - b; + else + b = b - a; + } + return a; +} diff --git a/src/Utils/version.h b/src/Utils/version.h index 43758a9..7465e56 100644 --- a/src/Utils/version.h +++ b/src/Utils/version.h @@ -1,3 +1,3 @@ #pragma once -#define VERSION_SPF "2422" +#define VERSION_SPF "2429" diff --git a/src/VerificationCode/CorrectVarDecl.cpp b/src/VerificationCode/CorrectVarDecl.cpp index 96625f0..95ea158 100644 --- a/src/VerificationCode/CorrectVarDecl.cpp +++ b/src/VerificationCode/CorrectVarDecl.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -10,10 +10,10 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::vector; using std::string; diff --git a/src/VerificationCode/IncludeChecker.cpp b/src/VerificationCode/IncludeChecker.cpp index 15fe93e..d8caf31 100644 --- a/src/VerificationCode/IncludeChecker.cpp +++ b/src/VerificationCode/IncludeChecker.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,9 +8,9 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "errors.h" #include "../Distribution/DvmhDirective.h" using std::vector; diff --git a/src/VerificationCode/StructureChecker.cpp b/src/VerificationCode/StructureChecker.cpp index 407510b..aac7c76 100644 --- a/src/VerificationCode/StructureChecker.cpp +++ b/src/VerificationCode/StructureChecker.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -9,9 +9,9 @@ #include "verifications.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "errors.h" using std::vector; using std::map; diff --git a/src/VerificationCode/VerifySageStructures.cpp b/src/VerificationCode/VerifySageStructures.cpp index 0c8da72..652fe56 100644 --- a/src/VerificationCode/VerifySageStructures.cpp +++ b/src/VerificationCode/VerifySageStructures.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -8,8 +8,8 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "errors.h" int VerifyFile(SgFile *file) { diff --git a/src/VerificationCode/verifications.h b/src/VerificationCode/verifications.h index ae62d4f..af1a3ba 100644 --- a/src/VerificationCode/verifications.h +++ b/src/VerificationCode/verifications.h @@ -4,11 +4,11 @@ #include #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../ParallelizationRegions/ParRegions.h" #include "../ParallelizationRegions/ParRegions_func.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" struct Function { diff --git a/src/VisualizerCalls/BuildGraph.cpp b/src/VisualizerCalls/BuildGraph.cpp index 8519016..bebebb1 100644 --- a/src/VisualizerCalls/BuildGraph.cpp +++ b/src/VisualizerCalls/BuildGraph.cpp @@ -14,7 +14,7 @@ #include #include -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "graphLayout/nodesoup.hpp" #include "BuildGraph.h" diff --git a/src/VisualizerCalls/SendMessage.cpp b/src/VisualizerCalls/SendMessage.cpp index 81cabb1..5ac7364 100644 --- a/src/VisualizerCalls/SendMessage.cpp +++ b/src/VisualizerCalls/SendMessage.cpp @@ -4,9 +4,10 @@ #include #include #include +#include #include "SendMessage.h" -#include "../Utils/utils.h" +#include "utils.h" #include "get_information.h" @@ -144,10 +145,116 @@ static int decodeMessage(const string& message, vector& pars, int &winH, return 0; } -void sendMessage_1lvl(const wstring& toSend) { MessageManager::sendFirstLvl (toSend); } -void sendMessage_2lvl(const wstring& toSend) { MessageManager::sendSecondLvl(toSend); } +static void sendMessage_1lvl(const wstring& toSend) { MessageManager::sendFirstLvl (toSend); } +static void sendMessage_2lvl(const wstring& toSend) { MessageManager::sendSecondLvl(toSend); } void sendMessage_progress(const wstring& toSend) { MessageManager::sendProgress (toSend); } +void sendMessage_1lvl(int kind, ...) +{ + va_list list; + va_start(list, kind); + + if (kind == 0) + { + int iters = va_arg(list, int); +#ifdef _WIN32 + sendMessage_1lvl(L" " + std::to_wstring(iters) + L" "); +#else + sendMessage_1lvl(L"running " + std::to_wstring(iters) + L" iteration of syntax analisys"); +#endif + } + else if (kind == 1) + { + string str = va_arg(list, string); +#ifdef _WIN32 + sendMessage_1lvl(wstring(L" '") + wstring(str.begin(), str.end()) + L"'"); +#else + sendMessage_1lvl(wstring(L"running pass '") + wstring(str.begin(), str.end()) + L"'"); +#endif + } + + va_end(list); +} + +void sendMessage_2lvl(int kind, ...) +{ + va_list list; + va_start(list, kind); + + if (kind == 0) + { + bool isFunction = va_arg(list, int); + string fName = va_arg(list, string); +#if _WIN32 + if (isFunction) + sendMessage_2lvl(wstring(L" '") + to_wstring(fName) + L"'"); + else + sendMessage_2lvl(wstring(L" '") + to_wstring(fName) + L"'"); +#else + if (isFunction) + sendMessage_2lvl(wstring(L"processing function '") + wstring(fName.begin(), fName.end()) + L"'"); + else + sendMessage_2lvl(wstring(L"processing module '") + wstring(fName.begin(), fName.end()) + L"'"); +#endif + } + else if (kind == 1) + { + int idx = va_arg(list, int); + int all = va_arg(list, int); +#ifdef _WIN32 + sendMessage_2lvl(wstring(L" ") + std::to_wstring(idx) + L"/" + std::to_wstring(all)); +#else + sendMessage_2lvl(wstring(L"processing loop ") + std::to_wstring(idx) + L"/" + std::to_wstring(all)); +#endif + } + else if (kind == 2) + { + sendMessage_2lvl(L""); + } + else if (kind == 3) + { + string file = va_arg(list, string); +#ifdef _WIN32 + sendMessage_2lvl(L" '" + to_wstring(file) + L"'"); +#else + sendMessage_2lvl(L" processing file '" + to_wstring(file) + L"'"); +#endif + } + else if (kind == 4) + { + int k = va_arg(list, int); + int all = va_arg(list, int); +#if _WIN32 + wstring treeM = L" , " + std::to_wstring(k + 1) + L"/" + std::to_wstring(all); +#else + wstring treeM = L"conflict resolution, processing group " + std::to_wstring(k + 1) + L"/" + std::to_wstring(all); +#endif + sendMessage_2lvl(treeM); + } + else if (kind == 5) + { + int z = va_arg(list, int); + int all = va_arg(list, int); +#ifdef _WIN32 + wstring treeM = L" , " + std::to_wstring(z + 1) + L"/" + std::to_wstring(all); +#else + wstring treeM = L"conflict resolution, processing array " + std::to_wstring(z + 1) + L"/" + std::to_wstring(all); +#endif + sendMessage_2lvl(treeM); + } + else if (kind == 6) + { + string funcName = va_arg(list, string); +#ifdef _WIN32 + sendMessage_2lvl(wstring(L" '") + to_wstring(funcName) + L"'"); +#else + sendMessage_2lvl(wstring(L"inlinig of function '") + to_wstring(funcName) + L"'"); +#endif + } + + va_end(list); +} + static string utf8_encode(const wstring& wstr) { if (wstr.empty()) diff --git a/src/VisualizerCalls/SendMessage.h b/src/VisualizerCalls/SendMessage.h index aa3bbba..eeb583b 100644 --- a/src/VisualizerCalls/SendMessage.h +++ b/src/VisualizerCalls/SendMessage.h @@ -32,7 +32,8 @@ public: static int init(); }; -void sendMessage_1lvl(const std::wstring& toSend); -void sendMessage_2lvl(const std::wstring& toSend); +void sendMessage_1lvl(int kind, ...); +void sendMessage_2lvl(int kind, ...); void sendMessage_progress(const std::wstring& toSend); + unsigned int GetPid(); diff --git a/src/VisualizerCalls/get_information.cpp b/src/VisualizerCalls/get_information.cpp index 8aa5102..d375cd0 100644 --- a/src/VisualizerCalls/get_information.cpp +++ b/src/VisualizerCalls/get_information.cpp @@ -23,14 +23,14 @@ #include #endif -#include "../Utils/errors.h" -#include "../Utils/version.h" +#include "errors.h" +#include "version.h" #include "get_information.h" #include "dvm.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/utils.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" +#include "utils.h" #include "../Sapfor.h" #include "../ParallelizationRegions/ParRegions.h" #include "SendMessage.h" @@ -67,6 +67,7 @@ using json = nlohmann::json; extern set allocated; extern set allocatedInt; extern bool runAsClient; +extern const char* VISUALIZER_DATA_PATH; bool showDebug = false; static const string interruptEx = "Interrupted by user"; @@ -298,7 +299,7 @@ static void runPassesForVisualizer(const short *projName, const vector & while (passDone == 0) { FILE* interrupt_old = fopen("INTERRUPT", "r"); - FILE* interrupt = fopen("visualiser_data/INTERRUPT", "r"); + FILE* interrupt = fopen((string(VISUALIZER_DATA_PATH) + "/INTERRUPT").c_str(), "r"); if (interrupt || interrupt_old) { if (showDebug) diff --git a/tests/sapfor/parameter/dynamic_array_maximum.f90 b/tests/sapfor/parameter/dynamic_array_maximum.f90 new file mode 100644 index 0000000..f49e5e3 --- /dev/null +++ b/tests/sapfor/parameter/dynamic_array_maximum.f90 @@ -0,0 +1,52 @@ +program dynamic_array_maximum_3d + implicit none + integer :: n1, n2, n3, n4 , k, i, j, l, a + integer :: sum3 + real :: max_element + real, allocatable :: array(:,:,:), array2(:,:,:), array3(:,:,:) + + write(*, *) "Enter 3 integers" + read(*, *) n, m, k + m = 100 + + if (1 .eq. 1) then + a = 3 + else if (2 .eq. 1) then + a = 4 + endif + + m = m + 1 + k = m * 1000 + n * 10 + + allocate(array(n, m + n, k + m + n), & + &array2(k, m + n, k), & + &array3(k, m, k + n)) + + call random_seed() + do i = 1, n1 + do j = 1, m * n1 + do l = 1, k * m * n1 + call random_number(array(i,j,l)) + array(i,j,l) = int(array(i,j,l) * 100) + end do + end do + end do + + max_element = array(1,1,1) + do i = 1, n1 + do j = 1, m + do l = 1, k + max_element = MAX(array(i,j,l), max_element) + end do + end do + end do + deallocate(array, array2, array3) + write(*, *) max_element +end program dynamic_array_maximum_3d + +! function sum3(x, y, z) +! implicit none +! integer :: x, y, z +! integer :: sum3 +! sum3 = x + y + z +! end function sum3