diff --git a/src/ArrayConstantPropagation/propagation.cpp b/src/ArrayConstantPropagation/propagation.cpp index a9400fc..034c6b4 100644 --- a/src/ArrayConstantPropagation/propagation.cpp +++ b/src/ArrayConstantPropagation/propagation.cpp @@ -313,7 +313,7 @@ static void CheckVariable(SgStatement* st, SgExpression* exp, unordered_map arrayToVariable; int variableNumber = 0; diff --git a/src/ArrayConstantPropagation/propagation.h b/src/ArrayConstantPropagation/propagation.h index f33523c..65fe4ed 100644 --- a/src/ArrayConstantPropagation/propagation.h +++ b/src/ArrayConstantPropagation/propagation.h @@ -17,4 +17,4 @@ struct ExprRestoreEntry SgExpression* savedCopy; }; -void ArrayConstantPropagation(SgProject& project); \ No newline at end of file +void arrayConstantPropagation(SgProject& project); \ No newline at end of file diff --git a/src/PrivateAnalyzer/private_arrays_search.cpp b/src/PrivateAnalyzer/private_arrays_search.cpp index 041c2bc..b08dd5b 100644 --- a/src/PrivateAnalyzer/private_arrays_search.cpp +++ b/src/PrivateAnalyzer/private_arrays_search.cpp @@ -419,7 +419,7 @@ static void AddPrivateArraysToLoop(LoopGraph* loop, const ArrayAccessingIndexes& } } -void FindPrivateArrays(map>& loopGraph, map>& FullIR, set& insertedPrivates) +void findPrivateArrays(map>& loopGraph, map>& FullIR, set& insertedPrivates) { map result; for (const auto& [fileName, loops] : loopGraph) diff --git a/src/PrivateAnalyzer/private_arrays_search.h b/src/PrivateAnalyzer/private_arrays_search.h index ca5da48..8b8f02c 100644 --- a/src/PrivateAnalyzer/private_arrays_search.h +++ b/src/PrivateAnalyzer/private_arrays_search.h @@ -9,5 +9,4 @@ #include "graph_loops.h" #include "CFGraph/CFGraph.h" -void FindPrivateArrays(std::map>& loopGraph, std::map>& FullIR, std::set& insertedPrivates); -std::pair> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector blocks); +void findPrivateArrays(std::map>& loopGraph, std::map>& FullIR, std::set& insertedPrivates); diff --git a/src/PrivateAnalyzer/region.cpp b/src/PrivateAnalyzer/region.cpp index 94c1815..4b38739 100644 --- a/src/PrivateAnalyzer/region.cpp +++ b/src/PrivateAnalyzer/region.cpp @@ -23,7 +23,7 @@ static bool isParentStmt(SgStatement* stmt, SgStatement* parent) } /*returns head block and loop*/ -pair> GetBasicBlocksForLoop(const LoopGraph* loop, const vector blocks) +static pair> GetBasicBlocksForLoop(const LoopGraph* loop, const vector blocks) { unordered_set block_loop; SAPFOR::BasicBlock* head_block = nullptr; diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp index f3eaa52..5a89c73 100644 --- a/src/Sapfor.cpp +++ b/src/Sapfor.cpp @@ -1905,14 +1905,11 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne else if (curr_regime == TRANSFORM_ASSUMED_SIZE_PARAMETERS) transformAssumedSizeParameters(allFuncInfo); else if (curr_regime == FIND_PRIVATE_ARRAYS_ANALYSIS) - FindPrivateArrays(loopGraph, fullIR, insertedPrivates); + findPrivateArrays(loopGraph, fullIR, insertedPrivates); else if (curr_regime == MERGE_REGIONS) - { mergeRegions(parallelRegions, allFuncInfo); - } - else if (curr_regime == ARRAY_PROPAGATION) - ArrayConstantPropagation(project); + arrayConstantPropagation(project); const float elapsed = duration_cast(high_resolution_clock::now() - timeForPass).count() / 1000.; const float elapsedGlobal = duration_cast(high_resolution_clock::now() - globalTime).count() / 1000.;