From 7d45f5babc8905327b82891f0bd3ca652487f6e2 Mon Sep 17 00:00:00 2001 From: xnpster Date: Sun, 19 Apr 2026 19:17:14 +0300 Subject: [PATCH] marge_regions: rename --- CMakeLists.txt | 8 ++++---- .../{parse_merge_dirs.cpp => merge_regions.cpp} | 4 ++-- src/ParallelizationRegions/merge_regions.h | 8 ++++++++ src/ParallelizationRegions/parse_merge_dirs.h | 8 -------- src/Sapfor.cpp | 10 +++++----- src/Sapfor.h | 4 ++-- src/Utils/PassManager.h | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) rename src/ParallelizationRegions/{parse_merge_dirs.cpp => merge_regions.cpp} (99%) create mode 100644 src/ParallelizationRegions/merge_regions.h delete mode 100644 src/ParallelizationRegions/parse_merge_dirs.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1af5c52..c679fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,8 +166,8 @@ set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp set(ARRAY_PROP src/ArrayConstantPropagation/propagation.cpp src/ArrayConstantPropagation/propagation.h ) -set(MERGE_COPY_ARRAYS src/ParallelizationRegions/parse_merge_dirs.cpp - src/ParallelizationRegions/parse_merge_dirs.h) +set(MERGE_REGIONS src/ParallelizationRegions/merge_regions.cpp + src/ParallelizationRegions/merge_regions.h) set(TR_DEAD_CODE src/Transformations/DeadCodeRemoving/dead_code.cpp src/Transformations/DeadCodeRemoving/dead_code.h) @@ -428,7 +428,7 @@ set(SOURCE_EXE ${LOOP_ANALYZER} ${TRANSFORMS} ${PARALLEL_REG} - ${MERGE_COPY_ARRAYS} + ${MERGE_REGIONS} ${PRIV} ${ARRAY_PROP} ${FDVM} @@ -482,7 +482,7 @@ source_group (GraphCall FILES ${GR_CALL}) source_group (GraphLoop FILES ${GR_LOOP}) source_group (LoopAnalyzer FILES ${LOOP_ANALYZER}) source_group (ParallelizationRegions FILES ${PARALLEL_REG}) -source_group (MergeCopyArrays FILES ${MERGE_COPY_ARRAYS}) +source_group (MergeRegions FILES ${MERGE_REGIONS}) source_group (PrivateAnalyzer FILES ${PRIV}) source_group (ArrayConstantPropagation FILES ${ARRAY_PROP}) source_group (FDVM_Compiler FILES ${FDVM}) diff --git a/src/ParallelizationRegions/parse_merge_dirs.cpp b/src/ParallelizationRegions/merge_regions.cpp similarity index 99% rename from src/ParallelizationRegions/parse_merge_dirs.cpp rename to src/ParallelizationRegions/merge_regions.cpp index b7cae96..f047085 100644 --- a/src/ParallelizationRegions/parse_merge_dirs.cpp +++ b/src/ParallelizationRegions/merge_regions.cpp @@ -1,4 +1,4 @@ -#include "parse_merge_dirs.h" +#include "merge_regions.h" #include @@ -360,7 +360,7 @@ static void replaceRegion(SgStatement* st, const unordered_map & } } -void mergeCopyArrays(vector ®ions, const map> &allFuncInfo) +void mergeRegions(vector ®ions, const map> &allFuncInfo) { for (const auto *region : regions) { diff --git a/src/ParallelizationRegions/merge_regions.h b/src/ParallelizationRegions/merge_regions.h new file mode 100644 index 0000000..6ecee53 --- /dev/null +++ b/src/ParallelizationRegions/merge_regions.h @@ -0,0 +1,8 @@ +#include "../GraphCall/graph_calls.h" +#include "ParRegions.h" + +#include +#include +#include + +void mergeRegions(std::vector ®ions, const std::map> &allFuncInfo); \ No newline at end of file diff --git a/src/ParallelizationRegions/parse_merge_dirs.h b/src/ParallelizationRegions/parse_merge_dirs.h deleted file mode 100644 index 54c2287..0000000 --- a/src/ParallelizationRegions/parse_merge_dirs.h +++ /dev/null @@ -1,8 +0,0 @@ -#include "../GraphCall/graph_calls.h" -#include "ParRegions.h" - -#include -#include -#include - -void mergeCopyArrays(std::vector ®ions, const std::map> &allFuncInfo); \ No newline at end of file diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp index 1fda4b0..f3eaa52 100644 --- a/src/Sapfor.cpp +++ b/src/Sapfor.cpp @@ -1,4 +1,4 @@ -#include "Utils/leak_detector.h" +#include "Utils/leak_detector.h" #pragma comment(linker, "/STACK:536870912") // 512 МБ @@ -23,7 +23,7 @@ #include "ParallelizationRegions/ParRegions_func.h" #include "ParallelizationRegions/resolve_par_reg_conflicts.h" #include "ParallelizationRegions/expand_extract_reg.h" -#include "ParallelizationRegions/parse_merge_dirs.h" +#include "ParallelizationRegions/merge_regions.h" #include "Distribution/Distribution.h" #include "Distribution/GraphCSR.h" @@ -1906,9 +1906,9 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne transformAssumedSizeParameters(allFuncInfo); else if (curr_regime == FIND_PRIVATE_ARRAYS_ANALYSIS) FindPrivateArrays(loopGraph, fullIR, insertedPrivates); - else if (curr_regime == MERGE_COPY_ARRAYS) + else if (curr_regime == MERGE_REGIONS) { - mergeCopyArrays(parallelRegions, allFuncInfo); + mergeRegions(parallelRegions, allFuncInfo); } else if (curr_regime == ARRAY_PROPAGATION) @@ -2367,7 +2367,7 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam case FIX_COMMON_BLOCKS: case TEST_PASS: case SET_IMPLICIT_NONE: - case MERGE_COPY_ARRAYS: + case MERGE_REGIONS: runAnalysis(*project, curr_regime, false); case SUBST_EXPR_RD_AND_UNPARSE: case SUBST_EXPR_AND_UNPARSE: diff --git a/src/Sapfor.h b/src/Sapfor.h index 3ad7cb8..bae94fb 100644 --- a/src/Sapfor.h +++ b/src/Sapfor.h @@ -88,7 +88,7 @@ enum passes { REMOVE_DVM_INTERVALS, VERIFY_DVM_DIRS, - MERGE_COPY_ARRAYS, + MERGE_REGIONS, REMOVE_DIST_ARRAYS_FROM_IO, @@ -275,7 +275,7 @@ static void setPassValues() passNames[VERIFY_DVM_DIRS] = "VERIFY_DVM_DIRS"; passNames[REMOVE_DVM_DIRS_TO_COMMENTS] = "REMOVE_DVM_DIRS_TO_COMMENTS"; passNames[REMOVE_SPF_DIRS] = "REMOVE_SPF_DIRS"; - passNames[MERGE_COPY_ARRAYS] = "MERGE_COPY_ARRAYS"; + passNames[MERGE_REGIONS] = "MERGE_REGIONS"; passNames[REMOVE_DIST_ARRAYS_FROM_IO] = "REMOVE_DIST_ARRAYS_FROM_IO"; passNames[SUBST_EXPR] = "SUBST_EXPR"; passNames[SUBST_EXPR_RD] = "SUBST_EXPR_RD"; diff --git a/src/Utils/PassManager.h b/src/Utils/PassManager.h index caefa14..68a6f6b 100644 --- a/src/Utils/PassManager.h +++ b/src/Utils/PassManager.h @@ -322,7 +322,7 @@ void InitPassesDependencies(map> &passDepsIn, set list({ FIND_PRIVATE_ARRAYS_ANALYSIS, CONVERT_LOOP_TO_ASSIGN, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(FIND_PRIVATE_ARRAYS); list({ BUILD_IR, CALL_GRAPH2, RESTORE_LOOP_FROM_ASSIGN, REVERT_SUBST_EXPR_RD }) <= Pass(MOVE_OPERATORS); - Pass(CREATE_TEMPLATE_LINKS) <= Pass(MERGE_COPY_ARRAYS); + Pass(CREATE_TEMPLATE_LINKS) <= Pass(MERGE_REGIONS); passesIgnoreStateDone.insert({ CREATE_PARALLEL_DIRS, INSERT_PARALLEL_DIRS, INSERT_SHADOW_DIRS, EXTRACT_PARALLEL_DIRS, EXTRACT_SHADOW_DIRS, CREATE_REMOTES, UNPARSE_FILE, REMOVE_AND_CALC_SHADOW,