From a0a401c42acba29e8c8fbcaaa7be21f011fa9578 Mon Sep 17 00:00:00 2001 From: ALEXks Date: Mon, 2 Jun 2025 19:08:09 +0300 Subject: [PATCH] refactored transformation: added folders for each transformation --- CMakeLists.txt | 107 +++++++++--------- src/CFGraph/CFGraph.cpp | 4 +- src/CFGraph/IR.cpp | 6 +- src/CFGraph/RD_subst.cpp | 4 +- src/CFGraph/RD_subst.h | 2 +- .../directive_analyzer.cpp | 2 +- src/DirectiveProcessing/directive_creator.cpp | 6 +- .../directive_creator_base.cpp | 4 +- .../directive_omp_parser.cpp | 2 +- src/DirectiveProcessing/directive_parser.cpp | 2 +- src/DirectiveProcessing/insert_directive.cpp | 2 +- src/DirectiveProcessing/remote_access.cpp | 4 +- .../remote_access_base.cpp | 4 +- src/DirectiveProcessing/shadow.cpp | 6 +- .../spf_directive_preproc.cpp | 4 +- src/Distribution/Array.cpp | 2 +- src/Distribution/ArrayAnalysis.cpp | 2 +- src/Distribution/CreateDistributionDirs.cpp | 2 +- src/Distribution/Cycle.cpp | 2 +- src/Distribution/Distribution.cpp | 2 +- src/Distribution/DvmhDirective.cpp | 2 +- src/Distribution/DvmhDirectiveBase.cpp | 2 +- src/Distribution/GraphCSR.cpp | 2 +- src/DvmhRegions/DvmhRegionInserter.cpp | 2 +- src/DvmhRegions/DvmhRegionInserter.h | 2 +- src/DynamicAnalysis/createParallelRegions.cpp | 4 +- src/DynamicAnalysis/createParallelRegions.h | 2 +- src/DynamicAnalysis/gCov_parser.cpp | 2 +- src/DynamicAnalysis/gcov_info.cpp | 2 +- src/GraphCall/graph_calls.cpp | 4 +- src/GraphCall/graph_calls_base.cpp | 2 +- src/GraphLoop/graph_loops.cpp | 6 +- src/GraphLoop/graph_loops_base.cpp | 2 +- src/LoopAnalyzer/allocations_prepoc.cpp | 2 +- src/LoopAnalyzer/dep_analyzer.cpp | 2 +- src/LoopAnalyzer/loop_analyzer.cpp | 6 +- src/LoopAnalyzer/loop_analyzer.h | 2 +- src/ParallelizationRegions/ParRegions.cpp | 4 +- src/ParallelizationRegions/ParRegions_func.h | 2 +- .../expand_extract_reg.cpp | 2 +- .../resolve_par_reg_conflicts.cpp | 6 +- .../resolve_par_reg_conflicts.h | 2 +- src/Predictor/PredictScheme.cpp | 4 +- src/Predictor/PredictScheme.h | 2 +- src/PrivateAnalyzer/private_analyzer.cpp | 4 +- src/PrivateAnalyzer/private_analyzer.h | 2 +- src/ProjectManipulation/ConvertFiles.cpp | 2 +- src/ProjectManipulation/FileInfo.cpp | 2 +- src/ProjectManipulation/ParseFiles.cpp | 2 +- src/ProjectManipulation/PerfAnalyzer.cpp | 2 +- src/ProjectParameters/projectParameters.cpp | 4 +- src/SageAnalysisTool/defUse.cpp | 2 +- src/SageAnalysisTool/depGraph.cpp | 2 +- src/Sapfor.cpp | 42 ++++--- .../swap_array_dims.cpp | 0 .../{ => ArrayDimsSwapping}/swap_array_dims.h | 0 .../{ => CheckPoints}/checkpoints.cpp | 4 +- .../{ => CheckPoints}/checkpoints.h | 0 .../{ => ConvertToC}/convert_to_c.cpp | 2 +- .../{ => ConvertToC}/convert_to_c.h | 0 .../{ => DeadCodeRemoving}/dead_code.cpp | 0 .../{ => DeadCodeRemoving}/dead_code.h | 0 .../control_flow_graph_part.cpp | 2 +- .../expr_transform.cpp | 4 +- .../ExpressionSubstitution}/expr_transform.h | 2 +- .../uniq_call_chain_dup.cpp | 6 +- .../uniq_call_chain_dup.h | 2 +- .../FunctionInlining}/inliner.cpp | 4 +- .../FunctionInlining}/inliner.h | 0 .../function_purifying.cpp | 4 +- .../function_purifying.h | 0 .../fix_common_blocks.cpp | 0 .../{ => GlobalVariables}/fix_common_blocks.h | 2 +- .../{ => LoopCombining}/loops_combiner.cpp | 2 +- .../{ => LoopCombining}/loops_combiner.h | 0 .../enddo_loop_converter.cpp | 2 +- .../enddo_loop_converter.h | 0 .../{ => LoopNesting}/loop_transform.cpp | 2 +- .../{ => LoopNesting}/loop_transform.h | 0 .../{ => LoopSplitting}/loops_splitter.cpp | 2 +- .../{ => LoopSplitting}/loops_splitter.h | 0 .../{ => LoopUnrolling}/loops_unrolling.cpp | 0 .../{ => LoopUnrolling}/loops_unrolling.h | 0 .../private_removing.cpp | 4 +- .../private_removing.h | 0 .../private_arrays_resizing.cpp | 0 .../private_arrays_resizing.h | 0 .../RenameSymbols/rename_symbols.cpp | 2 +- .../RenameSymbols/rename_symbols.h | 0 .../replace_dist_arrays_in_io.cpp | 6 +- .../replace_dist_arrays_in_io.h | 2 +- .../set_implicit_none.cpp | 2 +- .../{ => SetImplicitNone}/set_implicit_none.h | 0 .../array_assign_to_loop.cpp | 4 +- .../array_assign_to_loop.h | 0 src/Utils/SgUtils.cpp | 4 +- src/Utils/SgUtils.h | 2 +- src/Utils/utils.cpp | 2 +- src/VerificationCode/CorrectVarDecl.cpp | 2 +- src/VerificationCode/IncludeChecker.cpp | 2 +- src/VerificationCode/StructureChecker.cpp | 2 +- src/VerificationCode/VerifySageStructures.cpp | 2 +- 102 files changed, 189 insertions(+), 188 deletions(-) rename src/Transformations/{ => ArrayDimsSwapping}/swap_array_dims.cpp (100%) rename src/Transformations/{ => ArrayDimsSwapping}/swap_array_dims.h (100%) rename src/Transformations/{ => CheckPoints}/checkpoints.cpp (97%) rename src/Transformations/{ => CheckPoints}/checkpoints.h (100%) rename src/Transformations/{ => ConvertToC}/convert_to_c.cpp (96%) rename src/Transformations/{ => ConvertToC}/convert_to_c.h (100%) rename src/Transformations/{ => DeadCodeRemoving}/dead_code.cpp (100%) rename src/Transformations/{ => DeadCodeRemoving}/dead_code.h (100%) rename src/{ExpressionTransform => Transformations/ExpressionSubstitution}/control_flow_graph_part.cpp (96%) rename src/{ExpressionTransform => Transformations/ExpressionSubstitution}/expr_transform.cpp (96%) rename src/{ExpressionTransform => Transformations/ExpressionSubstitution}/expr_transform.h (96%) rename src/Transformations/{ => FunctionDuplication}/uniq_call_chain_dup.cpp (96%) rename src/Transformations/{ => FunctionDuplication}/uniq_call_chain_dup.h (89%) rename src/{Inliner => Transformations/FunctionInlining}/inliner.cpp (97%) rename src/{Inliner => Transformations/FunctionInlining}/inliner.h (100%) rename src/Transformations/{ => FunctionPurifying}/function_purifying.cpp (97%) rename src/Transformations/{ => FunctionPurifying}/function_purifying.h (100%) rename src/Transformations/{ => GlobalVariables}/fix_common_blocks.cpp (100%) rename src/Transformations/{ => GlobalVariables}/fix_common_blocks.h (93%) rename src/Transformations/{ => LoopCombining}/loops_combiner.cpp (96%) rename src/Transformations/{ => LoopCombining}/loops_combiner.h (100%) rename src/Transformations/{ => LoopEndDoConverter}/enddo_loop_converter.cpp (96%) rename src/Transformations/{ => LoopEndDoConverter}/enddo_loop_converter.h (100%) rename src/Transformations/{ => LoopNesting}/loop_transform.cpp (96%) rename src/Transformations/{ => LoopNesting}/loop_transform.h (100%) rename src/Transformations/{ => LoopSplitting}/loops_splitter.cpp (97%) rename src/Transformations/{ => LoopSplitting}/loops_splitter.h (100%) rename src/Transformations/{ => LoopUnrolling}/loops_unrolling.cpp (100%) rename src/Transformations/{ => LoopUnrolling}/loops_unrolling.h (100%) rename src/Transformations/{ => PrivateArrayRemoving}/private_removing.cpp (97%) rename src/Transformations/{ => PrivateArrayRemoving}/private_removing.h (100%) rename src/Transformations/{ => PrivateArrayResizing}/private_arrays_resizing.cpp (100%) rename src/Transformations/{ => PrivateArrayResizing}/private_arrays_resizing.h (100%) rename src/{ => Transformations}/RenameSymbols/rename_symbols.cpp (96%) rename src/{ => Transformations}/RenameSymbols/rename_symbols.h (100%) rename src/Transformations/{ => ReplaceArraysInIO}/replace_dist_arrays_in_io.cpp (96%) rename src/Transformations/{ => ReplaceArraysInIO}/replace_dist_arrays_in_io.h (91%) rename src/Transformations/{ => SetImplicitNone}/set_implicit_none.cpp (96%) rename src/Transformations/{ => SetImplicitNone}/set_implicit_none.h (100%) rename src/Transformations/{ => VectorAssignToLoop}/array_assign_to_loop.cpp (97%) rename src/Transformations/{ => VectorAssignToLoop}/array_assign_to_loop.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 145d672..ba85c74 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,7 +221,10 @@ 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 @@ -288,10 +305,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,18 +316,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 @@ -404,12 +410,9 @@ set(SOURCE_EXE ${DISTR} ${DVMH_REG} ${DYNA} - ${EXPR_TRANSFORM} ${GR_CALL} ${GR_LOOP} - ${INLINER} ${LOOP_ANALYZER} - ${RENAME_SYMBOLS} ${TRANSFORMS} ${PARALLEL_REG} ${PRIV} @@ -433,7 +436,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}) @@ -441,13 +444,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/src/CFGraph/CFGraph.cpp b/src/CFGraph/CFGraph.cpp index 4c414d4..56af300 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 @@ -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" diff --git a/src/CFGraph/IR.cpp b/src/CFGraph/IR.cpp index a46226b..9c110f8 100644 --- a/src/CFGraph/IR.cpp +++ b/src/CFGraph/IR.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -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" diff --git a/src/CFGraph/RD_subst.cpp b/src/CFGraph/RD_subst.cpp index 948fb97..4f48deb 100644 --- a/src/CFGraph/RD_subst.cpp +++ b/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 diff --git a/src/CFGraph/RD_subst.h b/src/CFGraph/RD_subst.h index 188effb..d9e4143 100644 --- a/src/CFGraph/RD_subst.h +++ b/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" diff --git a/src/DirectiveProcessing/directive_analyzer.cpp b/src/DirectiveProcessing/directive_analyzer.cpp index afc3da8..00d7dd2 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 diff --git a/src/DirectiveProcessing/directive_creator.cpp b/src/DirectiveProcessing/directive_creator.cpp index 2bd6d86..56225e3 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 @@ -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" diff --git a/src/DirectiveProcessing/directive_creator_base.cpp b/src/DirectiveProcessing/directive_creator_base.cpp index 6a7f183..7cb2d4f 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,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" diff --git a/src/DirectiveProcessing/directive_omp_parser.cpp b/src/DirectiveProcessing/directive_omp_parser.cpp index 6654abf..3fd3a92 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 diff --git a/src/DirectiveProcessing/directive_parser.cpp b/src/DirectiveProcessing/directive_parser.cpp index ac11540..3e4b901 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 diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp index 4a8f7ed..e2d1ed2 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 diff --git a/src/DirectiveProcessing/remote_access.cpp b/src/DirectiveProcessing/remote_access.cpp index a35c844..1df252b 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 @@ -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" diff --git a/src/DirectiveProcessing/remote_access_base.cpp b/src/DirectiveProcessing/remote_access_base.cpp index c81ddbf..fe027e1 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,7 +17,7 @@ #include #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" diff --git a/src/DirectiveProcessing/shadow.cpp b/src/DirectiveProcessing/shadow.cpp index e8eb705..b0a3b92 100644 --- a/src/DirectiveProcessing/shadow.cpp +++ b/src/DirectiveProcessing/shadow.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -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" diff --git a/src/DirectiveProcessing/spf_directive_preproc.cpp b/src/DirectiveProcessing/spf_directive_preproc.cpp index da7ddee..e380df5 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 @@ -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" diff --git a/src/Distribution/Array.cpp b/src/Distribution/Array.cpp index 4149bda..c3cc653 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 "graph_calls.h" using namespace std; diff --git a/src/Distribution/ArrayAnalysis.cpp b/src/Distribution/ArrayAnalysis.cpp index c56f3a4..56527b7 100644 --- a/src/Distribution/ArrayAnalysis.cpp +++ b/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" diff --git a/src/Distribution/CreateDistributionDirs.cpp b/src/Distribution/CreateDistributionDirs.cpp index ef34757..cdb2720 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 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/Distribution.cpp b/src/Distribution/Distribution.cpp index 6f99a0c..1ec89fb 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 diff --git a/src/Distribution/DvmhDirective.cpp b/src/Distribution/DvmhDirective.cpp index 1f8f0d2..b485a6e 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 diff --git a/src/Distribution/DvmhDirectiveBase.cpp b/src/Distribution/DvmhDirectiveBase.cpp index 28576a8..0cd3f4c 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 diff --git a/src/Distribution/GraphCSR.cpp b/src/Distribution/GraphCSR.cpp index 08f712e..0a22ff9 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 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..8d34be1 100644 --- a/src/DvmhRegions/DvmhRegionInserter.h +++ b/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" 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..a75c928 100644 --- a/src/DynamicAnalysis/createParallelRegions.h +++ b/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 #include diff --git a/src/DynamicAnalysis/gCov_parser.cpp b/src/DynamicAnalysis/gCov_parser.cpp index c8db6e7..dd2cb90 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 diff --git a/src/DynamicAnalysis/gcov_info.cpp b/src/DynamicAnalysis/gcov_info.cpp index c37cf81..c34d64a 100644 --- a/src/DynamicAnalysis/gcov_info.cpp +++ b/src/DynamicAnalysis/gcov_info.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include diff --git a/src/GraphCall/graph_calls.cpp b/src/GraphCall/graph_calls.cpp index 4ce117d..530f9b1 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 @@ -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" diff --git a/src/GraphCall/graph_calls_base.cpp b/src/GraphCall/graph_calls_base.cpp index 94fdd43..44bb7d2 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 diff --git a/src/GraphLoop/graph_loops.cpp b/src/GraphLoop/graph_loops.cpp index 485fe21..ded6d93 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 @@ -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; diff --git a/src/GraphLoop/graph_loops_base.cpp b/src/GraphLoop/graph_loops_base.cpp index 98e13ca..514c4c5 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 diff --git a/src/LoopAnalyzer/allocations_prepoc.cpp b/src/LoopAnalyzer/allocations_prepoc.cpp index fdf04dc..9655798 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 diff --git a/src/LoopAnalyzer/dep_analyzer.cpp b/src/LoopAnalyzer/dep_analyzer.cpp index 67d99ed..ecf4f2a 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 diff --git a/src/LoopAnalyzer/loop_analyzer.cpp b/src/LoopAnalyzer/loop_analyzer.cpp index a544fca..b284246 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 @@ -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" diff --git a/src/LoopAnalyzer/loop_analyzer.h b/src/LoopAnalyzer/loop_analyzer.h index 5fa5f42..ececa21 100644 --- a/src/LoopAnalyzer/loop_analyzer.h +++ b/src/LoopAnalyzer/loop_analyzer.h @@ -6,7 +6,7 @@ #include #include #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" diff --git a/src/ParallelizationRegions/ParRegions.cpp b/src/ParallelizationRegions/ParRegions.cpp index f01be39..903fa5e 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 @@ -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; diff --git a/src/ParallelizationRegions/ParRegions_func.h b/src/ParallelizationRegions/ParRegions_func.h index e5d62c6..6420a37 100644 --- a/src/ParallelizationRegions/ParRegions_func.h +++ b/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 ®ions, std::vector& messagesForFile, std::vector *loops = NULL, std::vector *funcs = 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/resolve_par_reg_conflicts.cpp b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp index 277b46c..43d842f 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 @@ -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; diff --git a/src/ParallelizationRegions/resolve_par_reg_conflicts.h b/src/ParallelizationRegions/resolve_par_reg_conflicts.h index 4e5e3c4..1523306 100644 --- a/src/ParallelizationRegions/resolve_par_reg_conflicts.h +++ b/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 ®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..146427d 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 @@ -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" diff --git a/src/Predictor/PredictScheme.h b/src/Predictor/PredictScheme.h index 35ccf9e..b8fb310 100644 --- a/src/Predictor/PredictScheme.h +++ b/src/Predictor/PredictScheme.h @@ -1,7 +1,7 @@ #pragma once #include #include "dvm.h" -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include "../Utils/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/ProjectManipulation/ConvertFiles.cpp b/src/ProjectManipulation/ConvertFiles.cpp index 78610d8..1fd7715 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 diff --git a/src/ProjectManipulation/FileInfo.cpp b/src/ProjectManipulation/FileInfo.cpp index aa95940..7aa5215 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 diff --git a/src/ProjectManipulation/ParseFiles.cpp b/src/ProjectManipulation/ParseFiles.cpp index d474b85..0d1e485 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 diff --git a/src/ProjectManipulation/PerfAnalyzer.cpp b/src/ProjectManipulation/PerfAnalyzer.cpp index c3ee28c..f8579d1 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 diff --git a/src/ProjectParameters/projectParameters.cpp b/src/ProjectParameters/projectParameters.cpp index fd395dc..64531b1 100644 --- a/src/ProjectParameters/projectParameters.cpp +++ b/src/ProjectParameters/projectParameters.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -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" diff --git a/src/SageAnalysisTool/defUse.cpp b/src/SageAnalysisTool/defUse.cpp index e400158..24ade01 100644 --- a/src/SageAnalysisTool/defUse.cpp +++ b/src/SageAnalysisTool/defUse.cpp @@ -4,7 +4,7 @@ #include #include -#include "../GraphCall/graph_calls.h" +#include "graph_calls.h" #include "../Utils/errors.h" #include "../Utils/utils.h" #include "sage++user.h" diff --git a/src/SageAnalysisTool/depGraph.cpp b/src/SageAnalysisTool/depGraph.cpp index a413d99..78a1e6d 100644 --- a/src/SageAnalysisTool/depGraph.cpp +++ b/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" diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp index 9f5ac64..9fd4793 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" @@ -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,24 +70,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" @@ -99,8 +99,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" diff --git a/src/Transformations/swap_array_dims.cpp b/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp similarity index 100% rename from src/Transformations/swap_array_dims.cpp rename to src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp 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..2549f6c 100644 --- a/src/Transformations/checkpoints.cpp +++ b/src/Transformations/CheckPoints/checkpoints.cpp @@ -1,4 +1,4 @@ -#include "../Utils/leak_detector.h" +#include "leak_detector.h" #include #include @@ -6,7 +6,7 @@ #include "../Utils/SgUtils.h" #include "../Utils/utils.h" -#include "../ExpressionTransform/expr_transform.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 100% rename from src/Transformations/dead_code.h rename to src/Transformations/DeadCodeRemoving/dead_code.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..e8db58d 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 @@ -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" diff --git a/src/ExpressionTransform/expr_transform.h b/src/Transformations/ExpressionSubstitution/expr_transform.h similarity index 96% rename from src/ExpressionTransform/expr_transform.h rename to src/Transformations/ExpressionSubstitution/expr_transform.h index fd11907..c9924d5 100644 --- a/src/ExpressionTransform/expr_transform.h +++ b/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" 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..8bf71db 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 @@ -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; 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 97% rename from src/Inliner/inliner.cpp rename to src/Transformations/FunctionInlining/inliner.cpp index ad87c5a..5a00fae 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 @@ -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; 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..af93f22 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 @@ -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" 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 93% rename from src/Transformations/fix_common_blocks.h rename to src/Transformations/GlobalVariables/fix_common_blocks.h index 60b5855..8c0ff32 100644 --- a/src/Transformations/fix_common_blocks.h +++ b/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 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..81ca24c 100644 --- a/src/Transformations/loops_combiner.cpp +++ b/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 diff --git a/src/Transformations/loops_combiner.h b/src/Transformations/LoopCombining/loops_combiner.h similarity index 100% rename from src/Transformations/loops_combiner.h rename to src/Transformations/LoopCombining/loops_combiner.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..511b743 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 diff --git a/src/Transformations/enddo_loop_converter.h b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h similarity index 100% rename from src/Transformations/enddo_loop_converter.h rename to src/Transformations/LoopEndDoConverter/enddo_loop_converter.h 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..6679deb 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 diff --git a/src/Transformations/loop_transform.h b/src/Transformations/LoopNesting/loop_transform.h similarity index 100% rename from src/Transformations/loop_transform.h rename to src/Transformations/LoopNesting/loop_transform.h 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..09065d7 100644 --- a/src/Transformations/loops_splitter.cpp +++ b/src/Transformations/LoopSplitting/loops_splitter.cpp @@ -4,7 +4,7 @@ #include #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" diff --git a/src/Transformations/loops_splitter.h b/src/Transformations/LoopSplitting/loops_splitter.h similarity index 100% rename from src/Transformations/loops_splitter.h rename to src/Transformations/LoopSplitting/loops_splitter.h diff --git a/src/Transformations/loops_unrolling.cpp b/src/Transformations/LoopUnrolling/loops_unrolling.cpp similarity index 100% rename from src/Transformations/loops_unrolling.cpp rename to src/Transformations/LoopUnrolling/loops_unrolling.cpp diff --git a/src/Transformations/loops_unrolling.h b/src/Transformations/LoopUnrolling/loops_unrolling.h similarity index 100% rename from src/Transformations/loops_unrolling.h rename to src/Transformations/LoopUnrolling/loops_unrolling.h 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..5589073 100644 --- a/src/Transformations/private_removing.cpp +++ b/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; 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 100% rename from src/Transformations/private_arrays_resizing.cpp rename to src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp diff --git a/src/Transformations/private_arrays_resizing.h b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h similarity index 100% rename from src/Transformations/private_arrays_resizing.h rename to src/Transformations/PrivateArrayResizing/private_arrays_resizing.h 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 96% rename from src/Transformations/replace_dist_arrays_in_io.cpp rename to src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp index efb63e4..e9c088d 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; diff --git a/src/Transformations/replace_dist_arrays_in_io.h b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h similarity index 91% rename from src/Transformations/replace_dist_arrays_in_io.h rename to src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h index a9998ef..cd5c912 100644 --- a/src/Transformations/replace_dist_arrays_in_io.h +++ b/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& 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..20e1d37 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 @@ -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" diff --git a/src/Transformations/array_assign_to_loop.h b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h similarity index 100% rename from src/Transformations/array_assign_to_loop.h rename to src/Transformations/VectorAssignToLoop/array_assign_to_loop.h diff --git a/src/Utils/SgUtils.cpp b/src/Utils/SgUtils.cpp index 677e0a9..51b0dce 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,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" 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/utils.cpp b/src/Utils/utils.cpp index 2ee26d1..e9f8bcf 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 diff --git a/src/VerificationCode/CorrectVarDecl.cpp b/src/VerificationCode/CorrectVarDecl.cpp index 96625f0..ccae540 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 diff --git a/src/VerificationCode/IncludeChecker.cpp b/src/VerificationCode/IncludeChecker.cpp index 15fe93e..04ad02f 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 diff --git a/src/VerificationCode/StructureChecker.cpp b/src/VerificationCode/StructureChecker.cpp index 407510b..1eb17b4 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 diff --git a/src/VerificationCode/VerifySageStructures.cpp b/src/VerificationCode/VerifySageStructures.cpp index 0c8da72..1056bcc 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