moved to transformations

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(TR_SWAP_OPERATORS src/Transformations/SwapOperators/swap_operators.cpp
         src/Transformations/SwapOperators/swap_operators.h)
 
@@ -210,6 +224,9 @@ set(TRANSFORMS
         ${TR_PRIV_DEL}
         ${TR_IMPLICIT_NONE}
         ${TR_REPLACE_ARRAYS_IN_IO}
+        ${TR_EXPR_TRANSFORM}
+        ${TR_INLINER}
+        ${TR_RENAME_SYMBOLS}
         ${TR_SWAP_OPERATORS})
         
 set(CFG src/CFGraph/IR.cpp
@@ -291,10 +308,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
@@ -306,18 +319,11 @@ 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
         src/LoopAnalyzer/loop_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
@@ -407,12 +413,9 @@ set(SOURCE_EXE
     ${DISTR}
     ${DVMH_REG}
     ${DYNA}
-    ${EXPR_TRANSFORM}
     ${GR_CALL}
     ${GR_LOOP}
-    ${INLINER}
     ${LOOP_ANALYZER}
-    ${RENAME_SYMBOLS}
     ${TRANSFORMS}
     ${PARALLEL_REG}
     ${PRIV}
@@ -436,7 +439,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})
@@ -444,13 +447,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})

src/CFGraph/CFGraph.cpp

@@ -1,5 +1,5 @@
 #define _LEAK_
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -10,7 +10,7 @@
 
 #include "../Utils/SgUtils.h"
 #include "../Utils/CommonBlock.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 
 #include "dvm.h"
 #include "IR.h"

src/CFGraph/IR.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -7,8 +7,8 @@
 
 #include "../Utils/SgUtils.h"
 #include "../Utils/CommonBlock.h"
-#include "../GraphCall/graph_calls.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "graph_calls.h"
+#include "expr_transform.h"
 
 #include "dvm.h"
 #include "IR.h"

src/CFGraph/RD_subst.cpp

@@ -10,8 +10,8 @@
 
 #include "../Utils/SgUtils.h"
 #include "../Utils/CommonBlock.h"
-#include "../GraphCall/graph_calls.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "graph_calls.h"
+#include "expr_transform.h"
 
 #define PRINT_PROF_INFO 0
 #define DEBUG_CHECKS 0

src/CFGraph/RD_subst.h

@@ -4,7 +4,7 @@
 
 #include "../Utils/SgUtils.h"
 #include "../Utils/CommonBlock.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 
 #include "CFGraph.h"
 #include "IR.h"

src/DirectiveProcessing/directive_analyzer.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/DirectiveProcessing/directive_creator.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -22,8 +22,8 @@
 #include "../Utils/SgUtils.h"
 #include "../Sapfor.h"
 #include "../GraphLoop/graph_loops_func.h"
-#include "../Transformations/loop_transform.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "../Transformations/LoopNesting/loop_transform.h"
+#include "expr_transform.h"
 #include "../GraphCall/graph_calls_func.h"
 
 #include "../Utils/AstWrapper.h"

src/DirectiveProcessing/directive_creator_base.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -10,7 +10,7 @@
 
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../Distribution/Arrays.h"
-#include "../Transformations/loop_transform.h"
+#include "../Transformations/LoopNesting/loop_transform.h"
 
 #include "../Utils/errors.h"
 #include "directive_parser.h"

src/DirectiveProcessing/directive_omp_parser.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/DirectiveProcessing/directive_parser.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>

src/DirectiveProcessing/insert_directive.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/DirectiveProcessing/remote_access.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -22,7 +22,7 @@
 #include "../Utils/errors.h"
 #include "../Utils/SgUtils.h"
 #include "../Distribution/Arrays.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
 #include "../GraphLoop/graph_loops_func.h"
 #include "remote_access.h"

src/DirectiveProcessing/remote_access_base.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 #include "../Distribution/Arrays.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphLoop/graph_loops.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "remote_access.h"

src/DirectiveProcessing/shadow.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <set>
 #include <map>
@@ -8,12 +8,12 @@
 #include "../Utils/errors.h"
 #include "../Utils/utils.h"
 #include "../GraphLoop/graph_loops_func.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
 #include "directive_parser.h"
 #include "../Distribution/DvmhDirective_func.h"
 #include "../Utils/SgUtils.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 
 #include "../CFGraph/CFGraph.h"
 

src/DirectiveProcessing/spf_directive_preproc.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -18,7 +18,7 @@
 #include "../Utils/SgUtils.h"
 #include "../Utils/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"
 

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 "graph_calls.h"
 
 using namespace std;
 

src/Distribution/ArrayAnalysis.cpp

@@ -1,7 +1,7 @@
 #include "Array.h"
 #include "../Utils/errors.h"
 #include "../Utils/utils.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../Utils/SgUtils.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../DirectiveProcessing/directive_omp_parser.h"

src/Distribution/CreateDistributionDirs.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/Distribution/Cycle.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <vector>
 #include <algorithm>

src/Distribution/Distribution.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/Distribution/DvmhDirective.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/Distribution/DvmhDirectiveBase.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/Distribution/GraphCSR.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <algorithm>
 #include <string>

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"
 

src/DvmhRegions/DvmhRegionInserter.h

@@ -2,7 +2,7 @@
 
 #include "../GraphCall/graph_calls_func.h"
 #include "../GraphLoop/graph_loops_func.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../Utils/SgUtils.h"
 #include "ReadWriteAnalyzer.h"

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 <map>
 #include <vector>

src/DynamicAnalysis/createParallelRegions.h

@@ -4,7 +4,7 @@
 
 #include "./gcov_info.h"
 #include "../CreateInterTree/CreateInterTree.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 
 #include <map>
 #include <vector>

src/DynamicAnalysis/gCov_parser.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdio.h>
 #include <fstream>

src/DynamicAnalysis/gcov_info.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <iostream>
 #include <map>

src/GraphCall/graph_calls.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -21,7 +21,7 @@
 #include "../Utils/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"
 

src/GraphCall/graph_calls_base.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/GraphLoop/graph_loops.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -14,7 +14,7 @@
 #include "../Sapfor.h"
 #include "../GraphCall/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"
@@ -31,7 +31,7 @@
 #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;

src/GraphLoop/graph_loops_base.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/LoopAnalyzer/allocations_prepoc.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/LoopAnalyzer/dep_analyzer.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/LoopAnalyzer/loop_analyzer.cpp

@@ -18,7 +18,7 @@
 #include <tuple>
 #include <stack>
 
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #if _WIN32 && NDEBUG && __BOOST
 #include <boost/thread.hpp>
@@ -42,13 +42,13 @@ extern int passDone;
 #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"

src/LoopAnalyzer/loop_analyzer.h

@@ -6,7 +6,7 @@
 #include <vector>
 #include <set>
 #include "../GraphLoop/graph_loops.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../SageAnalysisTool/depInterfaceExt.h"
 #include "../Utils/AstWrapper.h"

src/ParallelizationRegions/ParRegions.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +15,7 @@
 #include "../GraphCall/graph_calls_func.h"
 #include "../GraphLoop/graph_loops.h"
 #include "../Distribution/Distribution.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 
 using std::vector;
 using std::string;

src/ParallelizationRegions/ParRegions_func.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ParRegions.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphLoop/graph_loops.h"
 
 void fillRegionLines(SgFile *file, std::vector<ParallelRegion*> &regions, std::vector<Messages>& messagesForFile, std::vector<LoopGraph*> *loops = NULL, std::vector<FuncInfo*> *funcs = NULL);

src/ParallelizationRegions/expand_extract_reg.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <map>
 #include <string>

src/ParallelizationRegions/resolve_par_reg_conflicts.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <string>
 #include <vector>
@@ -17,8 +17,8 @@
 #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 "expr_transform.h"
+#include "../Transformations/FunctionPurifying/function_purifying.h"
 
 using std::map;
 using std::pair;

src/ParallelizationRegions/resolve_par_reg_conflicts.h

@@ -3,7 +3,7 @@
 #include "ParRegions.h"
 #include "../Utils/SgUtils.h"
 #include "../Utils/errors.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 
 void fillRegionIntervals(std::vector<ParallelRegion*> &regions);
 void fillRegionArrays(std::vector<ParallelRegion*> &regions, const std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo, const std::map<std::string, CommonBlock*> &commonBlocks);

src/Predictor/PredictScheme.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -20,7 +20,7 @@
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../Distribution/DvmhDirective.h"
 #include "../GraphLoop/graph_loops_func.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "../CFGraph/CFGraph.h"
 

src/Predictor/PredictScheme.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 #include "dvm.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../Utils/json.hpp"
 
 class ParallelStats

src/PrivateAnalyzer/private_analyzer.cpp

@@ -1,5 +1,5 @@
 #define _LEAK_
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>
@@ -9,7 +9,7 @@
 #include <vector>
 #include <fstream>
 
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "private_analyzer.h"
 #include "dvm.h"
 #include "../CFGraph/CFGraph.h"

src/PrivateAnalyzer/private_analyzer.h

@@ -3,7 +3,7 @@
 #include <vector>
 
 #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<FuncInfo*> &funcs);

src/ProjectManipulation/ConvertFiles.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/ProjectManipulation/FileInfo.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/ProjectManipulation/ParseFiles.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/ProjectManipulation/PerfAnalyzer.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/ProjectParameters/projectParameters.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>
@@ -14,7 +14,7 @@
 #include "dvm.h"
 #include "../Utils/errors.h"
 #include "../Utils/SgUtils.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
 
 #include "projectParameters.h"

src/SageAnalysisTool/defUse.cpp

@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../Utils/errors.h"
 #include "../Utils/utils.h"
 #include "sage++user.h"

src/SageAnalysisTool/depGraph.cpp

@@ -15,7 +15,7 @@ extern "C" void removeFromCollection(void *pointer);
 #endif
 extern int passDone;
 
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../Utils/errors.h"
 #include "../VisualizerCalls/get_information.h"
 

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"
@@ -56,7 +54,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"
@@ -72,25 +70,27 @@
 #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 "Transformations/SwapOperators/swap_operators.h"
 
-#include "RenameSymbols/rename_symbols.h"
 #include "ProjectParameters/projectParameters.h"
 
 #include "CFGraph/IR.h"
@@ -100,8 +100,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"

src/Transformations/CheckPoints/checkpoints.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <vector>
 #include <string>
@@ -6,7 +6,7 @@
 
 #include "../Utils/SgUtils.h"
 #include "../Utils/utils.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 
 #include "checkpoints.h"
 

src/Transformations/ConvertToC/convert_to_c.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>

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"

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 <boost/thread.hpp>
@@ -20,7 +20,7 @@ extern int passDone;
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../ParallelizationRegions/ParRegions_func.h"
 #include "../GraphLoop/graph_loops.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
 #include "../Utils/utils.h"
 #include "../Utils/SgUtils.h"

src/Transformations/ExpressionSubstitution/expr_transform.h

@@ -7,7 +7,7 @@
 #include "../Distribution/Distribution.h"
 #include "../GraphLoop/graph_loops.h"
 #include "../ParallelizationRegions/ParRegions.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../Utils/SgUtils.h"
 
 #include "acc_analyzer.h"

src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>
@@ -16,9 +16,9 @@
 #include "../Utils/SgUtils.h"
 
 #include "uniq_call_chain_dup.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../VerificationCode/verifications.h"
 
 using namespace std;

src/Transformations/FunctionDuplication/uniq_call_chain_dup.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include <map>
 #include <string>
 #include <vector>

src/Transformations/FunctionInlining/inliner.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -14,7 +14,7 @@
 #include "../GraphCall/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;

src/Transformations/FunctionPurifying/function_purifying.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -15,7 +15,7 @@
 #include "../Utils/SgUtils.h"
 #include "../Utils/CommonBlock.h"
 #include "../Utils/DefUseList.h"
-#include "ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../VerificationCode/verifications.h"
 #include "../DvmhRegions/DvmhRegionInserter.h"
 #include "function_purifying.h"

src/Transformations/GlobalVariables/fix_common_blocks.h

@@ -11,7 +11,7 @@
 #include "../Utils/SgUtils.h"
 
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 
 
 struct DeclInfo // for error messages

src/Transformations/LoopCombining/loops_combiner.cpp

@@ -1,7 +1,7 @@
 #include "loops_combiner.h"
 
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../Utils/errors.h"
 #include "../Utils/SgUtils.h"
 #include <string>

src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>

src/Transformations/LoopNesting/loop_transform.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <vector>
 #include <string>

src/Transformations/LoopSplitting/loops_splitter.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../Utils/errors.h"
 #include "../CFGraph/CFGraph.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"

src/Transformations/PrivateArrayRemoving/private_removing.cpp

@@ -3,8 +3,8 @@
 #include "../Utils/errors.h"
 #include "../Utils/SgUtils.h"
 #include "../Utils/utils.h"
-#include "../ExpressionTransform/expr_transform.h"
-#include "dead_code.h"
+#include "expr_transform.h"
+#include "../DeadCodeRemoving/dead_code.h"
 
 using std::make_pair;
 using std::map;

src/Transformations/RenameSymbols/rename_symbols.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Utils/SgUtils.h"
-#include "RenameSymbols/rename_symbols.h"
+#include "rename_symbols.h"
 
 using std::vector;
 using std::map;

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 <string>
 #include <map>
 #include <set>
-#include <ExpressionTransform/expr_transform.h>
+
+#include "expr_transform.h"
+#include "../ParallelizationRegions/resolve_par_reg_conflicts.h"
 
 using std::map;
 using std::set;

src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h

@@ -3,7 +3,7 @@
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../Utils/SgUtils.h"
 #include "../Utils/errors.h"
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 
 void replaceDistributedArraysInIO(std::vector<ParallelRegion*>& regions, 
                                   const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, 

src/Transformations/SetImplicitNone/set_implicit_none.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <string>
 #include <map>

src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>
@@ -14,7 +14,7 @@
 #include "../ParallelizationRegions/ParRegions.h"
 #include "array_assign_to_loop.h"
 #include "../Utils/SgUtils.h"
-#include "../ExpressionTransform/expr_transform.h"
+#include "expr_transform.h"
 #include "../GraphCall/graph_calls_func.h"
 #include "../VerificationCode/verifications.h"
 

src/Utils/SgUtils.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -37,7 +37,7 @@
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../Distribution/Distribution.h"
 
-#include "../GraphCall/graph_calls.h"
+#include "graph_calls.h"
 #include "../GraphCall/graph_calls_func.h"
 #include "../CreateInterTree/CreateInterTree.h"
 #include "../Predictor/PredictScheme.h"

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"
 

src/Utils/utils.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstdlib>

src/VerificationCode/CorrectVarDecl.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>

src/VerificationCode/IncludeChecker.cpp

@@ -1,4 +1,4 @@
-#include "../Utils/leak_detector.h"
+#include "leak_detector.h"
 
 #include <cstdio>
 #include <cstring>