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

libpredict_integration: template id mapping

Browse Source
This commit is contained in:
IgorBobrov
2025-10-22 22:45:57 +03:00
parent f623eaeb5b
commit 6fceaaf704
4 changed files with 147 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
src/Predictor/PredictSchemeWithLibrary.cpp
View File

@@ -22,28 +22,76 @@ using std::vector;
using std::pair;
using std::tuple;
// МОЖЕТ КАК-ТО ВЫЧИСЛЯТЬ ДИРЕКТИВЫ, А ПОТОМ ДЕЛАТЬ ПРОГОНЫ?
map<size_t, size_t> createTemplateIdMapping(const vector<ParallelRegion*> &parallelRegions)
{
size_t maxArrayId = 0;
for (int z = 0; z < parallelRegions.size(); ++z) {
const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
for (const auto& distrRule : dataDirectives.distrRules) {
if (distrRule.first && !distrRule.first->IsTemplate()) {
maxArrayId = std::max(maxArrayId, (size_t)distrRule.first->GetId());
}
}
for (const auto& alignRule : dataDirectives.alignRules) {
if (alignRule.alignArray && !alignRule.alignArray->IsTemplate()) {
maxArrayId = std::max(maxArrayId, (size_t)alignRule.alignArray->GetId());
}
}
}
map<size_t, size_t> templateIdMapping;
size_t nextTemplateId = maxArrayId + 1;
for (int z = 0; z < parallelRegions.size(); ++z) {
const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
for (const auto& distrRule : dataDirectives.distrRules) {
if (distrRule.first && distrRule.first->IsTemplate()) {
size_t originalId = distrRule.first->GetId();
if (templateIdMapping.find(originalId) == templateIdMapping.end()) {
templateIdMapping[originalId] = nextTemplateId++;
}
}
}
for (const auto& alignRule : dataDirectives.alignRules) {
if (alignRule.alignWith && alignRule.alignWith->IsTemplate()) {
size_t originalId = alignRule.alignWith->GetId();
if (templateIdMapping.find(originalId) == templateIdMapping.end()) {
templateIdMapping[originalId] = nextTemplateId++;
}
}
}
}
return templateIdMapping;
}
// TODO: вычислять директивы разово заранее
double runLibpredictCalc(SgProject &project,
const vector<size_t>& topology,
const string& clusterConfStr,
const vector<ParallelRegion*> &parallelRegions,
map<string, vector<LoopGraph*>>& loopGraph,
map<string, vector<Messages>> &SPF_messages)
map<string, vector<Messages>> &SPF_messages,
const map<size_t, size_t> &templateIdMapping)
{
libpredict::RetInit retInit = libpredict::Init(clusterConfStr, topology[0], topology[1], topology[2], topology[3]);
libpredict::RetInitGrid retInitGrid = libpredict::InitGrid(topology[0], topology[1], topology[2], topology[3]);
if (retInit != libpredict::INIT_SUCCESS) {
__spf_print(1, "ERROR: Failed to initialize libpredict with cluster config: %s, return code: %d\n", clusterConfStr.c_str(), (int)retInit);
if (retInitGrid != libpredict::INIT_GRID_SUCCESS) {
__spf_print(1, "ERROR: Failed to initialize libpredict grid with topology: %zu %zu %zu %zu, return code: %d\n",
topology[0], topology[1], topology[2], topology[3], (int)retInitGrid);
std::wstring messageR, messageE;
__spf_printToLongBuf(messageE, L"Failed to initialize libpredict library with cluster config: %s, return code: %d",
to_wstring(clusterConfStr).c_str(), (int)retInit);
__spf_printToLongBuf(messageR, R206);
getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1063));
__spf_printToLongBuf(messageE, L"Failed to initialize libpredict grid with topology: %zu %zu %zu %zu, return code: %d",
topology[0], topology[1], topology[2], topology[3], (int)retInitGrid);
__spf_printToLongBuf(messageR, R207);
getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1064));
return -1;
}
// distribute и align из parallelRegions
// distribute and align from parallelRegions
for (int z = 0; z < parallelRegions.size(); ++z) {
const DataDirective &dataDirectives = parallelRegions[z]->GetDataDir();
const vector<int> &currentVariant = parallelRegions[z]->GetCurrentVariant();
@@ -60,7 +108,16 @@ double runLibpredictCalc(SgProject &project,
const DistrVariant* variant = distrRule.second;
if (array && variant && !array->IsNotDistribute()) {
size_t arrayId = array->GetId();
size_t originalId = array->GetId();
size_t arrayId = originalId;
if (array->IsTemplate()) {
auto it = templateIdMapping.find(originalId);
if (it != templateIdMapping.end()) {
arrayId = it->second;
}
}
size_t elemSize = array->GetTypeSize();
vector<libpredict::DistributeAxisRule> axisDistributions;
@@ -92,9 +149,9 @@ double runLibpredictCalc(SgProject &project,
std::wstring messageR, messageE;
__spf_printToLongBuf(messageE, L"Failed to distribute array '%s' with libpredict, return code: %d",
to_wstring(array->GetShortName()).c_str(), (int)retDistribute);
__spf_printToLongBuf(messageR, R207);
__spf_printToLongBuf(messageR, R208);
getObjectForFileFromMap(array->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(
Messages(ERROR, array->GetDeclInfo().begin()->second, messageR, messageE, 1064));
Messages(ERROR, array->GetDeclInfo().begin()->second, messageR, messageE, 1065));
}
}
}
@@ -106,13 +163,24 @@ double runLibpredictCalc(SgProject &project,
if (alignArray && alignWithArray && !alignArray->IsNotDistribute()) {
size_t arrayId = alignArray->GetId();
size_t distributedArrayId = alignWithArray->GetId();
size_t originalDistributedArrayId = alignWithArray->GetId();
size_t distributedArrayId = originalDistributedArrayId;
if (alignWithArray->IsTemplate()) {
auto it = templateIdMapping.find(originalDistributedArrayId);
if (it != templateIdMapping.end()) {
distributedArrayId = it->second;
}
}
size_t elemSize = alignArray->GetTypeSize();
const auto& arraySizes = alignArray->GetSizes();
vector<size_t> dimensions;
for (int dim = 0; dim < alignArray->GetDimSize(); ++dim)
dimensions.push_back(arraySizes[dim].second - arraySizes[dim].first + 1);
for (int dim = 0; dim < alignArray->GetDimSize(); ++dim) {
size_t dimSize = arraySizes[dim].second - arraySizes[dim].first + 1;
dimensions.push_back(dimSize);
}
vector<libpredict::AlignDisplay> distributionExpressions;
for (int dim = 0; dim < alignWithArray->GetDimSize(); ++dim) {
@@ -155,9 +223,9 @@ double runLibpredictCalc(SgProject &project,
__spf_printToLongBuf(messageE, L"Failed to align array '%s' with array '%s' using libpredict, return code: %d",
to_wstring(alignArray->GetShortName()).c_str(),
to_wstring(alignWithArray->GetShortName()).c_str(), (int)retAlign);
__spf_printToLongBuf(messageR, R208);
__spf_printToLongBuf(messageR, R209);
getObjectForFileFromMap(alignArray->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(
Messages(ERROR, alignArray->GetDeclInfo().begin()->second, messageR, messageE, 1065));
Messages(ERROR, alignArray->GetDeclInfo().begin()->second, messageR, messageE, 1066));
}
}
}
@@ -194,7 +262,6 @@ double runLibpredictCalc(SgProject &project,
}
bool corner = directive->shadowRenewCorner[shadowIdx];
size_t number_loop_iterations = loopPtr ? static_cast<size_t>(loopPtr->countOfIters) : 1;
libpredict::RetShadowRenew retShadowRenew = libpredict::ShadowRenew(arrayId, shadow_renew, corner, number_loop_iterations);
@@ -206,9 +273,9 @@ double runLibpredictCalc(SgProject &project,
std::wstring messageR, messageE;
__spf_printToLongBuf(messageE, L"Failed to process shadow_renew for array '%s' with libpredict, return code: %d",
to_wstring(shadowArray->GetShortName()).c_str(), (int)retShadowRenew);
__spf_printToLongBuf(messageR, R209);
__spf_printToLongBuf(messageR, R210);
getObjectForFileFromMap(shadowArray->GetDeclInfo().begin()->first.c_str(), SPF_messages).push_back(
Messages(ERROR, shadowArray->GetDeclInfo().begin()->second, messageR, messageE, 1066));
Messages(ERROR, shadowArray->GetDeclInfo().begin()->second, messageR, messageE, 1067));
}
}
}
@@ -254,22 +321,40 @@ void runPredictScheme(SgProject &project,
clusterConfStr = firstFilePath.substr(0, lastSlash + 1) + "cluster.conf";
}
// creating template ID display to avoid conflicts
map<size_t, size_t> templateIdMapping = createTemplateIdMapping(parallelRegions);
// iterating through topologies to find most optimal one
topologies = vector<vector<size_t>>();
if (maxSizeDist) {
if (maxSizeDist > 4) maxSizeDist = 4;
// TODO: look at cluster configuration
size_t n1max = 10;
size_t n2max = (maxSizeDist >= 2) ? 10 : 1;
size_t n3max = (maxSizeDist >= 3) ? 10 : 1;
size_t n4max = (maxSizeDist >= 4) ? 10 : 1;
// Initialize cluster
int procCount = 0;
libpredict::RetInitCluster retInitCluster = libpredict::InitCluster(clusterConfStr, procCount);
if (retInitCluster != libpredict::INIT_CLUSTER_SUCCESS) {
__spf_print(1, "ERROR: Failed to initialize libpredict cluster with config: %s, return code: %d\n", clusterConfStr.c_str(), (int)retInitCluster);
std::wstring messageR, messageE;
__spf_printToLongBuf(messageE, L"Failed to initialize libpredict cluster with config: %s, return code: %d",
to_wstring(clusterConfStr).c_str(), (int)retInitCluster);
__spf_printToLongBuf(messageR, R206);
getObjectForFileFromMap(clusterConfStr.c_str(), SPF_messages).push_back(Messages(ERROR, 1, messageR, messageE, 1063));
return;
}
for (size_t n1 = 2; n1 <= procCount; ++n1) {
for (size_t n2 = 1; n2 <= n1 && n1 * n2 <= procCount; ++n2) {
if (n2 != 1 && maxSizeDist < 2 || n2 == 1 && maxSizeDist == 2) continue;
for (size_t n3 = 1; n3 <= n2 && n1 * n2 * n3 <= procCount; ++n3) {
if (n3 != 1 && maxSizeDist < 3 || n3 == 1 && maxSizeDist == 3) continue;
for (size_t n4 = 1; n4 <= n3 && n1 * n2 * n3 * n4 <= procCount; ++n4) {
if (n4 != 1 && maxSizeDist < 4 || n4 == 1 && maxSizeDist == 4) continue;
for (size_t n1 = 1; n1 <= n1max; ++n1) {
for (size_t n2 = 1; n2 <= n2max; ++n2) {
for (size_t n3 = 1; n3 <= n3max; ++n3) {
for (size_t n4 = 1; n4 <= n4max; ++n4) {
topologies.push_back(vector<size_t>{n1, n2, n3, n4});
}
}
@@ -279,13 +364,12 @@ void runPredictScheme(SgProject &project,
vector<size_t> best;
double bestTime = std::numeric_limits<double>::max();
for (auto &topology : topologies) {
// if (DEBUG) {
// string outStr = "";
// for (const auto &elem : top)
// outStr += std::to_string(elem) + " ";
// __spf_print(1, "topology %s has time %f\n", outStr.c_str(), currTime);
// }
double currTime = runLibpredictCalc(project, topology, clusterConfStr, parallelRegions, loopGraph, SPF_messages);
double currTime = runLibpredictCalc(project, topology, clusterConfStr, parallelRegions, loopGraph, SPF_messages, templateIdMapping);
string outStr = "";
for (const auto &elem : topology)
outStr += std::to_string(elem) + " ";
__spf_print(1, "topology %s has time %f\n", outStr.c_str(), currTime);
if (currTime == -1)
return;

3
src/Predictor/PredictSchemeWithLibrary.h
View File

@@ -16,4 +16,5 @@ double runLibpredictCalc(SgProject &project,
const std::string& clusterConfStr,
const std::vector<ParallelRegion*> &parallelRegions,
std::map<std::string, std::vector<LoopGraph*>>& loopGraph,
std::map<std::string, std::vector<Messages>> &SPF_messages);
std::map<std::string, std::vector<Messages>> &SPF_messages,
const std::map<size_t, size_t> &templateIdMapping);

13
src/Utils/errors.h
View File

@@ -78,10 +78,11 @@ enum typeMessage { WARR, ERROR, NOTE };
// 60 "Format misplaced"
// 61 "Array has declaration area conflict"
// 62 "need to move common declaration to main for DECLATE"
// 63 "Failed to initialize libpredict library"
// 64 "Failed to distribute array with libpredict"
// 65 "Failed to align array with libpredict"
// 66 "Failed to process shadow_renew with libpredict"
// 63 "Failed to initialize libpredict cluster"
// 64 "Failed to initialize libpredict grid"
// 65 "Failed to distribute array with libpredict"
// 66 "Failed to align array with libpredict"
// 67 "Failed to process shadow_renew with libpredict"
//
// 20xx TRANSFORM GROUP
// 01 "can not convert array assign to loop"
@@ -309,7 +310,7 @@ static void printStackTrace() { };
} \
} while (0)
// Свободный - R209
// Свободный - R210
// Гайд по русификации сообщений: При добавлении нового сообщения, меняется последний сводобный идентификатор.
// В этом файле остаются только спецификаторы, для которых будет заполнен текст. Полный текст пишется в файле
// russian_errors_text.txt. Спецификаторы там тоже сохраняются, по ним в визуализаторе будет восстановлен
@@ -516,6 +517,8 @@ static const wchar_t* R207 = L"R207:";
static const wchar_t* R208 = L"R208:";
//1066
static const wchar_t* R209 = L"R209:";
//1067
static const wchar_t* R210 = L"R210:";
//2001
static const wchar_t *R94 = L"R94:";

8
src/Utils/russian_errors_text.txt
View File

@@ -189,11 +189,13 @@ R205 = "Массив '%s' состоящий в common блоке '%s' долж
//1063
R206 = "Ошибка инициализации библиотеки libpredict с конфигурацией кластера: %s, код возврата: %d"
//1064
R207 = "Ошибка распределения массива '%s' с помощью libpredict, код возврата: %d"
R207 = "Ошибка инициализации сетки libpredict с топологией: %zu %zu %zu %zu, код возврата: %d"
//1065
R208 = "Ошибка выравнивания массива '%s' с массивом '%s' с помощью libpredict, код возврата: %d"
R208 = "Ошибка распределения массива '%s' с помощью libpredict, код возврата: %d"
//1066
R209 = "Ошибка обработки shadow_renew для массива '%s' с помощью libpredict, код возврата: %d"
R209 = "Ошибка выравнивания массива '%s' с массивом '%s' с помощью libpredict, код возврата: %d"
//1067
R210 = "Ошибка обработки shadow_renew для массива '%s' с помощью libpredict, код возврата: %d"
//2001
R94 = "Невозможно автоматически преобразовать данное присваивание к циклу"