From fca4f632e470975b66da331dd70de905e56f4907 Mon Sep 17 00:00:00 2001 From: ALEXks Date: Wed, 4 Jun 2025 13:08:38 +0300 Subject: [PATCH] refactoring: removed unnecessary --- src/CFGraph/CFGraph.cpp | 4 ++-- src/CFGraph/DataFlow/backward_data_flow.h | 2 +- src/CFGraph/DataFlow/backward_data_flow_impl.h | 2 +- src/CFGraph/DataFlow/data_flow.h | 2 +- src/CFGraph/DataFlow/data_flow_impl.h | 2 +- src/CFGraph/IR.cpp | 4 ++-- src/CFGraph/IR.h | 2 +- src/CFGraph/RD_subst.cpp | 4 ++-- src/CFGraph/RD_subst.h | 4 ++-- src/CFGraph/live_variable_analysis.h | 2 +- src/CFGraph/private_variables_analysis.cpp | 4 ++-- src/CFGraph/private_variables_analysis.h | 4 ++-- src/CreateInterTree/CreateInterTree.cpp | 6 +++--- src/CreateInterTree/CreateInterTree.h | 2 +- src/DirectiveProcessing/directive_analyzer.cpp | 4 ++-- src/DirectiveProcessing/directive_analyzer.h | 2 +- src/DirectiveProcessing/directive_creator.cpp | 10 +++++----- src/DirectiveProcessing/directive_creator.h | 6 +++--- src/DirectiveProcessing/directive_creator_base.cpp | 2 +- src/DirectiveProcessing/directive_omp_parser.cpp | 2 +- src/DirectiveProcessing/directive_omp_parser.h | 2 +- src/DirectiveProcessing/directive_parser.cpp | 6 +++--- src/DirectiveProcessing/directive_parser.h | 4 ++-- src/DirectiveProcessing/insert_directive.cpp | 8 ++++---- src/DirectiveProcessing/remote_access.cpp | 10 +++++----- src/DirectiveProcessing/remote_access_base.cpp | 2 +- src/DirectiveProcessing/shadow.cpp | 10 +++++----- src/DirectiveProcessing/spf_directive_preproc.cpp | 8 ++++---- src/Distribution/Array.cpp | 4 ++-- src/Distribution/Array.h | 6 +++--- src/Distribution/ArrayAnalysis.cpp | 6 +++--- src/Distribution/CreateDistributionDirs.cpp | 6 +++--- src/Distribution/CreateDistributionDirs.h | 4 ++-- src/Distribution/Cycle.h | 2 +- src/Distribution/Distribution.cpp | 6 +++--- src/Distribution/DvmhDirective.cpp | 8 ++++---- src/Distribution/DvmhDirective.h | 6 +++--- src/Distribution/DvmhDirectiveBase.cpp | 8 ++++---- src/Distribution/DvmhDirectiveBase.h | 2 +- src/Distribution/DvmhDirective_func.h | 2 +- src/Distribution/GraphCSR.cpp | 4 ++-- src/Distribution/GraphCSR.h | 2 +- src/DvmhRegions/DvmhRegion.h | 2 +- src/DvmhRegions/DvmhRegionInserter.h | 6 +++--- src/DvmhRegions/LoopChecker.h | 4 ++-- src/DvmhRegions/ReadWriteAnalyzer.h | 2 +- src/DvmhRegions/TypedSymbol.h | 2 +- src/DynamicAnalysis/createParallelRegions.h | 2 +- src/DynamicAnalysis/gCov_parser.cpp | 2 +- src/DynamicAnalysis/gCov_parser_func.h | 2 +- src/DynamicAnalysis/gcov_info.cpp | 2 +- src/DynamicAnalysis/gcov_info.h | 2 +- src/GraphCall/graph_calls.cpp | 6 +++--- src/GraphCall/graph_calls.h | 6 +++--- src/GraphCall/graph_calls_base.cpp | 4 ++-- src/GraphCall/graph_calls_func.h | 2 +- src/GraphLoop/graph_loops.cpp | 12 ++++++------ src/GraphLoop/graph_loops.h | 4 ++-- src/GraphLoop/graph_loops_base.cpp | 4 ++-- src/LoopAnalyzer/allocations_prepoc.cpp | 4 ++-- src/LoopAnalyzer/dep_analyzer.cpp | 4 ++-- src/LoopAnalyzer/loop_analyzer.cpp | 10 +++++----- src/LoopAnalyzer/loop_analyzer.h | 6 +++--- src/ParallelizationRegions/ParRegions.cpp | 8 ++++---- src/ParallelizationRegions/ParRegions.h | 6 +++--- src/ParallelizationRegions/ParRegions_func.h | 2 +- src/ParallelizationRegions/expand_extract_reg.h | 4 ++-- .../resolve_par_reg_conflicts.cpp | 6 +++--- .../resolve_par_reg_conflicts.h | 4 ++-- src/Predictor/PredictScheme.cpp | 4 ++-- src/Predictor/PredictScheme.h | 2 +- src/PrivateAnalyzer/private_arrays_search.cpp | 4 ++-- src/PrivateAnalyzer/private_arrays_search.h | 2 +- src/PrivateAnalyzer/region.cpp | 2 +- src/PrivateAnalyzer/region.h | 2 +- src/ProjectManipulation/ConvertFiles.cpp | 6 +++--- src/ProjectManipulation/FileInfo.cpp | 4 ++-- src/ProjectManipulation/ParseFiles.cpp | 4 ++-- src/ProjectManipulation/PerfAnalyzer.cpp | 4 ++-- src/ProjectParameters/projectParameters.cpp | 6 +++--- src/SageAnalysisTool/defUse.cpp | 4 ++-- src/SageAnalysisTool/depGraph.cpp | 2 +- .../ArrayDimsSwapping/swap_array_dims.cpp | 6 +++--- src/Transformations/CheckPoints/checkpoints.cpp | 4 ++-- src/Transformations/DeadCodeRemoving/dead_code.h | 2 +- .../ExpressionSubstitution/expr_transform.cpp | 8 ++++---- .../ExpressionSubstitution/expr_transform.h | 4 ++-- .../FunctionDuplication/uniq_call_chain_dup.cpp | 6 +++--- src/Transformations/FunctionInlining/inliner.cpp | 8 ++++---- .../FunctionPurifying/function_purifying.cpp | 8 ++++---- .../GlobalVariables/fix_common_blocks.h | 2 +- src/Transformations/LoopCombining/loops_combiner.cpp | 4 ++-- src/Transformations/LoopCombining/loops_combiner.h | 2 +- .../LoopEndDoConverter/enddo_loop_converter.cpp | 6 +++--- .../LoopEndDoConverter/enddo_loop_converter.h | 2 +- src/Transformations/LoopNesting/loop_transform.cpp | 4 ++-- src/Transformations/LoopNesting/loop_transform.h | 2 +- src/Transformations/LoopSplitting/loops_splitter.cpp | 2 +- src/Transformations/LoopSplitting/loops_splitter.h | 4 ++-- .../LoopUnrolling/loops_unrolling.cpp | 4 ++-- src/Transformations/LoopUnrolling/loops_unrolling.h | 2 +- .../PrivateArrayRemoving/private_removing.cpp | 6 +++--- .../PrivateArrayResizing/private_arrays_resizing.cpp | 8 ++++---- .../PrivateArrayResizing/private_arrays_resizing.h | 2 +- .../ReplaceArraysInIO/replace_dist_arrays_in_io.h | 4 ++-- .../VectorAssignToLoop/array_assign_to_loop.cpp | 4 ++-- .../VectorAssignToLoop/array_assign_to_loop.h | 2 +- src/Utils/SgUtils.cpp | 2 +- src/Utils/module_utils.cpp | 2 +- src/Utils/utils.cpp | 2 +- src/VerificationCode/CorrectVarDecl.cpp | 4 ++-- src/VerificationCode/IncludeChecker.cpp | 6 +++--- src/VerificationCode/StructureChecker.cpp | 6 +++--- src/VerificationCode/VerifySageStructures.cpp | 4 ++-- src/VerificationCode/verifications.h | 4 ++-- src/VisualizerCalls/BuildGraph.cpp | 2 +- src/VisualizerCalls/SendMessage.cpp | 2 +- src/VisualizerCalls/get_information.cpp | 10 +++++----- 118 files changed, 250 insertions(+), 250 deletions(-) diff --git a/src/CFGraph/CFGraph.cpp b/src/CFGraph/CFGraph.cpp index 56af300..a529705 100644 --- a/src/CFGraph/CFGraph.cpp +++ b/src/CFGraph/CFGraph.cpp @@ -8,8 +8,8 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" +#include "SgUtils.h" +#include "CommonBlock.h" #include "graph_calls.h" #include "dvm.h" diff --git a/src/CFGraph/DataFlow/backward_data_flow.h b/src/CFGraph/DataFlow/backward_data_flow.h index 556af90..bdccf02 100644 --- a/src/CFGraph/DataFlow/backward_data_flow.h +++ b/src/CFGraph/DataFlow/backward_data_flow.h @@ -5,7 +5,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/DataFlow/backward_data_flow_impl.h b/src/CFGraph/DataFlow/backward_data_flow_impl.h index 4578e7b..ae52690 100644 --- a/src/CFGraph/DataFlow/backward_data_flow_impl.h +++ b/src/CFGraph/DataFlow/backward_data_flow_impl.h @@ -5,7 +5,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" #include "../RD_subst.h" diff --git a/src/CFGraph/DataFlow/data_flow.h b/src/CFGraph/DataFlow/data_flow.h index d58755f..d4b6b3b 100644 --- a/src/CFGraph/DataFlow/data_flow.h +++ b/src/CFGraph/DataFlow/data_flow.h @@ -2,7 +2,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/DataFlow/data_flow_impl.h b/src/CFGraph/DataFlow/data_flow_impl.h index c6a88f6..5a414eb 100644 --- a/src/CFGraph/DataFlow/data_flow_impl.h +++ b/src/CFGraph/DataFlow/data_flow_impl.h @@ -4,7 +4,7 @@ #include #include -#include "../../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph.h" #include "../IR.h" diff --git a/src/CFGraph/IR.cpp b/src/CFGraph/IR.cpp index 9c110f8..cd2d0ae 100644 --- a/src/CFGraph/IR.cpp +++ b/src/CFGraph/IR.cpp @@ -5,8 +5,8 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" +#include "SgUtils.h" +#include "CommonBlock.h" #include "graph_calls.h" #include "expr_transform.h" diff --git a/src/CFGraph/IR.h b/src/CFGraph/IR.h index a887a39..97998ac 100644 --- a/src/CFGraph/IR.h +++ b/src/CFGraph/IR.h @@ -6,7 +6,7 @@ #include #include "CFGraph.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" namespace SAPFOR { diff --git a/src/CFGraph/RD_subst.cpp b/src/CFGraph/RD_subst.cpp index 4f48deb..ac6f00a 100644 --- a/src/CFGraph/RD_subst.cpp +++ b/src/CFGraph/RD_subst.cpp @@ -8,8 +8,8 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" +#include "SgUtils.h" +#include "CommonBlock.h" #include "graph_calls.h" #include "expr_transform.h" diff --git a/src/CFGraph/RD_subst.h b/src/CFGraph/RD_subst.h index d9e4143..e51c51b 100644 --- a/src/CFGraph/RD_subst.h +++ b/src/CFGraph/RD_subst.h @@ -2,8 +2,8 @@ #include -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" +#include "SgUtils.h" +#include "CommonBlock.h" #include "graph_calls.h" #include "CFGraph.h" diff --git a/src/CFGraph/live_variable_analysis.h b/src/CFGraph/live_variable_analysis.h index 9b92523..b5c2d17 100644 --- a/src/CFGraph/live_variable_analysis.h +++ b/src/CFGraph/live_variable_analysis.h @@ -1,6 +1,6 @@ #pragma once -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "CFGraph.h" namespace LIVE_VARIABLES diff --git a/src/CFGraph/private_variables_analysis.cpp b/src/CFGraph/private_variables_analysis.cpp index 72f5fc9..1a5b24a 100644 --- a/src/CFGraph/private_variables_analysis.cpp +++ b/src/CFGraph/private_variables_analysis.cpp @@ -1,6 +1,6 @@ -#include "../Utils/errors.h" +#include "errors.h" #include "private_variables_analysis.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../SageAnalysisTool/depGraph.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/CFGraph/private_variables_analysis.h b/src/CFGraph/private_variables_analysis.h index 649b5cf..59bbb7d 100644 --- a/src/CFGraph/private_variables_analysis.h +++ b/src/CFGraph/private_variables_analysis.h @@ -1,5 +1,5 @@ -#include "../Utils/SgUtils.h" -#include "../GraphLoop/graph_loops.h" +#include "SgUtils.h" +#include "graph_loops.h" #include "CFGraph.h" #include diff --git a/src/CreateInterTree/CreateInterTree.cpp b/src/CreateInterTree/CreateInterTree.cpp index 2699766..c48a111 100644 --- a/src/CreateInterTree/CreateInterTree.cpp +++ b/src/CreateInterTree/CreateInterTree.cpp @@ -1,7 +1,7 @@ #include "CreateInterTree.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../GraphCall/graph_calls_func.h" +#include "SgUtils.h" +#include "utils.h" +#include "graph_calls_func.h" using std::string; using std::wstring; diff --git a/src/CreateInterTree/CreateInterTree.h b/src/CreateInterTree/CreateInterTree.h index d6147a3..74f87db 100644 --- a/src/CreateInterTree/CreateInterTree.h +++ b/src/CreateInterTree/CreateInterTree.h @@ -8,7 +8,7 @@ #include "dvm.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" struct SpfInterval { diff --git a/src/DirectiveProcessing/directive_analyzer.cpp b/src/DirectiveProcessing/directive_analyzer.cpp index 00d7dd2..198b86a 100644 --- a/src/DirectiveProcessing/directive_analyzer.cpp +++ b/src/DirectiveProcessing/directive_analyzer.cpp @@ -16,9 +16,9 @@ #include #include "../Distribution/DvmhDirective.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "directive_analyzer.h" -#include "../Utils/utils.h" +#include "utils.h" using std::vector; using std::map; diff --git a/src/DirectiveProcessing/directive_analyzer.h b/src/DirectiveProcessing/directive_analyzer.h index 28892b2..bec85df 100644 --- a/src/DirectiveProcessing/directive_analyzer.h +++ b/src/DirectiveProcessing/directive_analyzer.h @@ -1,6 +1,6 @@ #pragma once #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" void UniteNestedDirectives(std::vector &loopGraph); diff --git a/src/DirectiveProcessing/directive_creator.cpp b/src/DirectiveProcessing/directive_creator.cpp index 56225e3..1601d27 100644 --- a/src/DirectiveProcessing/directive_creator.cpp +++ b/src/DirectiveProcessing/directive_creator.cpp @@ -15,18 +15,18 @@ #include "../Distribution/Distribution.h" #include "../Distribution/DvmhDirective_func.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "directive_parser.h" #include "directive_creator.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include "../Transformations/LoopNesting/loop_transform.h" #include "expr_transform.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" -#include "../Utils/AstWrapper.h" +#include "AstWrapper.h" #define PRINT_DIR_RESULT 0 diff --git a/src/DirectiveProcessing/directive_creator.h b/src/DirectiveProcessing/directive_creator.h index c2f24cd..5b20b8b 100644 --- a/src/DirectiveProcessing/directive_creator.h +++ b/src/DirectiveProcessing/directive_creator.h @@ -1,9 +1,9 @@ #pragma once #include "../Distribution/Distribution.h" -#include "../Utils/errors.h" -#include "../GraphLoop/graph_loops.h" -#include "../Utils/types.h" +#include "errors.h" +#include "graph_loops.h" +#include "types.h" void createParallelDirectives(const std::map> &loopInfo, const std::vector& regions, diff --git a/src/DirectiveProcessing/directive_creator_base.cpp b/src/DirectiveProcessing/directive_creator_base.cpp index 7cb2d4f..7cdb252 100644 --- a/src/DirectiveProcessing/directive_creator_base.cpp +++ b/src/DirectiveProcessing/directive_creator_base.cpp @@ -12,7 +12,7 @@ #include "../Distribution/Arrays.h" #include "../Transformations/LoopNesting/loop_transform.h" -#include "../Utils/errors.h" +#include "errors.h" #include "directive_parser.h" #include "directive_creator.h" diff --git a/src/DirectiveProcessing/directive_omp_parser.cpp b/src/DirectiveProcessing/directive_omp_parser.cpp index 3fd3a92..b54fa3f 100644 --- a/src/DirectiveProcessing/directive_omp_parser.cpp +++ b/src/DirectiveProcessing/directive_omp_parser.cpp @@ -9,7 +9,7 @@ #include "directive_omp_parser.h" #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" using std::vector; using std::map; diff --git a/src/DirectiveProcessing/directive_omp_parser.h b/src/DirectiveProcessing/directive_omp_parser.h index 8895289..a34adea 100644 --- a/src/DirectiveProcessing/directive_omp_parser.h +++ b/src/DirectiveProcessing/directive_omp_parser.h @@ -4,7 +4,7 @@ #include #include -#include "../Utils/errors.h" +#include "errors.h" #define SPF_USER_DIR 777 #define SPF_USER_DIR_COPY 999 diff --git a/src/DirectiveProcessing/directive_parser.cpp b/src/DirectiveProcessing/directive_parser.cpp index 3e4b901..e653f26 100644 --- a/src/DirectiveProcessing/directive_parser.cpp +++ b/src/DirectiveProcessing/directive_parser.cpp @@ -12,10 +12,10 @@ #include #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/errors.h" +#include "AstWrapper.h" +#include "errors.h" using std::string; using std::vector; diff --git a/src/DirectiveProcessing/directive_parser.h b/src/DirectiveProcessing/directive_parser.h index 4f6bd3c..f632940 100644 --- a/src/DirectiveProcessing/directive_parser.h +++ b/src/DirectiveProcessing/directive_parser.h @@ -4,8 +4,8 @@ #include #include -#include "../Utils/AstWrapper.h" -#include "../GraphLoop/graph_loops.h" +#include "AstWrapper.h" +#include "graph_loops.h" #include "../Distribution/DvmhDirective.h" struct DvmDirective diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp index e2d1ed2..c927150 100644 --- a/src/DirectiveProcessing/insert_directive.cpp +++ b/src/DirectiveProcessing/insert_directive.cpp @@ -16,13 +16,13 @@ #include "../Distribution/Arrays.h" #include "../Distribution/Distribution.h" #include "../Distribution/DvmhDirective_func.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "directive_parser.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../Sapfor.h" #include "directive_creator.h" #include "insert_directive.h" diff --git a/src/DirectiveProcessing/remote_access.cpp b/src/DirectiveProcessing/remote_access.cpp index 1df252b..0323cf1 100644 --- a/src/DirectiveProcessing/remote_access.cpp +++ b/src/DirectiveProcessing/remote_access.cpp @@ -18,13 +18,13 @@ #include "dvm.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/types.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "types.h" +#include "errors.h" +#include "SgUtils.h" #include "../Distribution/Arrays.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "remote_access.h" using std::vector; diff --git a/src/DirectiveProcessing/remote_access_base.cpp b/src/DirectiveProcessing/remote_access_base.cpp index fe027e1..9f2bb39 100644 --- a/src/DirectiveProcessing/remote_access_base.cpp +++ b/src/DirectiveProcessing/remote_access_base.cpp @@ -18,7 +18,7 @@ #include "../Distribution/Arrays.h" #include "graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" #include "remote_access.h" diff --git a/src/DirectiveProcessing/shadow.cpp b/src/DirectiveProcessing/shadow.cpp index b0a3b92..ce190ab 100644 --- a/src/DirectiveProcessing/shadow.cpp +++ b/src/DirectiveProcessing/shadow.cpp @@ -5,14 +5,14 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphLoop/graph_loops_func.h" +#include "errors.h" +#include "utils.h" +#include "graph_loops_func.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "directive_parser.h" #include "../Distribution/DvmhDirective_func.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "expr_transform.h" #include "../CFGraph/CFGraph.h" diff --git a/src/DirectiveProcessing/spf_directive_preproc.cpp b/src/DirectiveProcessing/spf_directive_preproc.cpp index e380df5..6039de6 100644 --- a/src/DirectiveProcessing/spf_directive_preproc.cpp +++ b/src/DirectiveProcessing/spf_directive_preproc.cpp @@ -12,11 +12,11 @@ #include "dvm.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops.h" +#include "graph_calls_func.h" #include "../SageAnalysisTool/depInterfaceExt.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" #include "directive_parser.h" #include "expr_transform.h" #include "../LoopAnalyzer/loop_analyzer.h" diff --git a/src/Distribution/Array.cpp b/src/Distribution/Array.cpp index c3cc653..8f0cf0c 100644 --- a/src/Distribution/Array.cpp +++ b/src/Distribution/Array.cpp @@ -1,6 +1,6 @@ #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "utils.h" #include "graph_calls.h" using namespace std; diff --git a/src/Distribution/Array.h b/src/Distribution/Array.h index 74a8a08..2092451 100644 --- a/src/Distribution/Array.h +++ b/src/Distribution/Array.h @@ -7,9 +7,9 @@ #include #include #include "DvmhDirectiveBase.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" -#include "../Utils/json.hpp" +#include "utils.h" +#include "errors.h" +#include "json.hpp" class Symbol; class Expression; diff --git a/src/Distribution/ArrayAnalysis.cpp b/src/Distribution/ArrayAnalysis.cpp index 56527b7..57ac0d9 100644 --- a/src/Distribution/ArrayAnalysis.cpp +++ b/src/Distribution/ArrayAnalysis.cpp @@ -1,8 +1,8 @@ #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "utils.h" #include "graph_calls.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../DirectiveProcessing/directive_parser.h" #include "../DirectiveProcessing/directive_omp_parser.h" #include "../LoopAnalyzer/loop_analyzer.h" diff --git a/src/Distribution/CreateDistributionDirs.cpp b/src/Distribution/CreateDistributionDirs.cpp index cdb2720..4ec1342 100644 --- a/src/Distribution/CreateDistributionDirs.cpp +++ b/src/Distribution/CreateDistributionDirs.cpp @@ -14,9 +14,9 @@ #include "GraphCSR.h" #include "Arrays.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../GraphLoop/graph_loops.h" +#include "errors.h" +#include "utils.h" +#include "graph_loops.h" using std::vector; using std::set; diff --git a/src/Distribution/CreateDistributionDirs.h b/src/Distribution/CreateDistributionDirs.h index 55c3bee..44eb45d 100644 --- a/src/Distribution/CreateDistributionDirs.h +++ b/src/Distribution/CreateDistributionDirs.h @@ -1,7 +1,7 @@ #pragma once -#include "../GraphLoop/graph_loops.h" -#include "../Utils/errors.h" +#include "graph_loops.h" +#include "errors.h" void createDistributionDirs(DIST::GraphCSR &reducedG, DIST::Arrays &allArrays, DataDirective &dataDirectives, std::map> &allMessages, diff --git a/src/Distribution/Cycle.h b/src/Distribution/Cycle.h index 622bf88..31c7fb5 100644 --- a/src/Distribution/Cycle.h +++ b/src/Distribution/Cycle.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/types.h" +#include "types.h" namespace Distribution { diff --git a/src/Distribution/Distribution.cpp b/src/Distribution/Distribution.cpp index 1ec89fb..1ff6149 100644 --- a/src/Distribution/Distribution.cpp +++ b/src/Distribution/Distribution.cpp @@ -30,9 +30,9 @@ using namespace std::chrono; #include "Arrays.h" #include "Array.h" #include "Distribution.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" -#include "../Utils/types.h" +#include "utils.h" +#include "errors.h" +#include "types.h" #include "../Distribution/Cycle.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" diff --git a/src/Distribution/DvmhDirective.cpp b/src/Distribution/DvmhDirective.cpp index b485a6e..558f4c0 100644 --- a/src/Distribution/DvmhDirective.cpp +++ b/src/Distribution/DvmhDirective.cpp @@ -7,12 +7,12 @@ #include #include -#include "../Utils/types.h" +#include "types.h" #include "DvmhDirective.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "../Sapfor.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "dvm.h" diff --git a/src/Distribution/DvmhDirective.h b/src/Distribution/DvmhDirective.h index 24c5425..0d1b7e0 100644 --- a/src/Distribution/DvmhDirective.h +++ b/src/Distribution/DvmhDirective.h @@ -7,9 +7,9 @@ #include "Array.h" #include "DvmhDirectiveBase.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/types.h" -#include "../Utils/utils.h" +#include "AstWrapper.h" +#include "types.h" +#include "utils.h" extern int sharedMemoryParallelization; diff --git a/src/Distribution/DvmhDirectiveBase.cpp b/src/Distribution/DvmhDirectiveBase.cpp index 0cd3f4c..88f2491 100644 --- a/src/Distribution/DvmhDirectiveBase.cpp +++ b/src/Distribution/DvmhDirectiveBase.cpp @@ -10,11 +10,11 @@ #include "../Distribution/Array.h" #include "../Distribution/Arrays.h" #include "../Distribution/GraphCSR.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/json.hpp" +#include "errors.h" +#include "utils.h" +#include "json.hpp" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::vector; using std::tuple; diff --git a/src/Distribution/DvmhDirectiveBase.h b/src/Distribution/DvmhDirectiveBase.h index d3c98a7..b1bfe90 100644 --- a/src/Distribution/DvmhDirectiveBase.h +++ b/src/Distribution/DvmhDirectiveBase.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/json.hpp" +#include "json.hpp" typedef enum lang : int { LANG_C, LANG_F } language; typedef enum dist : int { BLOCK, NONE } distType; diff --git a/src/Distribution/DvmhDirective_func.h b/src/Distribution/DvmhDirective_func.h index 78bf560..7d4fa13 100644 --- a/src/Distribution/DvmhDirective_func.h +++ b/src/Distribution/DvmhDirective_func.h @@ -4,7 +4,7 @@ #include #include #include "dvm.h" -#include "../Utils/types.h" +#include "types.h" SgExpression* createAndSetNext(const int side, const int variant, SgExpression *p); std::vector genSubscripts(const std::vector> &shadowRenew, const std::vector> &shadowRenewShifts); diff --git a/src/Distribution/GraphCSR.cpp b/src/Distribution/GraphCSR.cpp index 0a22ff9..1890479 100644 --- a/src/Distribution/GraphCSR.cpp +++ b/src/Distribution/GraphCSR.cpp @@ -19,8 +19,8 @@ extern int passDone; #include "Cycle.h" #include "Arrays.h" #include "Array.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "utils.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" diff --git a/src/Distribution/GraphCSR.h b/src/Distribution/GraphCSR.h index c52d665..03024de 100644 --- a/src/Distribution/GraphCSR.h +++ b/src/Distribution/GraphCSR.h @@ -5,7 +5,7 @@ #include #include -#include "../Utils/RationalNum.h" +#include "RationalNum.h" typedef enum links { RR_link, WR_link, WW_link } LinkType; diff --git a/src/DvmhRegions/DvmhRegion.h b/src/DvmhRegions/DvmhRegion.h index 10a9d34..2db6d20 100644 --- a/src/DvmhRegions/DvmhRegion.h +++ b/src/DvmhRegions/DvmhRegion.h @@ -1,6 +1,6 @@ #pragma once -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include diff --git a/src/DvmhRegions/DvmhRegionInserter.h b/src/DvmhRegions/DvmhRegionInserter.h index 8d34be1..651428d 100644 --- a/src/DvmhRegions/DvmhRegionInserter.h +++ b/src/DvmhRegions/DvmhRegionInserter.h @@ -1,10 +1,10 @@ #pragma once -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "expr_transform.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "ReadWriteAnalyzer.h" #include "DvmhRegion.h" diff --git a/src/DvmhRegions/LoopChecker.h b/src/DvmhRegions/LoopChecker.h index 793b5ed..6e2c7ae 100644 --- a/src/DvmhRegions/LoopChecker.h +++ b/src/DvmhRegions/LoopChecker.h @@ -1,7 +1,7 @@ #pragma once -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" #include #include diff --git a/src/DvmhRegions/ReadWriteAnalyzer.h b/src/DvmhRegions/ReadWriteAnalyzer.h index 8e31306..5a9d49f 100644 --- a/src/DvmhRegions/ReadWriteAnalyzer.h +++ b/src/DvmhRegions/ReadWriteAnalyzer.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "VarUsages.h" #include #include diff --git a/src/DvmhRegions/TypedSymbol.h b/src/DvmhRegions/TypedSymbol.h index 5e74310..e4b0a03 100644 --- a/src/DvmhRegions/TypedSymbol.h +++ b/src/DvmhRegions/TypedSymbol.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include enum class VAR_TYPE { VAR_ARR, VAR_DISTR_ARR, VAR_SCALAR, VAR_ANY, VAR_UNDEFINED }; diff --git a/src/DynamicAnalysis/createParallelRegions.h b/src/DynamicAnalysis/createParallelRegions.h index a75c928..ced7137 100644 --- a/src/DynamicAnalysis/createParallelRegions.h +++ b/src/DynamicAnalysis/createParallelRegions.h @@ -1,6 +1,6 @@ #pragma once -#include "../Utils/utils.h" +#include "utils.h" #include "./gcov_info.h" #include "../CreateInterTree/CreateInterTree.h" diff --git a/src/DynamicAnalysis/gCov_parser.cpp b/src/DynamicAnalysis/gCov_parser.cpp index dd2cb90..53ff70d 100644 --- a/src/DynamicAnalysis/gCov_parser.cpp +++ b/src/DynamicAnalysis/gCov_parser.cpp @@ -8,7 +8,7 @@ #include "dvm.h" #include "gCov_parser_func.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/DynamicAnalysis/gCov_parser_func.h b/src/DynamicAnalysis/gCov_parser_func.h index 843d150..87594a9 100644 --- a/src/DynamicAnalysis/gCov_parser_func.h +++ b/src/DynamicAnalysis/gCov_parser_func.h @@ -5,7 +5,7 @@ #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" #include "gcov_info.h" #include "../CreateInterTree/CreateInterTree.h" diff --git a/src/DynamicAnalysis/gcov_info.cpp b/src/DynamicAnalysis/gcov_info.cpp index c34d64a..0814a68 100644 --- a/src/DynamicAnalysis/gcov_info.cpp +++ b/src/DynamicAnalysis/gcov_info.cpp @@ -4,7 +4,7 @@ #include #include -#include "../Utils/errors.h" +#include "errors.h" #include "gcov_info.h" diff --git a/src/DynamicAnalysis/gcov_info.h b/src/DynamicAnalysis/gcov_info.h index 29f7527..91b09d4 100644 --- a/src/DynamicAnalysis/gcov_info.h +++ b/src/DynamicAnalysis/gcov_info.h @@ -5,7 +5,7 @@ #include #include -#include "../Utils/utils.h" +#include "utils.h" //make 'class' - need friend for Gcov_info struct Perform diff --git a/src/GraphCall/graph_calls.cpp b/src/GraphCall/graph_calls.cpp index 530f9b1..1109d48 100644 --- a/src/GraphCall/graph_calls.cpp +++ b/src/GraphCall/graph_calls.cpp @@ -15,10 +15,10 @@ #include "graph_calls_func.h" #include "../CFGraph/CFGraph.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include "../DirectiveProcessing/directive_parser.h" -#include "../Utils/SgUtils.h" -#include "../Utils/json.hpp" +#include "SgUtils.h" +#include "json.hpp" #include "../ParallelizationRegions/ParRegions_func.h" #include "../DynamicAnalysis/gCov_parser_func.h" #include "expr_transform.h" diff --git a/src/GraphCall/graph_calls.h b/src/GraphCall/graph_calls.h index 17fc462..0de481e 100644 --- a/src/GraphCall/graph_calls.h +++ b/src/GraphCall/graph_calls.h @@ -3,10 +3,10 @@ #include #include -#include "../Utils/AstWrapper.h" -#include "../Utils/utils.h" +#include "AstWrapper.h" +#include "utils.h" #include "../DirectiveProcessing/shadow.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" static const char* paramNames[] = { "NONE_T", "ARRAY_T", "STRING_ARRAY_T", "STRING_T", "SCALAR_CHAR_T", "SCALAR_BOOL_T", "SCALAR_SHORT_T", "SCALAR_INT_T", "SCALAR_LONG_INT_T", diff --git a/src/GraphCall/graph_calls_base.cpp b/src/GraphCall/graph_calls_base.cpp index 44bb7d2..fdb6393 100644 --- a/src/GraphCall/graph_calls_base.cpp +++ b/src/GraphCall/graph_calls_base.cpp @@ -10,10 +10,10 @@ #include #include -#include "../Utils/errors.h" +#include "errors.h" #include "graph_calls.h" #include "../Distribution/Distribution.h" -#include "../Utils/utils.h" +#include "utils.h" #include "../ParallelizationRegions/ParRegions.h" using std::vector; diff --git a/src/GraphCall/graph_calls_func.h b/src/GraphCall/graph_calls_func.h index acba4a7..44e029c 100644 --- a/src/GraphCall/graph_calls_func.h +++ b/src/GraphCall/graph_calls_func.h @@ -5,7 +5,7 @@ #include #include "graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" #include "Utils/json.hpp" diff --git a/src/GraphLoop/graph_loops.cpp b/src/GraphLoop/graph_loops.cpp index ded6d93..16438ee 100644 --- a/src/GraphLoop/graph_loops.cpp +++ b/src/GraphLoop/graph_loops.cpp @@ -12,7 +12,7 @@ #include "dvm.h" #include "../Sapfor.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "../ParallelizationRegions/ParRegions_func.h" #include "expr_transform.h" @@ -21,12 +21,12 @@ #include "../Distribution/Distribution.h" #include "graph_loops.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "utils.h" +#include "SgUtils.h" -#include "../Utils/errors.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/json.hpp" +#include "errors.h" +#include "AstWrapper.h" +#include "json.hpp" #include "../DirectiveProcessing/directive_parser.h" #include "../DynamicAnalysis/gCov_parser_func.h" diff --git a/src/GraphLoop/graph_loops.h b/src/GraphLoop/graph_loops.h index 39fd48b..70d12e5 100644 --- a/src/GraphLoop/graph_loops.h +++ b/src/GraphLoop/graph_loops.h @@ -5,8 +5,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/types.h" +#include "errors.h" +#include "types.h" #include "../Distribution/DvmhDirective.h" #include "../Distribution/Distribution.h" diff --git a/src/GraphLoop/graph_loops_base.cpp b/src/GraphLoop/graph_loops_base.cpp index 514c4c5..031a4d6 100644 --- a/src/GraphLoop/graph_loops_base.cpp +++ b/src/GraphLoop/graph_loops_base.cpp @@ -23,8 +23,8 @@ using std::make_pair; using std::get; #include "graph_loops.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/errors.h" +#include "graph_calls_func.h" +#include "errors.h" #include "../Distribution/Distribution.h" #include "../Distribution/CreateDistributionDirs.h" #include "../ParallelizationRegions/ParRegions.h" diff --git a/src/LoopAnalyzer/allocations_prepoc.cpp b/src/LoopAnalyzer/allocations_prepoc.cpp index 9655798..4d714d2 100644 --- a/src/LoopAnalyzer/allocations_prepoc.cpp +++ b/src/LoopAnalyzer/allocations_prepoc.cpp @@ -8,8 +8,8 @@ #include #include "dvm.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" using std::set; using std::pair; diff --git a/src/LoopAnalyzer/dep_analyzer.cpp b/src/LoopAnalyzer/dep_analyzer.cpp index ecf4f2a..aa17a19 100644 --- a/src/LoopAnalyzer/dep_analyzer.cpp +++ b/src/LoopAnalyzer/dep_analyzer.cpp @@ -20,8 +20,8 @@ #include "dvm.h" #include "loop_analyzer.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "utils.h" +#include "SgUtils.h" #include "../ParallelizationRegions/ParRegions_func.h" #include "../SageAnalysisTool/depGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" diff --git a/src/LoopAnalyzer/loop_analyzer.cpp b/src/LoopAnalyzer/loop_analyzer.cpp index b284246..cdbbc7d 100644 --- a/src/LoopAnalyzer/loop_analyzer.cpp +++ b/src/LoopAnalyzer/loop_analyzer.cpp @@ -30,15 +30,15 @@ extern int passDone; #include "../Distribution/Arrays.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../DirectiveProcessing/directive_parser.h" #include "../DirectiveProcessing/directive_creator.h" -#include "../Utils/SgUtils.h" -#include "../Utils/AstWrapper.h" +#include "SgUtils.h" +#include "AstWrapper.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "../ParallelizationRegions/ParRegions_func.h" #include "../DynamicAnalysis/gCov_parser_func.h" diff --git a/src/LoopAnalyzer/loop_analyzer.h b/src/LoopAnalyzer/loop_analyzer.h index ececa21..96e18d2 100644 --- a/src/LoopAnalyzer/loop_analyzer.h +++ b/src/LoopAnalyzer/loop_analyzer.h @@ -5,12 +5,12 @@ #include #include #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "graph_calls.h" #include "../ParallelizationRegions/ParRegions.h" #include "../SageAnalysisTool/depInterfaceExt.h" -#include "../Utils/AstWrapper.h" -#include "../Utils/SgUtils.h" +#include "AstWrapper.h" +#include "SgUtils.h" #include "dvm.h" diff --git a/src/ParallelizationRegions/ParRegions.cpp b/src/ParallelizationRegions/ParRegions.cpp index 903fa5e..a05d827 100644 --- a/src/ParallelizationRegions/ParRegions.cpp +++ b/src/ParallelizationRegions/ParRegions.cpp @@ -10,10 +10,10 @@ #include "dvm.h" #include "ParRegions.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops.h" +#include "utils.h" +#include "SgUtils.h" +#include "graph_calls_func.h" +#include "graph_loops.h" #include "../Distribution/Distribution.h" #include "expr_transform.h" diff --git a/src/ParallelizationRegions/ParRegions.h b/src/ParallelizationRegions/ParRegions.h index d613d31..6f78563 100644 --- a/src/ParallelizationRegions/ParRegions.h +++ b/src/ParallelizationRegions/ParRegions.h @@ -9,12 +9,12 @@ #include "../Distribution/DvmhDirective.h" #include "../Distribution/GraphCSR.h" #include "../Distribution/Distribution.h" -#include "../Utils/AstWrapper.h" +#include "AstWrapper.h" -#include "../Utils/json.hpp" +#include "json.hpp" #if __SPF -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #endif struct ParallelRegionLines diff --git a/src/ParallelizationRegions/ParRegions_func.h b/src/ParallelizationRegions/ParRegions_func.h index 6420a37..d1ac9b8 100644 --- a/src/ParallelizationRegions/ParRegions_func.h +++ b/src/ParallelizationRegions/ParRegions_func.h @@ -2,7 +2,7 @@ #include "ParRegions.h" #include "graph_calls.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" void fillRegionLines(SgFile *file, std::vector ®ions, std::vector& messagesForFile, std::vector *loops = NULL, std::vector *funcs = NULL); void fillRegionLinesStep2(std::vector ®ions, const std::map> &allFuncInfo, std::map> *loopGraph = NULL); diff --git a/src/ParallelizationRegions/expand_extract_reg.h b/src/ParallelizationRegions/expand_extract_reg.h index c1e0d50..2040a9d 100644 --- a/src/ParallelizationRegions/expand_extract_reg.h +++ b/src/ParallelizationRegions/expand_extract_reg.h @@ -1,7 +1,7 @@ #pragma once #include "ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" bool expandExtractReg(const std::string &fileName, const int startLine, const int endLine, const std::vector ®ions, std::vector &messagesForFile, const bool toDelete = false); diff --git a/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp index 43d842f..dc77d6a 100644 --- a/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp +++ b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp @@ -11,12 +11,12 @@ #include "ParRegions_func.h" #include "resolve_par_reg_conflicts.h" -#include "../GraphCall/graph_calls_func.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_calls_func.h" +#include "graph_loops_func.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../DirectiveProcessing/directive_creator.h" #include "../DirectiveProcessing/insert_directive.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "expr_transform.h" #include "../Transformations/FunctionPurifying/function_purifying.h" diff --git a/src/ParallelizationRegions/resolve_par_reg_conflicts.h b/src/ParallelizationRegions/resolve_par_reg_conflicts.h index 1523306..cfaecbe 100644 --- a/src/ParallelizationRegions/resolve_par_reg_conflicts.h +++ b/src/ParallelizationRegions/resolve_par_reg_conflicts.h @@ -1,8 +1,8 @@ #pragma once #include "ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" #include "graph_calls.h" void fillRegionIntervals(std::vector ®ions); diff --git a/src/Predictor/PredictScheme.cpp b/src/Predictor/PredictScheme.cpp index 146427d..4e09007 100644 --- a/src/Predictor/PredictScheme.cpp +++ b/src/Predictor/PredictScheme.cpp @@ -16,10 +16,10 @@ #include "../DynamicAnalysis/gcov_info.h" #include "../DynamicAnalysis/gCov_parser_func.h" #include "PredictScheme.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../DirectiveProcessing/directive_parser.h" #include "../Distribution/DvmhDirective.h" -#include "../GraphLoop/graph_loops_func.h" +#include "graph_loops_func.h" #include "expr_transform.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "../CFGraph/CFGraph.h" diff --git a/src/Predictor/PredictScheme.h b/src/Predictor/PredictScheme.h index b8fb310..a9c91f2 100644 --- a/src/Predictor/PredictScheme.h +++ b/src/Predictor/PredictScheme.h @@ -2,7 +2,7 @@ #include #include "dvm.h" #include "graph_calls.h" -#include "../Utils/json.hpp" +#include "json.hpp" class ParallelStats { diff --git a/src/PrivateAnalyzer/private_arrays_search.cpp b/src/PrivateAnalyzer/private_arrays_search.cpp index 985baf6..36a6a18 100644 --- a/src/PrivateAnalyzer/private_arrays_search.cpp +++ b/src/PrivateAnalyzer/private_arrays_search.cpp @@ -9,8 +9,8 @@ #include "private_arrays_search.h" #include "range_structures.h" #include "region.h" -#include "../Utils/SgUtils.h" -#include "../GraphLoop/graph_loops.h" +#include "SgUtils.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" using namespace std; diff --git a/src/PrivateAnalyzer/private_arrays_search.h b/src/PrivateAnalyzer/private_arrays_search.h index 2faaa27..504349d 100644 --- a/src/PrivateAnalyzer/private_arrays_search.h +++ b/src/PrivateAnalyzer/private_arrays_search.h @@ -6,7 +6,7 @@ #include "range_structures.h" #include "region.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" void Collapse(Region* region); diff --git a/src/PrivateAnalyzer/region.cpp b/src/PrivateAnalyzer/region.cpp index 54540d2..5030fe3 100644 --- a/src/PrivateAnalyzer/region.cpp +++ b/src/PrivateAnalyzer/region.cpp @@ -8,7 +8,7 @@ #include "range_structures.h" #include "region.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/PrivateAnalyzer/region.h b/src/PrivateAnalyzer/region.h index 95121b2..4a474ca 100644 --- a/src/PrivateAnalyzer/region.h +++ b/src/PrivateAnalyzer/region.h @@ -5,7 +5,7 @@ #include #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../CFGraph/CFGraph.h" class Region : public SAPFOR::BasicBlock { diff --git a/src/ProjectManipulation/ConvertFiles.cpp b/src/ProjectManipulation/ConvertFiles.cpp index 1fd7715..ecfe69a 100644 --- a/src/ProjectManipulation/ConvertFiles.cpp +++ b/src/ProjectManipulation/ConvertFiles.cpp @@ -6,9 +6,9 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "SgUtils.h" +#include "utils.h" #include "../VerificationCode/verifications.h" diff --git a/src/ProjectManipulation/FileInfo.cpp b/src/ProjectManipulation/FileInfo.cpp index 7aa5215..d7de1b1 100644 --- a/src/ProjectManipulation/FileInfo.cpp +++ b/src/ProjectManipulation/FileInfo.cpp @@ -7,8 +7,8 @@ #include #include "FileInfo.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "errors.h" using namespace std; diff --git a/src/ProjectManipulation/ParseFiles.cpp b/src/ProjectManipulation/ParseFiles.cpp index 3e6e40a..45a68a2 100644 --- a/src/ProjectManipulation/ParseFiles.cpp +++ b/src/ProjectManipulation/ParseFiles.cpp @@ -22,8 +22,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "../VisualizerCalls/get_information.h" #include "../VisualizerCalls/SendMessage.h" diff --git a/src/ProjectManipulation/PerfAnalyzer.cpp b/src/ProjectManipulation/PerfAnalyzer.cpp index f8579d1..bc2428a 100644 --- a/src/ProjectManipulation/PerfAnalyzer.cpp +++ b/src/ProjectManipulation/PerfAnalyzer.cpp @@ -6,8 +6,8 @@ #include #include -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "StdCapture.h" diff --git a/src/ProjectParameters/projectParameters.cpp b/src/ProjectParameters/projectParameters.cpp index 64531b1..d8d96d9 100644 --- a/src/ProjectParameters/projectParameters.cpp +++ b/src/ProjectParameters/projectParameters.cpp @@ -12,10 +12,10 @@ #include #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "projectParameters.h" diff --git a/src/SageAnalysisTool/defUse.cpp b/src/SageAnalysisTool/defUse.cpp index 24ade01..fea079a 100644 --- a/src/SageAnalysisTool/defUse.cpp +++ b/src/SageAnalysisTool/defUse.cpp @@ -5,8 +5,8 @@ #include #include "graph_calls.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "utils.h" #include "sage++user.h" #include "definesValues.h" #include "set.h" diff --git a/src/SageAnalysisTool/depGraph.cpp b/src/SageAnalysisTool/depGraph.cpp index 78a1e6d..800cc45 100644 --- a/src/SageAnalysisTool/depGraph.cpp +++ b/src/SageAnalysisTool/depGraph.cpp @@ -16,7 +16,7 @@ extern "C" void removeFromCollection(void *pointer); extern int passDone; #include "graph_calls.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../VisualizerCalls/get_information.h" #include "sage++user.h" diff --git a/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp b/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp index 64685e7..7ebc316 100644 --- a/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp +++ b/src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp @@ -11,9 +11,9 @@ #include "../Distribution/Array.h" #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/Transformations/CheckPoints/checkpoints.cpp b/src/Transformations/CheckPoints/checkpoints.cpp index 2549f6c..372d62e 100644 --- a/src/Transformations/CheckPoints/checkpoints.cpp +++ b/src/Transformations/CheckPoints/checkpoints.cpp @@ -4,8 +4,8 @@ #include #include -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" +#include "SgUtils.h" +#include "utils.h" #include "expr_transform.h" #include "checkpoints.h" diff --git a/src/Transformations/DeadCodeRemoving/dead_code.h b/src/Transformations/DeadCodeRemoving/dead_code.h index 741acff..8f7b1fa 100644 --- a/src/Transformations/DeadCodeRemoving/dead_code.h +++ b/src/Transformations/DeadCodeRemoving/dead_code.h @@ -3,7 +3,7 @@ #include #include -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../CFGraph/CFGraph.h" #include "../CFGraph/live_variable_analysis.h" #include "../CFGraph/DataFlow/data_flow.h" diff --git a/src/Transformations/ExpressionSubstitution/expr_transform.cpp b/src/Transformations/ExpressionSubstitution/expr_transform.cpp index e8db58d..eff3540 100644 --- a/src/Transformations/ExpressionSubstitution/expr_transform.cpp +++ b/src/Transformations/ExpressionSubstitution/expr_transform.cpp @@ -19,11 +19,11 @@ extern int passDone; #include "../ParallelizationRegions/ParRegions.h" #include "../ParallelizationRegions/ParRegions_func.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "graph_calls_func.h" +#include "utils.h" +#include "SgUtils.h" #include "../Distribution/Distribution.h" #include "../VisualizerCalls/get_information.h" #include "expr_transform.h" diff --git a/src/Transformations/ExpressionSubstitution/expr_transform.h b/src/Transformations/ExpressionSubstitution/expr_transform.h index c9924d5..d79cd06 100644 --- a/src/Transformations/ExpressionSubstitution/expr_transform.h +++ b/src/Transformations/ExpressionSubstitution/expr_transform.h @@ -5,10 +5,10 @@ #include #include "dvm.h" #include "../Distribution/Distribution.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../ParallelizationRegions/ParRegions.h" #include "graph_calls.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "acc_analyzer.h" diff --git a/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp index 8bf71db..b2e5eb9 100644 --- a/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp +++ b/src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp @@ -12,12 +12,12 @@ #include #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include "uniq_call_chain_dup.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "expr_transform.h" #include "../VerificationCode/verifications.h" diff --git a/src/Transformations/FunctionInlining/inliner.cpp b/src/Transformations/FunctionInlining/inliner.cpp index 5a00fae..209cffd 100644 --- a/src/Transformations/FunctionInlining/inliner.cpp +++ b/src/Transformations/FunctionInlining/inliner.cpp @@ -8,10 +8,10 @@ #include #include "dvm.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../GraphCall/graph_calls_func.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "graph_calls_func.h" #include "inliner.h" #include "../VisualizerCalls/SendMessage.h" #include "expr_transform.h" diff --git a/src/Transformations/FunctionPurifying/function_purifying.cpp b/src/Transformations/FunctionPurifying/function_purifying.cpp index af93f22..2eb2470 100644 --- a/src/Transformations/FunctionPurifying/function_purifying.cpp +++ b/src/Transformations/FunctionPurifying/function_purifying.cpp @@ -11,10 +11,10 @@ #include #include "dvm.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/SgUtils.h" -#include "../Utils/CommonBlock.h" -#include "../Utils/DefUseList.h" +#include "graph_calls_func.h" +#include "SgUtils.h" +#include "CommonBlock.h" +#include "DefUseList.h" #include "expr_transform.h" #include "../VerificationCode/verifications.h" #include "../DvmhRegions/DvmhRegionInserter.h" diff --git a/src/Transformations/GlobalVariables/fix_common_blocks.h b/src/Transformations/GlobalVariables/fix_common_blocks.h index 8c0ff32..13bbd3e 100644 --- a/src/Transformations/GlobalVariables/fix_common_blocks.h +++ b/src/Transformations/GlobalVariables/fix_common_blocks.h @@ -8,7 +8,7 @@ #include #include "dvm.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../LoopAnalyzer/loop_analyzer.h" #include "expr_transform.h" diff --git a/src/Transformations/LoopCombining/loops_combiner.cpp b/src/Transformations/LoopCombining/loops_combiner.cpp index 81ca24c..747839a 100644 --- a/src/Transformations/LoopCombining/loops_combiner.cpp +++ b/src/Transformations/LoopCombining/loops_combiner.cpp @@ -2,8 +2,8 @@ #include "../LoopAnalyzer/loop_analyzer.h" #include "expr_transform.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "SgUtils.h" #include #include #include diff --git a/src/Transformations/LoopCombining/loops_combiner.h b/src/Transformations/LoopCombining/loops_combiner.h index 49244f6..9153a1e 100644 --- a/src/Transformations/LoopCombining/loops_combiner.h +++ b/src/Transformations/LoopCombining/loops_combiner.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../SageAnalysisTool/depGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp index 511b743..4f1c253 100644 --- a/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp +++ b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp @@ -11,9 +11,9 @@ #include "dvm.h" #include "enddo_loop_converter.h" -#include "../Utils/errors.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" +#include "errors.h" +#include "utils.h" +#include "SgUtils.h" using namespace std; diff --git a/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h index 6de9691..39a307b 100644 --- a/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h +++ b/src/Transformations/LoopEndDoConverter/enddo_loop_converter.h @@ -1,6 +1,6 @@ #pragma once -#include "../Utils/errors.h" +#include "errors.h" void ConverToEndDo(SgFile *file, std::vector &messagesForFile); std::vector createIfConditions(std::stack& conds, std::stack& ifBlocks, SgStatement *control); diff --git a/src/Transformations/LoopNesting/loop_transform.cpp b/src/Transformations/LoopNesting/loop_transform.cpp index 6679deb..41e4394 100644 --- a/src/Transformations/LoopNesting/loop_transform.cpp +++ b/src/Transformations/LoopNesting/loop_transform.cpp @@ -8,9 +8,9 @@ #include "../DirectiveProcessing/directive_parser.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../SageAnalysisTool/definesValues.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "../SageAnalysisTool/depGraph.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::pair; using std::map; diff --git a/src/Transformations/LoopNesting/loop_transform.h b/src/Transformations/LoopNesting/loop_transform.h index 3713dba..49c5378 100644 --- a/src/Transformations/LoopNesting/loop_transform.h +++ b/src/Transformations/LoopNesting/loop_transform.h @@ -1,7 +1,7 @@ #pragma once #include -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" void reverseCreatedNestedLoops(const std::string &file, std::vector &loopsInFile); bool createNestedLoops(LoopGraph *current, const std::map &depInfoForLoopGraph, diff --git a/src/Transformations/LoopSplitting/loops_splitter.cpp b/src/Transformations/LoopSplitting/loops_splitter.cpp index 09065d7..07d5776 100644 --- a/src/Transformations/LoopSplitting/loops_splitter.cpp +++ b/src/Transformations/LoopSplitting/loops_splitter.cpp @@ -5,7 +5,7 @@ #include "../LoopAnalyzer/loop_analyzer.h" #include "expr_transform.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../CFGraph/CFGraph.h" #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h" #include "../DirectiveProcessing/directive_parser.h" diff --git a/src/Transformations/LoopSplitting/loops_splitter.h b/src/Transformations/LoopSplitting/loops_splitter.h index 9bdaa5e..084387b 100644 --- a/src/Transformations/LoopSplitting/loops_splitter.h +++ b/src/Transformations/LoopSplitting/loops_splitter.h @@ -4,8 +4,8 @@ #include #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../SageAnalysisTool/depGraph.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" int splitLoops(SgFile *file, std::vector &loopGraphs, std::vector &messages, const std::map& depInfoForLoopGraph, const std::map& commonBlocks, const std::map>& allFuncInfo, int& countOfTransform); diff --git a/src/Transformations/LoopUnrolling/loops_unrolling.cpp b/src/Transformations/LoopUnrolling/loops_unrolling.cpp index 214c5ab..79fc511 100644 --- a/src/Transformations/LoopUnrolling/loops_unrolling.cpp +++ b/src/Transformations/LoopUnrolling/loops_unrolling.cpp @@ -1,8 +1,8 @@ #include "loops_unrolling.h" #include "../LoopAnalyzer/loop_analyzer.h" -#include "../Utils/errors.h" -#include "../GraphLoop/graph_loops_func.h" +#include "errors.h" +#include "graph_loops_func.h" #include #include diff --git a/src/Transformations/LoopUnrolling/loops_unrolling.h b/src/Transformations/LoopUnrolling/loops_unrolling.h index 4664fcc..f04c2ce 100644 --- a/src/Transformations/LoopUnrolling/loops_unrolling.h +++ b/src/Transformations/LoopUnrolling/loops_unrolling.h @@ -1,7 +1,7 @@ #pragma once #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include int unrollLoops(SgFile* file, std::vector& loopGraph, std::vector& messages); \ No newline at end of file diff --git a/src/Transformations/PrivateArrayRemoving/private_removing.cpp b/src/Transformations/PrivateArrayRemoving/private_removing.cpp index 5589073..0ddd7a6 100644 --- a/src/Transformations/PrivateArrayRemoving/private_removing.cpp +++ b/src/Transformations/PrivateArrayRemoving/private_removing.cpp @@ -1,8 +1,8 @@ #include "private_removing.h" -#include "../Utils/errors.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" +#include "errors.h" +#include "SgUtils.h" +#include "utils.h" #include "expr_transform.h" #include "../DeadCodeRemoving/dead_code.h" diff --git a/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp index 25d2766..d2d4a58 100644 --- a/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp +++ b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.cpp @@ -1,8 +1,8 @@ #include "private_arrays_resizing.h" -#include "../GraphLoop/graph_loops.h" -#include "../Utils/SgUtils.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "graph_loops.h" +#include "SgUtils.h" +#include "utils.h" +#include "errors.h" #include "../DirectiveProcessing/directive_parser.h" #include "../LoopAnalyzer/loop_analyzer.h" diff --git a/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h index 1ad162d..e5f00a3 100644 --- a/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h +++ b/src/Transformations/PrivateArrayResizing/private_arrays_resizing.h @@ -1,5 +1,5 @@ #include "dvm.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include #include #include diff --git a/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h index cd5c912..e643f59 100644 --- a/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h +++ b/src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.h @@ -1,8 +1,8 @@ #pragma once #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "SgUtils.h" +#include "errors.h" #include "graph_calls.h" void replaceDistributedArraysInIO(std::vector& regions, diff --git a/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp index 20e1d37..4e2480f 100644 --- a/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp +++ b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.cpp @@ -13,9 +13,9 @@ #include "dvm.h" #include "../ParallelizationRegions/ParRegions.h" #include "array_assign_to_loop.h" -#include "../Utils/SgUtils.h" +#include "SgUtils.h" #include "expr_transform.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "../VerificationCode/verifications.h" using std::vector; diff --git a/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h index dade68e..5fc40f3 100644 --- a/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h +++ b/src/Transformations/VectorAssignToLoop/array_assign_to_loop.h @@ -2,7 +2,7 @@ #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" void convertFromAssignToLoop(SgFile *file, const std::vector& regions, std::vector &messagesForFile, const std::map>& arrayLinksByFuncCalls); void restoreAssignsFromLoop(SgFile *file, const std::map>& arrayLinksByFuncCalls); diff --git a/src/Utils/SgUtils.cpp b/src/Utils/SgUtils.cpp index 51b0dce..5017822 100644 --- a/src/Utils/SgUtils.cpp +++ b/src/Utils/SgUtils.cpp @@ -38,7 +38,7 @@ #include "../Distribution/Distribution.h" #include "graph_calls.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "../CreateInterTree/CreateInterTree.h" #include "../Predictor/PredictScheme.h" #include "../VisualizerCalls/get_information.h" diff --git a/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp index 9bc9e1a..8d1de0a 100644 --- a/src/Utils/module_utils.cpp +++ b/src/Utils/module_utils.cpp @@ -7,7 +7,7 @@ #include "dvm.h" #include "errors.h" #include "utils.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "module_utils.h" diff --git a/src/Utils/utils.cpp b/src/Utils/utils.cpp index e9f8bcf..dc24ba4 100644 --- a/src/Utils/utils.cpp +++ b/src/Utils/utils.cpp @@ -25,7 +25,7 @@ #include "errors.h" #include "version.h" -#include "../GraphLoop/graph_loops.h" +#include "graph_loops.h" #include "../Distribution/Array.h" #include "../Distribution/Arrays.h" #include "../DynamicAnalysis/gcov_info.h" diff --git a/src/VerificationCode/CorrectVarDecl.cpp b/src/VerificationCode/CorrectVarDecl.cpp index ccae540..95ea158 100644 --- a/src/VerificationCode/CorrectVarDecl.cpp +++ b/src/VerificationCode/CorrectVarDecl.cpp @@ -10,10 +10,10 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" using std::vector; using std::string; diff --git a/src/VerificationCode/IncludeChecker.cpp b/src/VerificationCode/IncludeChecker.cpp index 04ad02f..d8caf31 100644 --- a/src/VerificationCode/IncludeChecker.cpp +++ b/src/VerificationCode/IncludeChecker.cpp @@ -8,9 +8,9 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "errors.h" #include "../Distribution/DvmhDirective.h" using std::vector; diff --git a/src/VerificationCode/StructureChecker.cpp b/src/VerificationCode/StructureChecker.cpp index 1eb17b4..aac7c76 100644 --- a/src/VerificationCode/StructureChecker.cpp +++ b/src/VerificationCode/StructureChecker.cpp @@ -9,9 +9,9 @@ #include "verifications.h" #include "../ParallelizationRegions/ParRegions.h" -#include "../Utils/utils.h" -#include "../Utils/SgUtils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "SgUtils.h" +#include "errors.h" using std::vector; using std::map; diff --git a/src/VerificationCode/VerifySageStructures.cpp b/src/VerificationCode/VerifySageStructures.cpp index 1056bcc..652fe56 100644 --- a/src/VerificationCode/VerifySageStructures.cpp +++ b/src/VerificationCode/VerifySageStructures.cpp @@ -8,8 +8,8 @@ #include "dvm.h" #include "verifications.h" -#include "../Utils/utils.h" -#include "../Utils/errors.h" +#include "utils.h" +#include "errors.h" int VerifyFile(SgFile *file) { diff --git a/src/VerificationCode/verifications.h b/src/VerificationCode/verifications.h index ae62d4f..af1a3ba 100644 --- a/src/VerificationCode/verifications.h +++ b/src/VerificationCode/verifications.h @@ -4,11 +4,11 @@ #include #include #include "dvm.h" -#include "../Utils/errors.h" +#include "errors.h" #include "../ParallelizationRegions/ParRegions.h" #include "../ParallelizationRegions/ParRegions_func.h" -#include "../Utils/CommonBlock.h" +#include "CommonBlock.h" struct Function { diff --git a/src/VisualizerCalls/BuildGraph.cpp b/src/VisualizerCalls/BuildGraph.cpp index 8519016..bebebb1 100644 --- a/src/VisualizerCalls/BuildGraph.cpp +++ b/src/VisualizerCalls/BuildGraph.cpp @@ -14,7 +14,7 @@ #include #include -#include "../GraphCall/graph_calls_func.h" +#include "graph_calls_func.h" #include "graphLayout/nodesoup.hpp" #include "BuildGraph.h" diff --git a/src/VisualizerCalls/SendMessage.cpp b/src/VisualizerCalls/SendMessage.cpp index 81cabb1..0997195 100644 --- a/src/VisualizerCalls/SendMessage.cpp +++ b/src/VisualizerCalls/SendMessage.cpp @@ -6,7 +6,7 @@ #include #include "SendMessage.h" -#include "../Utils/utils.h" +#include "utils.h" #include "get_information.h" diff --git a/src/VisualizerCalls/get_information.cpp b/src/VisualizerCalls/get_information.cpp index 1e2adf1..d375cd0 100644 --- a/src/VisualizerCalls/get_information.cpp +++ b/src/VisualizerCalls/get_information.cpp @@ -23,14 +23,14 @@ #include #endif -#include "../Utils/errors.h" -#include "../Utils/version.h" +#include "errors.h" +#include "version.h" #include "get_information.h" #include "dvm.h" #include "../Sapfor.h" -#include "../GraphLoop/graph_loops_func.h" -#include "../GraphCall/graph_calls_func.h" -#include "../Utils/utils.h" +#include "graph_loops_func.h" +#include "graph_calls_func.h" +#include "utils.h" #include "../Sapfor.h" #include "../ParallelizationRegions/ParRegions.h" #include "SendMessage.h"