Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes for added message' (#10) from select_array_dim_conf_pass_xnp into master

Browse Source 
Reviewed-on: Alexander_KS/SAPFOR/pulls/10
This commit was merged in pull request #10.
This commit is contained in:
Alexander_KS
2023-10-11 10:40:44 +00:00
parent c4f222fe34 1b4a1b8ae4
commit 1791290d41
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sapfor/experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp
View File

@@ -110,7 +110,7 @@ static void preventLoopsFromParallelizations(LoopGraph* loop, const set<DIST::Ar
array_bounds += bounds_pair.second >= 0 ? to_string(bounds_pair.second) : "*"; array_bounds += bounds_pair.second >= 0 ? to_string(bounds_pair.second) : "*";
} }
string array_ref = conflict_array->GetName() + "(" + array_bounds + ")"; string array_ref = conflict_array->GetShortName() + "(" + array_bounds + ")";
// add conflict message // add conflict message
std::wstring bufE, bufR; std::wstring bufE, bufR;

4
sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
View File

@@ -2176,9 +2176,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
else if (curr_regime == FIX_COMMON_BLOCKS) else if (curr_regime == FIX_COMMON_BLOCKS)
fixCommonBlocks(allFuncInfo, commonBlocks, &project); fixCommonBlocks(allFuncInfo, commonBlocks, &project);
else if (curr_regime == SELECT_ARRAY_DIM_CONF) { else if (curr_regime == SELECT_ARRAY_DIM_CONF) {
map<string, vector<Messages>> localMessages; SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, createdDirectives, SPF_messages, arrayLinksByFuncCalls, parallelRegions);
SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, createdDirectives, localMessages, arrayLinksByFuncCalls, parallelRegions);
removeRegionsWithoutDirs(createdDirectives, parallelRegions, allFuncInfo, SPF_messages); removeRegionsWithoutDirs(createdDirectives, parallelRegions, allFuncInfo, SPF_messages);
} }

2
sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
View File

@@ -311,7 +311,7 @@ R151 = "Пустые области распараллеливания недо
//3022 //3022
R171 = "Невозможно определить правила выравнивания для массива '%s'." R171 = "Невозможно определить правила выравнивания для массива '%s'."
//3023 //3023
R202 = "Ссылка '%s' имеет размер отличный от оригинального массива размер" R202 = "Ссылка '%s' имеет отличный от оригинального массива размер"
//4001 //4001
//---TODO ошибки из SAGE //---TODO ошибки из SAGE